Request 3272 (accepted)

roundcubemail.spec Changed

buildroundcubemailtarball.sh Changed

roundcubemail-1.5.tar.gz/CHANGELOG.md Changed

roundcubemail-1.5.tar.gz/bin/install-jsdeps.sh Changed

roundcubemail-1.5.tar.gz/composer.json Changed

roundcubemail-1.5.tar.gz/composer.lock Changed

@@ -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": "80e5727f0676092a7ab32f1696ed0136",
+    "content-hash": "60ae678291a569c227222d1aeac89603",
     "packages": 
         {
             "name": "beberlei/assert",
@@ -2363,21 +2363,22 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.13",
+            "version": "v1.10.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d"
+                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32",
+                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32",
                 "shasum": ""
             },
             "require": {
                 "pear/console_getopt": "~1.4",
-                "pear/pear_exception": "~1.0"
+                "pear/pear_exception": "~1.0",
+                "php": ">=5.4"
             },
             "replace": {
                 "rsky/pear-core-min": "self.version"
@@ -2407,7 +2408,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name=PEAR",
                 "source": "https://github.com/pear/pear-core-minimal"
             },
-            "time": "2023-04-19T19:15:47+00:00"
+            "time": "2023-11-26T16:15:38+00:00"
         },
         {
             "name": "pear/pear_exception",
@@ -2721,16 +2722,16 @@
         },
         {
             "name": "roundcube/rtf-html-php",
-            "version": "v2.1",
+            "version": "v2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/roundcube/rtf-html-php.git",
-                "reference": "7b488113e6fe2fccd84643e5121070fe7f335cb2"
+                "reference": "a3432ca249b73bf24fec50114191a63ad8b1478c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/roundcube/rtf-html-php/zipball/7b488113e6fe2fccd84643e5121070fe7f335cb2",
-                "reference": "7b488113e6fe2fccd84643e5121070fe7f335cb2",
+                "url": "https://api.github.com/repos/roundcube/rtf-html-php/zipball/a3432ca249b73bf24fec50114191a63ad8b1478c",
+                "reference": "a3432ca249b73bf24fec50114191a63ad8b1478c",
                 "shasum": ""
             },
             "require": {
@@ -2739,7 +2740,8 @@
                 "php": ">=5.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7"
+                "phpstan/phpstan": "^1.2",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7 | ^9.6"
             },
             "type": "library",
             "autoload": {
@@ -2768,22 +2770,22 @@
             ,
             "support": {
                 "issues": "https://github.com/roundcube/rtf-html-php/issues",
-                "source": "https://github.com/roundcube/rtf-html-php/tree/v2.1"
+                "source": "https://github.com/roundcube/rtf-html-php/tree/v2.2"
             },
-            "time": "2021-07-11T06:43:46+00:00"
+            "time": "2023-12-31T14:01:02+00:00"
         },
         {
             "name": "sabre/dav",
-            "version": "4.5.1",
+            "version": "4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/dav.git",
-                "reference": "b29899b675371aee73920165d1dc5a2235aa104b"
+                "reference": "554145304b4a026477d130928d16e626939b0b2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/dav/zipball/b29899b675371aee73920165d1dc5a2235aa104b",
-                "reference": "b29899b675371aee73920165d1dc5a2235aa104b",
+                "url": "https://api.github.com/repos/sabre-io/dav/zipball/554145304b4a026477d130928d16e626939b0b2a",
+                "reference": "554145304b4a026477d130928d16e626939b0b2a",
                 "shasum": ""
             },
             "require": {
@@ -2807,7 +2809,7 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.19",
-                "monolog/monolog": "^1.27",
+                "monolog/monolog": "^1.27 || ^2.0",
                 "phpstan/phpstan": "^0.12 || ^1.0",
                 "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
@@ -2853,7 +2855,7 @@
                 "issues": "https://github.com/sabre-io/dav/issues",
                 "source": "https://github.com/fruux/sabre-dav"
             },
-            "time": "2023-11-23T04:33:31+00:00"
+            "time": "2023-12-11T13:01:23+00:00"
         },
         {
             "name": "sabre/event",
@@ -4787,16 +4789,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.44",
+            "version": "1.10.57",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b"
+                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b",
-                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
+                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
                 "shasum": ""
             },
             "require": {
@@ -4845,7 +4847,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-11-21T16:30:46+00:00"
+            "time": "2024-01-24T11:51:34+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5831,16 +5833,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
                 "shasum": ""
             },
             "require": {
@@ -5850,11 +5852,11 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
             "bin": 
-                "bin/phpcs",
-                "bin/phpcbf"
+                "bin/phpcbf",
+                "bin/phpcs"
             ,
             "type": "library",
             "extra": {
@@ -5869,22 +5871,45 @@
             "authors": 
                 {
                     "name": "Greg Sherwood",
-                    "role": "lead"
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ,
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": 
                 "phpcs",
                 "standards",
                 "static analysis"
             ,
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
-            "time": "2023-02-22T23:07:41+00:00"
+            "funding": 
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ,
+            "time": "2024-01-11T20:47:48+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6107,7 +6132,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.2.0 <8"
+        "php": ">=7.2.0"
     },
     "platform-dev": ,
     "platform-overrides": {

roundcubemail-1.5.tar.gz/jsdeps.json Changed

roundcubemail-1.5.tar.gz/node_modules/debug Deleted

roundcubemail-1.5.tar.gz/node_modules/debug/CHANGELOG.md Deleted

@@ -1,395 +0,0 @@
-
-3.1.0 / 2017-09-26
-==================
-
-  * Add `DEBUG_HIDE_DATE` env var (#486)
-  * Remove ReDoS regexp in %o formatter (#504)
-  * Remove "component" from package.json
-  * Remove `component.json`
-  * Ignore package-lock.json
-  * Examples: fix colors printout
-  * Fix: browser detection
-  * Fix: spelling mistake (#496, @EdwardBetts)
-
-3.0.1 / 2017-08-24
-==================
-
-  * Fix: Disable colors in Edge and Internet Explorer (#489)
-
-3.0.0 / 2017-08-08
-==================
-
-  * Breaking: Remove DEBUG_FD (#406)
-  * Breaking: Use `Date#toISOString()` instead to `Date#toUTCString()` when output is not a TTY (#418)
-  * Breaking: Make millisecond timer namespace specific and allow 'always enabled' output (#408)
-  * Addition: document `enabled` flag (#465)
-  * Addition: add 256 colors mode (#481)
-  * Addition: `enabled()` updates existing debug instances, add `destroy()` function (#440)
-  * Update: component: update "ms" to v2.0.0
-  * Update: separate the Node and Browser tests in Travis-CI
-  * Update: refactor Readme, fixed documentation, added "Namespace Colors" section, redid screenshots
-  * Update: separate Node.js and web browser examples for organization
-  * Update: update "browserify" to v14.4.0
-  * Fix: fix Readme typo (#473)
-
-2.6.9 / 2017-09-22
-==================
-
-  * remove ReDoS regexp in %o formatter (#504)
-
-2.6.8 / 2017-05-18
-==================
-
-  * Fix: Check for undefined on browser globals (#462, @marbemac)
-
-2.6.7 / 2017-05-16
-==================
-
-  * Fix: Update ms to 2.0.0 to fix regular expression denial of service vulnerability (#458, @hubdotcom)
-  * Fix: Inline extend function in node implementation (#452, @dougwilson)
-  * Docs: Fix typo (#455, @msasad)
-
-2.6.5 / 2017-04-27
-==================
-  
-  * Fix: null reference check on window.documentElement.style.WebkitAppearance (#447, @thebigredgeek)
-  * Misc: clean up browser reference checks (#447, @thebigredgeek)
-  * Misc: add npm-debug.log to .gitignore (@thebigredgeek)
-
-
-2.6.4 / 2017-04-20
-==================
-
-  * Fix: bug that would occur if process.env.DEBUG is a non-string value. (#444, @LucianBuzzo)
-  * Chore: ignore bower.json in npm installations. (#437, @joaovieira)
-  * Misc: update "ms" to v0.7.3 (@tootallnate)
-
-2.6.3 / 2017-03-13
-==================
-
-  * Fix: Electron reference to `process.env.DEBUG` (#431, @paulcbetts)
-  * Docs: Changelog fix (@thebigredgeek)
-
-2.6.2 / 2017-03-10
-==================
-
-  * Fix: DEBUG_MAX_ARRAY_LENGTH (#420, @slavaGanzin)
-  * Docs: Add backers and sponsors from Open Collective (#422, @piamancini)
-  * Docs: Add Slackin invite badge (@tootallnate)
-
-2.6.1 / 2017-02-10
-==================
-
-  * Fix: Module's `export default` syntax fix for IE8 `Expected identifier` error
-  * Fix: Whitelist DEBUG_FD for values 1 and 2 only (#415, @pi0)
-  * Fix: IE8 "Expected identifier" error (#414, @vgoma)
-  * Fix: Namespaces would not disable once enabled (#409, @musikov)
-
-2.6.0 / 2016-12-28
-==================
-
-  * Fix: added better null pointer checks for browser useColors (@thebigredgeek)
-  * Improvement: removed explicit `window.debug` export (#404, @tootallnate)
-  * Improvement: deprecated `DEBUG_FD` environment variable (#405, @tootallnate)
-
-2.5.2 / 2016-12-25
-==================
-
-  * Fix: reference error on window within webworkers (#393, @KlausTrainer)
-  * Docs: fixed README typo (#391, @lurch)
-  * Docs: added notice about v3 api discussion (@thebigredgeek)
-
-2.5.1 / 2016-12-20
-==================
-
-  * Fix: babel-core compatibility
-
-2.5.0 / 2016-12-20
-==================
-
-  * Fix: wrong reference in bower file (@thebigredgeek)
-  * Fix: webworker compatibility (@thebigredgeek)
-  * Fix: output formatting issue (#388, @kribblo)
-  * Fix: babel-loader compatibility (#383, @escwald)
-  * Misc: removed built asset from repo and publications (@thebigredgeek)
-  * Misc: moved source files to /src (#378, @yamikuronue)
-  * Test: added karma integration and replaced babel with browserify for browser tests (#378, @yamikuronue)
-  * Test: coveralls integration (#378, @yamikuronue)
-  * Docs: simplified language in the opening paragraph (#373, @yamikuronue)
-
-2.4.5 / 2016-12-17
-==================
-
-  * Fix: `navigator` undefined in Rhino (#376, @jochenberger)
-  * Fix: custom log function (#379, @hsiliev)
-  * Improvement: bit of cleanup + linting fixes (@thebigredgeek)
-  * Improvement: rm non-maintainted `dist/` dir (#375, @freewil)
-  * Docs: simplified language in the opening paragraph. (#373, @yamikuronue)
-
-2.4.4 / 2016-12-14
-==================
-
-  * Fix: work around debug being loaded in preload scripts for electron (#368, @paulcbetts)
-
-2.4.3 / 2016-12-14
-==================
-
-  * Fix: navigation.userAgent error for react native (#364, @escwald)
-
-2.4.2 / 2016-12-14
-==================
-
-  * Fix: browser colors (#367, @tootallnate)
-  * Misc: travis ci integration (@thebigredgeek)
-  * Misc: added linting and testing boilerplate with sanity check (@thebigredgeek)
-
-2.4.1 / 2016-12-13
-==================
-
-  * Fix: typo that broke the package (#356)
-
-2.4.0 / 2016-12-13
-==================
-
-  * Fix: bower.json references unbuilt src entry point (#342, @justmatt)
-  * Fix: revert "handle regex special characters" (@tootallnate)
-  * Feature: configurable util.inspect()`options for NodeJS (#327, @tootallnate)
-  * Feature: %O`(big O) pretty-prints objects (#322, @tootallnate)
-  * Improvement: allow colors in workers (#335, @botverse)
-  * Improvement: use same color for same namespace. (#338, @lchenay)
-
-2.3.3 / 2016-11-09
-==================
-
-  * Fix: Catch `JSON.stringify()` errors (#195, Jovan Alleyne)
-  * Fix: Returning `localStorage` saved values (#331, Levi Thomason)
-  * Improvement: Don't create an empty object when no `process` (Nathan Rajlich)
-
-2.3.2 / 2016-11-09
-==================
-
-  * Fix: be super-safe in index.js as well (@TooTallNate)
-  * Fix: should check whether process exists (Tom Newby)
-
-2.3.1 / 2016-11-09
-==================
-
-  * Fix: Added electron compatibility (#324, @paulcbetts)
-  * Improvement: Added performance optimizations (@tootallnate)
-  * Readme: Corrected PowerShell environment variable example (#252, @gimre)
-  * Misc: Removed yarn lock file from source control (#321, @fengmk2)
-
-2.3.0 / 2016-11-07
-==================
-
-  * Fix: Consistent placement of ms diff at end of output (#215, @gorangajic)
-  * Fix: Escaping of regex special characters in namespace strings (#250, @zacronos)
-  * Fix: Fixed bug causing crash on react-native (#282, @vkarpov15)
-  * Feature: Enabled ES6+ compatible import via default export (#212 @bucaran)
-  * Feature: Added %O formatter to reflect Chrome's console.log capability (#279, @oncletom)
-  * Package: Update "ms" to 0.7.2 (#315, @DevSide)
-  * Package: removed superfluous version property from bower.json (#207 @kkirsche)
-  * Readme: fix USE_COLORS to DEBUG_COLORS
-  * Readme: Doc fixes for format string sugar (#269, @mlucool)
-  * Readme: Updated docs for DEBUG_FD and DEBUG_COLORS environment variables (#232, @mattlyons0)
-  * Readme: doc fixes for PowerShell (#271 #243, @exoticknight @unreadable)
-  * Readme: better docs for browser support (#224, @matthewmueller)
-  * Tooling: Added yarn integration for development (#317, @thebigredgeek)
-  * Misc: Renamed History.md to CHANGELOG.md (@thebigredgeek)
-  * Misc: Added license file (#226 #274, @CantemoInternal @sdaitzman)
-  * Misc: Updated contributors (@thebigredgeek)
-
-2.2.0 / 2015-05-09
-==================
-
-  * package: update "ms" to v0.7.1 (#202, @dougwilson)
-  * README: add logging to file example (#193, @DanielOchoa)
-  * README: fixed a typo (#191, @amir-s)
-  * browser: expose `storage` (#190, @stephenmathieson)
-  * Makefile: add a `distclean` target (#189, @stephenmathieson)
-
-2.1.3 / 2015-03-13
-==================
-
-  * Updated stdout/stderr example (#186)
-  * Updated example/stdout.js to match debug current behaviour
-  * Renamed example/stderr.js to stdout.js
-  * Update Readme.md (#184)
-  * replace high intensity foreground color for bold (#182, #183)
-
-2.1.2 / 2015-03-01
-==================
-
-  * dist: recompile
-  * update "ms" to v0.7.0
-  * package: update "browserify" to v9.0.3
-  * component: fix "ms.js" repo location
-  * changed bower package name
-  * updated documentation about using debug in a browser
-  * fix: security error on safari (#167, #168, @yields)
-
-2.1.1 / 2014-12-29
-==================
-
-  * browser: use `typeof` to check for `console` existence
-  * browser: check for `console.log` truthiness (fix IE 8/9)
-  * browser: add support for Chrome apps
-  * Readme: added Windows usage remarks
-  * Add `bower.json` to properly support bower install
-
-2.1.0 / 2014-10-15
-==================
-
-  * node: implement `DEBUG_FD` env variable support
-  * package: update "browserify" to v6.1.0
-  * package: add "license" field to package.json (#135, @panuhorsmalahti)
-
-2.0.0 / 2014-09-01
-==================
-
-  * package: update "browserify" to v5.11.0
-  * node: use stderr rather than stdout for logging (#29, @stephenmathieson)
-
-1.0.4 / 2014-07-15
-==================
-
-  * dist: recompile
-  * example: remove `console.info()` log usage
-  * example: add "Content-Type" UTF-8 header to browser example
-  * browser: place %c marker after the space character
-  * browser: reset the "content" color via `color: inherit`
-  * browser: add colors support for Firefox >= v31
-  * debug: prefer an instance `log()` function over the global one (#119)
-  * Readme: update documentation about styled console logs for FF v31 (#116, @wryk)
-
-1.0.3 / 2014-07-09
-==================
-
-  * Add support for multiple wildcards in namespaces (#122, @seegno)
-  * browser: fix lint
-
-1.0.2 / 2014-06-10
-==================
-
-  * browser: update color palette (#113, @gscottolson)
-  * common: make console logging function configurable (#108, @timoxley)
-  * node: fix %o colors on old node <= 0.8.x
-  * Makefile: find node path using shell/which (#109, @timoxley)
-
-1.0.1 / 2014-06-06
-==================
-
-  * browser: use `removeItem()` to clear localStorage
-  * browser, node: don't set DEBUG if namespaces is undefined (#107, @leedm777)
-  * package: add "contributors" section
-  * node: fix comment typo
-  * README: list authors
-
-1.0.0 / 2014-06-04
-==================
-
-  * make ms diff be global, not be scope
-  * debug: ignore empty strings in enable()
-  * node: make DEBUG_COLORS able to disable coloring
-  * *: export the `colors` array
-  * npmignore: don't publish the `dist` dir
-  * Makefile: refactor to use browserify
-  * package: add "browserify" as a dev dependency
-  * Readme: add Web Inspector Colors section
-  * node: reset terminal color for the debug content
-  * node: map "%o" to `util.inspect()`
-  * browser: map "%j" to `JSON.stringify()`
-  * debug: add custom "formatters"
-  * debug: use "ms" module for humanizing the diff
-  * Readme: add "bash" syntax highlighting
-  * browser: add Firebug color support
-  * browser: add colors for WebKit browsers
-  * node: apply log to `console`
-  * rewrite: abstract common logic for Node & browsers
-  * add .jshintrc file
-
-0.8.1 / 2014-04-14
-==================
-
-  * package: re-add the "component" section
-
-0.8.0 / 2014-03-30
-==================
-
-  * add `enable()` method for nodejs. Closes #27
-  * change from stderr to stdout
-  * remove unnecessary index.js file
-
-0.7.4 / 2013-11-13
-==================
-
-  * remove "browserify" key from package.json (fixes something in browserify)
-
-0.7.3 / 2013-10-30
-==================
-
-  * fix: catch localStorage security error when cookies are blocked (Chrome)
-  * add debug(err) support. Closes #46
-  * add .browser prop to package.json. Closes #42
-
-0.7.2 / 2013-02-06
-==================
-
-  * fix package.json
-  * fix: Mobile Safari (private mode) is broken with debug
-  * fix: Use unicode to send escape character to shell instead of octal to work with strict mode javascript
-
-0.7.1 / 2013-02-05
-==================
-
-  * add repository URL to package.json
-  * add DEBUG_COLORED to force colored output
-  * add browserify support
-  * fix component. Closes #24
-
-0.7.0 / 2012-05-04
-==================
-
-  * Added .component to package.json
-  * Added debug.component.js build
-
-0.6.0 / 2012-03-16
-==================
-
-  * Added support for "-" prefix in DEBUG Vinay Pulim
-  * Added `.enabled` flag to the node version TooTallNate
-
-0.5.0 / 2012-02-02
-==================
-
-  * Added: humanize diffs. Closes #8
-  * Added `debug.disable()` to the CS variant
-  * Removed padding. Closes #10
-  * Fixed: persist client-side variant again. Closes #9
-
-0.4.0 / 2012-02-01
-==================
-
-  * Added browser variant support for older browsers TooTallNate
-  * Added `debug.enable('project:*')` to browser variant TooTallNate
-  * Added padding to diff (moved it to the right)
-
-0.3.0 / 2012-01-26
-==================
-
-  * Added millisecond diff when isatty, otherwise UTC string
-
-0.2.0 / 2012-01-22
-==================
-
-  * Added wildcard support
-
-0.1.0 / 2011-12-02
-==================
-
-  * Added: remove colors unless stderr isatty TooTallNate
-
-0.0.1 / 2010-01-03
-==================
-
-  * Initial release

roundcubemail-1.5.tar.gz/node_modules/debug/LICENSE Deleted

@@ -1,19 +0,0 @@
-(The MIT License)
-
-Copyright (c) 2014 TJ Holowaychuk <tj@vision-media.ca>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
-and associated documentation files (the 'Software'), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial 
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT 
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

roundcubemail-1.5.tar.gz/node_modules/debug/README.md Deleted

@@ -1,437 +0,0 @@
-# debug
-!Build Status(https://travis-ci.org/visionmedia/debug.svg?branch=master)(https://travis-ci.org/visionmedia/debug)  !Coverage Status(https://coveralls.io/repos/github/visionmedia/debug/badge.svg?branch=master)(https://coveralls.io/github/visionmedia/debug?branch=master)  !Slack(https://visionmedia-community-slackin.now.sh/badge.svg)(https://visionmedia-community-slackin.now.sh/) !OpenCollective(https://opencollective.com/debug/backers/badge.svg)(#backers)
-!OpenCollective(https://opencollective.com/debug/sponsors/badge.svg)(#sponsors)
-
-<img width="647" src="https://user-images.githubusercontent.com/71256/29091486-fa38524c-7c37-11e7-895f-e7ec8e1039b6.png">
-
-A tiny JavaScript debugging utility modelled after Node.js core's debugging
-technique. Works in Node.js and web browsers.
-
-## Installation
-
-```bash
-$ npm install debug
-```
-
-## Usage
-
-`debug` exposes a function; simply pass this function the name of your module, and it will return a decorated version of `console.error` for you to pass debug statements to. This will allow you to toggle the debug output for different parts of your module as well as the module as a whole.
-
-Example _app.js_(./examples/node/app.js):
-
-```js
-var debug = require('debug')('http')
-  , http = require('http')
-  , name = 'My App';
-
-// fake app
-
-debug('booting %o', name);
-
-http.createServer(function(req, res){
-  debug(req.method + ' ' + req.url);
-  res.end('hello\n');
-}).listen(3000, function(){
-  debug('listening');
-});
-
-// fake worker of some kind
-
-require('./worker');
-```
-
-Example _worker.js_(./examples/node/worker.js):
-
-```js
-var a = require('debug')('worker:a')
-  , b = require('debug')('worker:b');
-
-function work() {
-  a('doing lots of uninteresting work');
-  setTimeout(work, Math.random() * 1000);
-}
-
-work();
-
-function workb() {
-  b('doing some work');
-  setTimeout(workb, Math.random() * 2000);
-}
-
-workb();
-```
-
-The `DEBUG` environment variable is then used to enable these based on space or
-comma-delimited names.
-
-Here are some examples:
-
-<img width="647" alt="screen shot 2017-08-08 at 12 53 04 pm" src="https://user-images.githubusercontent.com/71256/29091703-a6302cdc-7c38-11e7-8304-7c0b3bc600cd.png">
-<img width="647" alt="screen shot 2017-08-08 at 12 53 38 pm" src="https://user-images.githubusercontent.com/71256/29091700-a62a6888-7c38-11e7-800b-db911291ca2b.png">
-<img width="647" alt="screen shot 2017-08-08 at 12 53 25 pm" src="https://user-images.githubusercontent.com/71256/29091701-a62ea114-7c38-11e7-826a-2692bedca740.png">
-
-#### Windows command prompt notes
-
-##### CMD
-
-On Windows the environment variable is set using the `set` command.
-
-```cmd
-set DEBUG=*,-not_this
-```
-
-Example:
-
-```cmd
-set DEBUG=* & node app.js
-```
-
-##### PowerShell (VS Code default)
-
-PowerShell uses different syntax to set environment variables.
-
-```cmd
-$env:DEBUG = "*,-not_this"
-```
-
-Example:
-
-```cmd
-$env:DEBUG='app';node app.js
-```
-
-Then, run the program to be debugged as usual.
-
-npm script example:
-```js
-  "windowsDebug": "@powershell -Command $env:DEBUG='*';node app.js",
-```
-
-## Namespace Colors
-
-Every debug instance has a color generated for it based on its namespace name.
-This helps when visually parsing the debug output to identify which debug instance
-a debug line belongs to.
-
-#### Node.js
-
-In Node.js, colors are enabled when stderr is a TTY. You also _should_ install
-the `supports-color`(https://npmjs.org/supports-color) module alongside debug,
-otherwise debug will only use a small handful of basic colors.
-
-<img width="521" src="https://user-images.githubusercontent.com/71256/29092181-47f6a9e6-7c3a-11e7-9a14-1928d8a711cd.png">
-
-#### Web Browser
-
-Colors are also enabled on "Web Inspectors" that understand the `%c` formatting
-option. These are WebKit web inspectors, Firefox (since version
-31(https://hacks.mozilla.org/2014/05/editable-box-model-multiple-selection-sublime-text-keys-much-more-firefox-developer-tools-episode-31/))
-and the Firebug plugin for Firefox (any version).
-
-<img width="524" src="https://user-images.githubusercontent.com/71256/29092033-b65f9f2e-7c39-11e7-8e32-f6f0d8e865c1.png">
-
-
-## Millisecond diff
-
-When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the "+NNNms" will show you how much time was spent between calls.
-
-<img width="647" src="https://user-images.githubusercontent.com/71256/29091486-fa38524c-7c37-11e7-895f-e7ec8e1039b6.png">
-
-When stdout is not a TTY, `Date#toISOString()` is used, making it more useful for logging the debug information as shown below:
-
-<img width="647" src="https://user-images.githubusercontent.com/71256/29091956-6bd78372-7c39-11e7-8c55-c948396d6edd.png">
-
-
-## Conventions
-
-If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use ":" to separate features. For example "bodyParser" from Connect would then be "connect:bodyParser".  If you append a "*" to the end of your name, it will always be enabled regardless of the setting of the DEBUG environment variable.  You can then use it for normal output as well as debug output.
-
-## Wildcards
-
-The `*` character may be used as a wildcard. Suppose for example your library has
-debuggers named "connect:bodyParser", "connect:compress", "connect:session",
-instead of listing all three with
-`DEBUG=connect:bodyParser,connect:compress,connect:session`, you may simply do
-`DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`.
-
-You can also exclude specific debuggers by prefixing them with a "-" character.
-For example, `DEBUG=*,-connect:*` would include all debuggers except those
-starting with "connect:".
-
-## Environment Variables
-
-When running through Node.js, you can set a few environment variables that will
-change the behavior of the debug logging:
-
-| Name      | Purpose                                         |
-|-----------|-------------------------------------------------|
-| `DEBUG`   | Enables/disables specific debugging namespaces. |
-| `DEBUG_HIDE_DATE` | Hide date from debug output (non-TTY).  |
-| `DEBUG_COLORS`| Whether or not to use colors in the debug output. |
-| `DEBUG_DEPTH` | Object inspection depth.                    |
-| `DEBUG_SHOW_HIDDEN` | Shows hidden properties on inspected objects. |
-
-
-__Note:__ The environment variables beginning with `DEBUG_` end up being
-converted into an Options object that gets used with `%o`/`%O` formatters.
-See the Node.js documentation for
-`util.inspect()`(https://nodejs.org/api/util.html#util_util_inspect_object_options)
-for the complete list.
-
-## Formatters
-
-Debug uses printf-style(https://wikipedia.org/wiki/Printf_format_string) formatting.
-Below are the officially supported formatters:
-
-| Formatter | Representation |
-|-----------|----------------|
-| `%O`      | Pretty-print an Object on multiple lines. |
-| `%o`      | Pretty-print an Object all on a single line. |
-| `%s`      | String. |
-| `%d`      | Number (both integer and float). |
-| `%j`      | JSON. Replaced with the string 'Circular' if the argument contains circular references. |
-| `%%`      | Single percent sign ('%'). This does not consume an argument. |
-
-
-### Custom formatters
-
-You can add custom formatters by extending the `debug.formatters` object.
-For example, if you wanted to add support for rendering a Buffer as hex with
-`%h`, you could do something like:
-
-```js
-const createDebug = require('debug')
-createDebug.formatters.h = (v) => {
-  return v.toString('hex')
-}
-
-// …elsewhere
-const debug = createDebug('foo')
-debug('this is hex: %h', new Buffer('hello world'))
-//   foo this is hex: 68656c6c6f20776f726c6421 +0ms
-```
-
-
-## Browser Support
-
-You can build a browser-ready script using browserify(https://github.com/substack/node-browserify),
-or just use the browserify-as-a-service(https://wzrd.in/) build(https://wzrd.in/standalone/debug@latest),
-if you don't want to build it yourself.
-
-Debug's enable state is currently persisted by `localStorage`.
-Consider the situation shown below where you have `worker:a` and `worker:b`,
-and wish to debug both. You can enable this using `localStorage.debug`:
-
-```js
-localStorage.debug = 'worker:*'
-```
-
-And then refresh the page.
-
-```js
-a = debug('worker:a');
-b = debug('worker:b');
-
-setInterval(function(){
-  a('doing some work');
-}, 1000);
-
-setInterval(function(){
-  b('doing some work');
-}, 1200);
-```
-
-
-## Output streams
-
-  By default `debug` will log to stderr, however this can be configured per-namespace by overriding the `log` method:
-
-Example _stdout.js_(./examples/node/stdout.js):
-
-```js
-var debug = require('debug');
-var error = debug('app:error');
-
-// by default stderr is used
-error('goes to stderr!');
-
-var log = debug('app:log');
-// set this namespace to log via console.log
-log.log = console.log.bind(console); // don't forget to bind to console!
-log('goes to stdout');
-error('still goes to stderr!');
-
-// set all output to go via console.info
-// overrides all per-namespace log settings
-debug.log = console.info.bind(console);
-error('now goes to stdout via console.info');
-log('still goes to stdout, but via console.info now');
-```
-
-## Extend
-You can simply extend debugger 
-```js
-const log = require('debug')('auth');
-
-//creates new debug instance with extended namespace
-const logSign = log.extend('sign');
-const logLogin = log.extend('login');
-
-log('hello'); // auth hello
-logSign('hello'); //auth:sign hello
-logLogin('hello'); //auth:login hello
-```
-
-## Set dynamically
-
-You can also enable debug dynamically by calling the `enable()` method :
-
-```js
-let debug = require('debug');
-
-console.log(1, debug.enabled('test'));
-
-debug.enable('test');
-console.log(2, debug.enabled('test'));
-
-debug.disable();
-console.log(3, debug.enabled('test'));
-
-```
-
-print :   
-```
-1 false
-2 true
-3 false
-```
-
-Usage :  
-`enable(namespaces)`  
-`namespaces` can include modes separated by a colon and wildcards.
-   
-Note that calling `enable()` completely overrides previously set DEBUG variable : 
-
-```
-$ DEBUG=foo node -e 'var dbg = require("debug"); dbg.enable("bar"); console.log(dbg.enabled("foo"))'
-=> false
-```
-
-## Checking whether a debug target is enabled
-
-After you've created a debug instance, you can determine whether or not it is
-enabled by checking the `enabled` property:
-
-```javascript
-const debug = require('debug')('http');
-
-if (debug.enabled) {
-  // do stuff...
-}
-```
-
-You can also manually toggle this property to force the debug instance to be
-enabled or disabled.
-
-
-## Authors
-
- - TJ Holowaychuk
- - Nathan Rajlich
- - Andrew Rhyne
-
-## Backers
-
-Support us with a monthly donation and help us continue our activities. Become a backer(https://opencollective.com/debug#backer)
-
-<a href="https://opencollective.com/debug/backer/0/website" target="_blank"><img src="https://opencollective.com/debug/backer/0/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/1/website" target="_blank"><img src="https://opencollective.com/debug/backer/1/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/2/website" target="_blank"><img src="https://opencollective.com/debug/backer/2/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/3/website" target="_blank"><img src="https://opencollective.com/debug/backer/3/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/4/website" target="_blank"><img src="https://opencollective.com/debug/backer/4/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/5/website" target="_blank"><img src="https://opencollective.com/debug/backer/5/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/6/website" target="_blank"><img src="https://opencollective.com/debug/backer/6/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/7/website" target="_blank"><img src="https://opencollective.com/debug/backer/7/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/8/website" target="_blank"><img src="https://opencollective.com/debug/backer/8/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/9/website" target="_blank"><img src="https://opencollective.com/debug/backer/9/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/10/website" target="_blank"><img src="https://opencollective.com/debug/backer/10/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/11/website" target="_blank"><img src="https://opencollective.com/debug/backer/11/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/12/website" target="_blank"><img src="https://opencollective.com/debug/backer/12/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/13/website" target="_blank"><img src="https://opencollective.com/debug/backer/13/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/14/website" target="_blank"><img src="https://opencollective.com/debug/backer/14/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/15/website" target="_blank"><img src="https://opencollective.com/debug/backer/15/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/16/website" target="_blank"><img src="https://opencollective.com/debug/backer/16/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/17/website" target="_blank"><img src="https://opencollective.com/debug/backer/17/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/18/website" target="_blank"><img src="https://opencollective.com/debug/backer/18/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/19/website" target="_blank"><img src="https://opencollective.com/debug/backer/19/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/20/website" target="_blank"><img src="https://opencollective.com/debug/backer/20/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/21/website" target="_blank"><img src="https://opencollective.com/debug/backer/21/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/22/website" target="_blank"><img src="https://opencollective.com/debug/backer/22/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/23/website" target="_blank"><img src="https://opencollective.com/debug/backer/23/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/24/website" target="_blank"><img src="https://opencollective.com/debug/backer/24/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/25/website" target="_blank"><img src="https://opencollective.com/debug/backer/25/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/26/website" target="_blank"><img src="https://opencollective.com/debug/backer/26/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/27/website" target="_blank"><img src="https://opencollective.com/debug/backer/27/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/28/website" target="_blank"><img src="https://opencollective.com/debug/backer/28/avatar.svg"></a>
-<a href="https://opencollective.com/debug/backer/29/website" target="_blank"><img src="https://opencollective.com/debug/backer/29/avatar.svg"></a>
-
-
-## Sponsors
-
-Become a sponsor and get your logo on our README on Github with a link to your site. Become a sponsor(https://opencollective.com/debug#sponsor)
-
-<a href="https://opencollective.com/debug/sponsor/0/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/1/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/2/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/3/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/4/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/5/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/6/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/7/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/8/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/9/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/9/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/10/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/10/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/11/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/11/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/12/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/12/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/13/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/13/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/14/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/14/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/15/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/15/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/16/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/16/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/17/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/17/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/18/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/18/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/19/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/19/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/20/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/20/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/21/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/21/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/22/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/22/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/23/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/23/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/24/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/24/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/25/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/25/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/26/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/26/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/27/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/27/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/28/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/28/avatar.svg"></a>
-<a href="https://opencollective.com/debug/sponsor/29/website" target="_blank"><img src="https://opencollective.com/debug/sponsor/29/avatar.svg"></a>
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2014-2017 TJ Holowaychuk &lt;tj@vision-media.ca&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

roundcubemail-1.5.tar.gz/node_modules/debug/node.js Deleted

roundcubemail-1.5.tar.gz/node_modules/debug/package.json Deleted

@@ -1,90 +0,0 @@
-{
-  "_from": "debug@^3.2.6",
-  "_id": "debug@3.2.7",
-  "_inBundle": false,
-  "_integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-  "_location": "/debug",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "debug@^3.2.6",
-    "name": "debug",
-    "escapedName": "debug",
-    "rawSpec": "^3.2.6",
-    "saveSpec": null,
-    "fetchSpec": "^3.2.6"
-  },
-  "_requiredBy": 
-    "/needle"
-  ,
-  "_resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-  "_shasum": "72580b7e9145fb39b6676f9c5e5fb100b934179a",
-  "_spec": "debug@^3.2.6",
-  "_where": "/tmp/roundcubemail-1.5/roundcubemail-1.5/node_modules/needle",
-  "author": {
-    "name": "TJ Holowaychuk",
-    "email": "tj@vision-media.ca"
-  },
-  "browser": "./src/browser.js",
-  "bugs": {
-    "url": "https://github.com/visionmedia/debug/issues"
-  },
-  "bundleDependencies": false,
-  "contributors": 
-    {
-      "name": "Nathan Rajlich",
-      "email": "nathan@tootallnate.net",
-      "url": "http://n8.io"
-    },
-    {
-      "name": "Andrew Rhyne",
-      "email": "rhyneandrew@gmail.com"
-    }
-  ,
-  "dependencies": {
-    "ms": "^2.1.1"
-  },
-  "deprecated": false,
-  "description": "small debugging utility",
-  "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "browserify": "14.4.0",
-    "chai": "^3.5.0",
-    "concurrently": "^3.1.0",
-    "coveralls": "^3.0.2",
-    "istanbul": "^0.4.5",
-    "karma": "^3.0.0",
-    "karma-chai": "^0.1.0",
-    "karma-mocha": "^1.3.0",
-    "karma-phantomjs-launcher": "^1.0.2",
-    "mocha": "^5.2.0",
-    "mocha-lcov-reporter": "^1.2.0",
-    "rimraf": "^2.5.4",
-    "xo": "^0.23.0"
-  },
-  "files": 
-    "src",
-    "node.js",
-    "dist/debug.js",
-    "LICENSE",
-    "README.md"
-  ,
-  "homepage": "https://github.com/visionmedia/debug#readme",
-  "keywords": 
-    "debug",
-    "log",
-    "debugger"
-  ,
-  "license": "MIT",
-  "main": "./src/index.js",
-  "name": "debug",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/visionmedia/debug.git"
-  },
-  "unpkg": "./dist/debug.js",
-  "version": "3.2.7"
-}

roundcubemail-1.5.tar.gz/node_modules/debug/src Deleted

roundcubemail-1.5.tar.gz/node_modules/debug/src/browser.js Deleted

@@ -1,180 +0,0 @@
-"use strict";
-
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-/* eslint-env browser */
-
-/**
- * This is the web browser implementation of `debug()`.
- */
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-exports.storage = localstorage();
-/**
- * Colors.
- */
-
-exports.colors = '#0000CC', '#0000FF', '#0033CC', '#0033FF', '#0066CC', '#0066FF', '#0099CC', '#0099FF', '#00CC00', '#00CC33', '#00CC66', '#00CC99', '#00CCCC', '#00CCFF', '#3300CC', '#3300FF', '#3333CC', '#3333FF', '#3366CC', '#3366FF', '#3399CC', '#3399FF', '#33CC00', '#33CC33', '#33CC66', '#33CC99', '#33CCCC', '#33CCFF', '#6600CC', '#6600FF', '#6633CC', '#6633FF', '#66CC00', '#66CC33', '#9900CC', '#9900FF', '#9933CC', '#9933FF', '#99CC00', '#99CC33', '#CC0000', '#CC0033', '#CC0066', '#CC0099', '#CC00CC', '#CC00FF', '#CC3300', '#CC3333', '#CC3366', '#CC3399', '#CC33CC', '#CC33FF', '#CC6600', '#CC6633', '#CC9900', '#CC9933', '#CCCC00', '#CCCC33', '#FF0000', '#FF0033', '#FF0066', '#FF0099', '#FF00CC', '#FF00FF', '#FF3300', '#FF3333', '#FF3366', '#FF3399', '#FF33CC', '#FF33FF', '#FF6600', '#FF6633', '#FF9900', '#FF9933', '#FFCC00', '#FFCC33';
-/**
- * Currently only WebKit-based Web Inspectors, Firefox >= v31,
- * and the Firebug extension (any Firefox version) are known
- * to support "%c" CSS customizations.
- *
- * TODO: add a `localStorage` variable to explicitly enable/disable colors
- */
-// eslint-disable-next-line complexity
-
-function useColors() {
-  // NB: In an Electron preload script, document will be defined but not fully
-  // initialized. Since we know we're in Chrome, we'll just detect this case
-  // explicitly
-  if (typeof window !== 'undefined' && window.process && (window.process.type === 'renderer' || window.process.__nwjs)) {
-    return true;
-  } // Internet Explorer and Edge do not support colors.
-
-
-  if (typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
-    return false;
-  } // Is webkit? http://stackoverflow.com/a/16459606/376773
-  // document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
-
-
-  return typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || // Is firebug? http://stackoverflow.com/a/398120/376773
-  typeof window !== 'undefined' && window.console && (window.console.firebug || window.console.exception && window.console.table) || // Is firefox >= v31?
-  // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-  typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31 || // Double check webkit in userAgent just in case we are in a worker
-  typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
-}
-/**
- * Colorize log arguments if enabled.
- *
- * @api public
- */
-
-
-function formatArgs(args) {
-  args0 = (this.useColors ? '%c' : '') + this.namespace + (this.useColors ? ' %c' : ' ') + args0 + (this.useColors ? '%c ' : ' ') + '+' + module.exports.humanize(this.diff);
-
-  if (!this.useColors) {
-    return;
-  }
-
-  var c = 'color: ' + this.color;
-  args.splice(1, 0, c, 'color: inherit'); // The final "%c" is somewhat tricky, because there could be other
-  // arguments passed either before or after the %c, so we need to
-  // figure out the correct index to insert the CSS into
-
-  var index = 0;
-  var lastC = 0;
-  args0.replace(/%a-zA-Z%/g, function (match) {
-    if (match === '%%') {
-      return;
-    }
-
-    index++;
-
-    if (match === '%c') {
-      // We only are interested in the *last* %c
-      // (the user may have provided their own)
-      lastC = index;
-    }
-  });
-  args.splice(lastC, 0, c);
-}
-/**
- * Invokes `console.log()` when available.
- * No-op when `console.log` is not a "function".
- *
- * @api public
- */
-
-
-function log() {
-  var _console;
-
-  // This hackery is required for IE8/9, where
-  // the `console.log` function doesn't have 'apply'
-  return (typeof console === "undefined" ? "undefined" : _typeof(console)) === 'object' && console.log && (_console = console).log.apply(_console, arguments);
-}
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
-
-
-function save(namespaces) {
-  try {
-    if (namespaces) {
-      exports.storage.setItem('debug', namespaces);
-    } else {
-      exports.storage.removeItem('debug');
-    }
-  } catch (error) {// Swallow
-    // XXX (@Qix-) should we be logging these?
-  }
-}
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-
-function load() {
-  var r;
-
-  try {
-    r = exports.storage.getItem('debug');
-  } catch (error) {} // Swallow
-  // XXX (@Qix-) should we be logging these?
-  // If debug isn't set in LS, and we're in Electron, try to load $DEBUG
-
-
-  if (!r && typeof process !== 'undefined' && 'env' in process) {
-    r = process.env.DEBUG;
-  }
-
-  return r;
-}
-/**
- * Localstorage attempts to return the localstorage.
- *
- * This is necessary because safari throws
- * when a user disables cookies/localstorage
- * and you attempt to access it.
- *
- * @return {LocalStorage}
- * @api private
- */
-
-
-function localstorage() {
-  try {
-    // TVMLKit (Apple TV JS Runtime) does not have a window object, just localStorage in the global context
-    // The Browser also has localStorage in the global context.
-    return localStorage;
-  } catch (error) {// Swallow
-    // XXX (@Qix-) should we be logging these?
-  }
-}
-
-module.exports = require('./common')(exports);
-var formatters = module.exports.formatters;
-/**
- * Map %j to `JSON.stringify()`, since no Web Inspectors do that by default.
- */
-
-formatters.j = function (v) {
-  try {
-    return JSON.stringify(v);
-  } catch (error) {
-    return 'UnexpectedJSONParseError: ' + error.message;
-  }
-};
-

roundcubemail-1.5.tar.gz/node_modules/debug/src/common.js Deleted

@@ -1,249 +0,0 @@
-"use strict";
-
-/**
- * This is the common logic for both the Node.js and web browser
- * implementations of `debug()`.
- */
-function setup(env) {
-  createDebug.debug = createDebug;
-  createDebug.default = createDebug;
-  createDebug.coerce = coerce;
-  createDebug.disable = disable;
-  createDebug.enable = enable;
-  createDebug.enabled = enabled;
-  createDebug.humanize = require('ms');
-  Object.keys(env).forEach(function (key) {
-    createDebugkey = envkey;
-  });
-  /**
-  * Active `debug` instances.
-  */
-
-  createDebug.instances = ;
-  /**
-  * The currently active debug mode names, and names to skip.
-  */
-
-  createDebug.names = ;
-  createDebug.skips = ;
-  /**
-  * Map of special "%n" handling functions, for the debug "format" argument.
-  *
-  * Valid key names are a single, lower or upper-case letter, i.e. "n" and "N".
-  */
-
-  createDebug.formatters = {};
-  /**
-  * Selects a color for a debug namespace
-  * @param {String} namespace The namespace string for the for the debug instance to be colored
-  * @return {Number|String} An ANSI color code for the given namespace
-  * @api private
-  */
-
-  function selectColor(namespace) {
-    var hash = 0;
-
-    for (var i = 0; i < namespace.length; i++) {
-      hash = (hash << 5) - hash + namespace.charCodeAt(i);
-      hash |= 0; // Convert to 32bit integer
-    }
-
-    return createDebug.colorsMath.abs(hash) % createDebug.colors.length;
-  }
-
-  createDebug.selectColor = selectColor;
-  /**
-  * Create a debugger with the given `namespace`.
-  *
-  * @param {String} namespace
-  * @return {Function}
-  * @api public
-  */
-
-  function createDebug(namespace) {
-    var prevTime;
-
-    function debug() {
-      // Disabled?
-      if (!debug.enabled) {
-        return;
-      }
-
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args_key = arguments_key;
-      }
-
-      var self = debug; // Set `diff` timestamp
-
-      var curr = Number(new Date());
-      var ms = curr - (prevTime || curr);
-      self.diff = ms;
-      self.prev = prevTime;
-      self.curr = curr;
-      prevTime = curr;
-      args0 = createDebug.coerce(args0);
-
-      if (typeof args0 !== 'string') {
-        // Anything else let's inspect with %O
-        args.unshift('%O');
-      } // Apply any `formatters` transformations
-
-
-      var index = 0;
-      args0 = args0.replace(/%(a-zA-Z%)/g, function (match, format) {
-        // If we encounter an escaped % then don't increase the array index
-        if (match === '%%') {
-          return match;
-        }
-
-        index++;
-        var formatter = createDebug.formattersformat;
-
-        if (typeof formatter === 'function') {
-          var val = argsindex;
-          match = formatter.call(self, val); // Now we need to remove `argsindex` since it's inlined in the `format`
-
-          args.splice(index, 1);
-          index--;
-        }
-
-        return match;
-      }); // Apply env-specific formatting (colors, etc.)
-
-      createDebug.formatArgs.call(self, args);
-      var logFn = self.log || createDebug.log;
-      logFn.apply(self, args);
-    }
-
-    debug.namespace = namespace;
-    debug.enabled = createDebug.enabled(namespace);
-    debug.useColors = createDebug.useColors();
-    debug.color = selectColor(namespace);
-    debug.destroy = destroy;
-    debug.extend = extend; // Debug.formatArgs = formatArgs;
-    // debug.rawLog = rawLog;
-    // env-specific initialization logic for debug instances
-
-    if (typeof createDebug.init === 'function') {
-      createDebug.init(debug);
-    }
-
-    createDebug.instances.push(debug);
-    return debug;
-  }
-
-  function destroy() {
-    var index = createDebug.instances.indexOf(this);
-
-    if (index !== -1) {
-      createDebug.instances.splice(index, 1);
-      return true;
-    }
-
-    return false;
-  }
-
-  function extend(namespace, delimiter) {
-    return createDebug(this.namespace + (typeof delimiter === 'undefined' ? ':' : delimiter) + namespace);
-  }
-  /**
-  * Enables a debug mode by namespaces. This can include modes
-  * separated by a colon and wildcards.
-  *
-  * @param {String} namespaces
-  * @api public
-  */
-
-
-  function enable(namespaces) {
-    createDebug.save(namespaces);
-    createDebug.names = ;
-    createDebug.skips = ;
-    var i;
-    var split = (typeof namespaces === 'string' ? namespaces : '').split(/\s,+/);
-    var len = split.length;
-
-    for (i = 0; i < len; i++) {
-      if (!spliti) {
-        // ignore empty strings
-        continue;
-      }
-
-      namespaces = spliti.replace(/\*/g, '.*?');
-
-      if (namespaces0 === '-') {
-        createDebug.skips.push(new RegExp('^' + namespaces.substr(1) + '$'));
-      } else {
-        createDebug.names.push(new RegExp('^' + namespaces + '$'));
-      }
-    }
-
-    for (i = 0; i < createDebug.instances.length; i++) {
-      var instance = createDebug.instancesi;
-      instance.enabled = createDebug.enabled(instance.namespace);
-    }
-  }
-  /**
-  * Disable debug output.
-  *
-  * @api public
-  */
-
-
-  function disable() {
-    createDebug.enable('');
-  }
-  /**
-  * Returns true if the given mode name is enabled, false otherwise.
-  *
-  * @param {String} name
-  * @return {Boolean}
-  * @api public
-  */
-
-
-  function enabled(name) {
-    if (namename.length - 1 === '*') {
-      return true;
-    }
-
-    var i;
-    var len;
-
-    for (i = 0, len = createDebug.skips.length; i < len; i++) {
-      if (createDebug.skipsi.test(name)) {
-        return false;
-      }
-    }
-
-    for (i = 0, len = createDebug.names.length; i < len; i++) {
-      if (createDebug.namesi.test(name)) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-  /**
-  * Coerce `val`.
-  *
-  * @param {Mixed} val
-  * @return {Mixed}
-  * @api private
-  */
-
-
-  function coerce(val) {
-    if (val instanceof Error) {
-      return val.stack || val.message;
-    }
-
-    return val;
-  }
-
-  createDebug.enable(createDebug.load());
-  return createDebug;
-}
-
-module.exports = setup;
-

roundcubemail-1.5.tar.gz/node_modules/debug/src/index.js Deleted

roundcubemail-1.5.tar.gz/node_modules/debug/src/node.js Deleted

@@ -1,177 +0,0 @@
-"use strict";
-
-/**
- * Module dependencies.
- */
-var tty = require('tty');
-
-var util = require('util');
-/**
- * This is the Node.js implementation of `debug()`.
- */
-
-
-exports.init = init;
-exports.log = log;
-exports.formatArgs = formatArgs;
-exports.save = save;
-exports.load = load;
-exports.useColors = useColors;
-/**
- * Colors.
- */
-
-exports.colors = 6, 2, 3, 4, 5, 1;
-
-try {
-  // Optional dependency (as in, doesn't need to be installed, NOT like optionalDependencies in package.json)
-  // eslint-disable-next-line import/no-extraneous-dependencies
-  var supportsColor = require('supports-color');
-
-  if (supportsColor && (supportsColor.stderr || supportsColor).level >= 2) {
-    exports.colors = 20, 21, 26, 27, 32, 33, 38, 39, 40, 41, 42, 43, 44, 45, 56, 57, 62, 63, 68, 69, 74, 75, 76, 77, 78, 79, 80, 81, 92, 93, 98, 99, 112, 113, 128, 129, 134, 135, 148, 149, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 178, 179, 184, 185, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 214, 215, 220, 221;
-  }
-} catch (error) {} // Swallow - we only care if `supports-color` is available; it doesn't have to be.
-
-/**
- * Build up the default `inspectOpts` object from the environment variables.
- *
- *   $ DEBUG_COLORS=no DEBUG_DEPTH=10 DEBUG_SHOW_HIDDEN=enabled node script.js
- */
-
-
-exports.inspectOpts = Object.keys(process.env).filter(function (key) {
-  return /^debug_/i.test(key);
-}).reduce(function (obj, key) {
-  // Camel-case
-  var prop = key.substring(6).toLowerCase().replace(/_(a-z)/g, function (_, k) {
-    return k.toUpperCase();
-  }); // Coerce string value into JS value
-
-  var val = process.envkey;
-
-  if (/^(yes|on|true|enabled)$/i.test(val)) {
-    val = true;
-  } else if (/^(no|off|false|disabled)$/i.test(val)) {
-    val = false;
-  } else if (val === 'null') {
-    val = null;
-  } else {
-    val = Number(val);
-  }
-
-  objprop = val;
-  return obj;
-}, {});
-/**
- * Is stdout a TTY? Colored output is enabled when `true`.
- */
-
-function useColors() {
-  return 'colors' in exports.inspectOpts ? Boolean(exports.inspectOpts.colors) : tty.isatty(process.stderr.fd);
-}
-/**
- * Adds ANSI color escape codes if enabled.
- *
- * @api public
- */
-
-
-function formatArgs(args) {
-  var name = this.namespace,
-      useColors = this.useColors;
-
-  if (useColors) {
-    var c = this.color;
-    var colorCode = "\x1B3" + (c < 8 ? c : '8;5;' + c);
-    var prefix = "  ".concat(colorCode, ";1m").concat(name, " \x1B0m");
-    args0 = prefix + args0.split('\n').join('\n' + prefix);
-    args.push(colorCode + 'm+' + module.exports.humanize(this.diff) + "\x1B0m");
-  } else {
-    args0 = getDate() + name + ' ' + args0;
-  }
-}
-
-function getDate() {
-  if (exports.inspectOpts.hideDate) {
-    return '';
-  }
-
-  return new Date().toISOString() + ' ';
-}
-/**
- * Invokes `util.format()` with the specified arguments and writes to stderr.
- */
-
-
-function log() {
-  return process.stderr.write(util.format.apply(util, arguments) + '\n');
-}
-/**
- * Save `namespaces`.
- *
- * @param {String} namespaces
- * @api private
- */
-
-
-function save(namespaces) {
-  if (namespaces) {
-    process.env.DEBUG = namespaces;
-  } else {
-    // If you set a process.env field to null or undefined, it gets cast to the
-    // string 'null' or 'undefined'. Just delete instead.
-    delete process.env.DEBUG;
-  }
-}
-/**
- * Load `namespaces`.
- *
- * @return {String} returns the previously persisted debug modes
- * @api private
- */
-
-
-function load() {
-  return process.env.DEBUG;
-}
-/**
- * Init logic for `debug` instances.
- *
- * Create a new `inspectOpts` object in case `useColors` is set
- * differently for a particular `debug` instance.
- */
-
-
-function init(debug) {
-  debug.inspectOpts = {};
-  var keys = Object.keys(exports.inspectOpts);
-
-  for (var i = 0; i < keys.length; i++) {
-    debug.inspectOptskeysi = exports.inspectOptskeysi;
-  }
-}
-
-module.exports = require('./common')(exports);
-var formatters = module.exports.formatters;
-/**
- * Map %o to `util.inspect()`, all on a single line.
- */
-
-formatters.o = function (v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts)
-    .split('\n')
-    .map(function (str) { return str.trim(); })
-    .join(' ');
-};
-/**
- * Map %O to `util.inspect()`, allowing multiple lines if needed.
- */
-
-
-formatters.O = function (v) {
-  this.inspectOpts.colors = this.useColors;
-  return util.inspect(v, this.inspectOpts);
-};
-

roundcubemail-1.5.tar.gz/node_modules/ms Deleted

roundcubemail-1.5.tar.gz/node_modules/ms/index.js Deleted

@@ -1,162 +0,0 @@
-/**
- * Helpers.
- */
-
-var s = 1000;
-var m = s * 60;
-var h = m * 60;
-var d = h * 24;
-var w = d * 7;
-var y = d * 365.25;
-
-/**
- * Parse or format the given `val`.
- *
- * Options:
- *
- *  - `long` verbose formatting false
- *
- * @param {String|Number} val
- * @param {Object} options
- * @throws {Error} throw an error if val is not a non-empty string or a number
- * @return {String|Number}
- * @api public
- */
-
-module.exports = function (val, options) {
-  options = options || {};
-  var type = typeof val;
-  if (type === 'string' && val.length > 0) {
-    return parse(val);
-  } else if (type === 'number' && isFinite(val)) {
-    return options.long ? fmtLong(val) : fmtShort(val);
-  }
-  throw new Error(
-    'val is not a non-empty string or a valid number. val=' +
-      JSON.stringify(val)
-  );
-};
-
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @param {String} str
- * @return {Number}
- * @api private
- */
-
-function parse(str) {
-  str = String(str);
-  if (str.length > 100) {
-    return;
-  }
-  var match = /^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
-    str
-  );
-  if (!match) {
-    return;
-  }
-  var n = parseFloat(match1);
-  var type = (match2 || 'ms').toLowerCase();
-  switch (type) {
-    case 'years':
-    case 'year':
-    case 'yrs':
-    case 'yr':
-    case 'y':
-      return n * y;
-    case 'weeks':
-    case 'week':
-    case 'w':
-      return n * w;
-    case 'days':
-    case 'day':
-    case 'd':
-      return n * d;
-    case 'hours':
-    case 'hour':
-    case 'hrs':
-    case 'hr':
-    case 'h':
-      return n * h;
-    case 'minutes':
-    case 'minute':
-    case 'mins':
-    case 'min':
-    case 'm':
-      return n * m;
-    case 'seconds':
-    case 'second':
-    case 'secs':
-    case 'sec':
-    case 's':
-      return n * s;
-    case 'milliseconds':
-    case 'millisecond':
-    case 'msecs':
-    case 'msec':
-    case 'ms':
-      return n;
-    default:
-      return undefined;
-  }
-}
-
-/**
- * Short format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function fmtShort(ms) {
-  var msAbs = Math.abs(ms);
-  if (msAbs >= d) {
-    return Math.round(ms / d) + 'd';
-  }
-  if (msAbs >= h) {
-    return Math.round(ms / h) + 'h';
-  }
-  if (msAbs >= m) {
-    return Math.round(ms / m) + 'm';
-  }
-  if (msAbs >= s) {
-    return Math.round(ms / s) + 's';
-  }
-  return ms + 'ms';
-}
-
-/**
- * Long format for `ms`.
- *
- * @param {Number} ms
- * @return {String}
- * @api private
- */
-
-function fmtLong(ms) {
-  var msAbs = Math.abs(ms);
-  if (msAbs >= d) {
-    return plural(ms, msAbs, d, 'day');
-  }
-  if (msAbs >= h) {
-    return plural(ms, msAbs, h, 'hour');
-  }
-  if (msAbs >= m) {
-    return plural(ms, msAbs, m, 'minute');
-  }
-  if (msAbs >= s) {
-    return plural(ms, msAbs, s, 'second');
-  }
-  return ms + ' ms';
-}
-
-/**
- * Pluralization helper.
- */
-
-function plural(ms, msAbs, n, name) {
-  var isPlural = msAbs >= n * 1.5;
-  return Math.round(ms / n) + ' ' + name + (isPlural ? 's' : '');
-}

roundcubemail-1.5.tar.gz/node_modules/ms/license.md Deleted

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 Vercel, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

roundcubemail-1.5.tar.gz/node_modules/ms/package.json Deleted

@@ -1,70 +0,0 @@
-{
-  "_from": "ms@^2.1.1",
-  "_id": "ms@2.1.3",
-  "_inBundle": false,
-  "_integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-  "_location": "/ms",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "ms@^2.1.1",
-    "name": "ms",
-    "escapedName": "ms",
-    "rawSpec": "^2.1.1",
-    "saveSpec": null,
-    "fetchSpec": "^2.1.1"
-  },
-  "_requiredBy": 
-    "/debug"
-  ,
-  "_resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-  "_shasum": "574c8138ce1d2b5861f0b44579dbadd60c6615b2",
-  "_spec": "ms@^2.1.1",
-  "_where": "/tmp/roundcubemail-1.5/roundcubemail-1.5/node_modules/debug",
-  "bugs": {
-    "url": "https://github.com/vercel/ms/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "Tiny millisecond conversion utility",
-  "devDependencies": {
-    "eslint": "4.18.2",
-    "expect.js": "0.3.1",
-    "husky": "0.14.3",
-    "lint-staged": "5.0.0",
-    "mocha": "4.0.1",
-    "prettier": "2.0.5"
-  },
-  "eslintConfig": {
-    "extends": "eslint:recommended",
-    "env": {
-      "node": true,
-      "es6": true
-    }
-  },
-  "files": 
-    "index.js"
-  ,
-  "homepage": "https://github.com/vercel/ms#readme",
-  "license": "MIT",
-  "lint-staged": {
-    "*.js": 
-      "npm run lint",
-      "prettier --single-quote --write",
-      "git add"
-    
-  },
-  "main": "./index",
-  "name": "ms",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/vercel/ms.git"
-  },
-  "scripts": {
-    "lint": "eslint lib/* bin/*",
-    "precommit": "lint-staged",
-    "test": "mocha tests.js"
-  },
-  "version": "2.1.3"
-}

roundcubemail-1.5.tar.gz/node_modules/ms/readme.md Deleted

@@ -1,59 +0,0 @@
-# ms
-
-!CI(https://github.com/vercel/ms/workflows/CI/badge.svg)
-
-Use this package to easily convert various time formats to milliseconds.
-
-## Examples
-
-```js
-ms('2 days')  // 172800000
-ms('1d')      // 86400000
-ms('10h')     // 36000000
-ms('2.5 hrs') // 9000000
-ms('2h')      // 7200000
-ms('1m')      // 60000
-ms('5s')      // 5000
-ms('1y')      // 31557600000
-ms('100')     // 100
-ms('-3 days') // -259200000
-ms('-1h')     // -3600000
-ms('-200')    // -200
-```
-
-### Convert from Milliseconds
-
-```js
-ms(60000)             // "1m"
-ms(2 * 60000)         // "2m"
-ms(-3 * 60000)        // "-3m"
-ms(ms('10 hours'))    // "10h"
-```
-
-### Time Format Written-Out
-
-```js
-ms(60000, { long: true })             // "1 minute"
-ms(2 * 60000, { long: true })         // "2 minutes"
-ms(-3 * 60000, { long: true })        // "-3 minutes"
-ms(ms('10 hours'), { long: true })    // "10 hours"
-```
-
-## Features
-
-- Works both in Node.js(https://nodejs.org) and in the browser
-- If a number is supplied to `ms`, a string with a unit is returned
-- If a string that contains the number is supplied, it returns it as a number (e.g.: it returns `100` for `'100'`)
-- If you pass a string with a number and a valid unit, the number of equivalent milliseconds is returned
-
-## Related Packages
-
-- ms.macro(https://github.com/knpwrs/ms.macro) - Run `ms` as a macro at build-time.
-
-## Caught a Bug?
-
-1. Fork(https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then clone(https://help.github.com/articles/cloning-a-repository/) it to your local device
-2. Link the package to the global module directory: `npm link`
-3. Within the module you want to test your local development instance of ms, just link it to the dependencies: `npm link ms`. Instead of the default one from npm, Node.js will now use your clone of ms!
-
-As always, you can run the tests using: `npm test`

roundcubemail-1.5.tar.gz/node_modules/needle/README.md Changed

@@ -58,6 +58,7 @@
  - Automatic XML & JSON parsing
  - 301/302/303 redirect following, with fine-grained tuning, and
  - Streaming non-UTF-8 charset decoding, via `iconv-lite`
+ - Aborting any or all Needle requests using `AbortSignal` objects
 
 And yes, Mr. Wayne, it does come in black.
 
@@ -317,6 +318,7 @@
  - `stream_length`: When sending streams, this lets you manually set the Content-Length header --if the stream's bytecount is known beforehand--, preventing ECONNRESET (socket hang up) errors on some servers that misbehave when receiving payloads of unknown size. Set it to `0` and Needle will get and set the stream's length for you, or leave unset for the default behaviour, which is no Content-Length header for stream payloads.
  - `localAddress`: <string>, IP address. Passed to http/https request. Local interface from which the request should be emitted.
  - `uri_modifier`: Anonymous function taking request (or redirect location if following redirects) URI as an argument and modifying it given logic. It has to return a valid URI string for successful request.
+ - `signal`      : An `AbortSignal` object that can be used to abort any or all Needle requests.
 
 Response options
 ----------------
@@ -609,10 +611,18 @@
     $ openssl req -new -key test/keys/ssl.key -x509 -days 999 -out test/keys/ssl.cert
 
 Then you should be able to run `npm test` once you have the dependencies in place.
+To run the tests with debug logs, set the environment variable `NODE_DEBUG` to `needle` (for example, by running `NODE_DEBUG=needle npm test`).
 
 > Note: Tests currently only work on linux-based environments that have `/proc/self/fd`. They *do not* work on MacOS environments.
 > You can use Docker to run tests by creating a container and mounting the needle project directory on `/app`
-> `docker create --name Needle -v /app -w /app -v /app/node_modules -i node:argon`
+
+    docker create --name Needle -v $(pwd) -w /app -v $(pwd)/node_modules -i node:argon
+
+Or alternatively:
+
+    docker run -it -w /app --name Needle \
+    --mount type=bind,source="$(pwd)",target=/app \
+    node:fermium bash
 
 Credits
 -------

roundcubemail-1.5.tar.gz/node_modules/needle/examples/stream-multiple Added

roundcubemail-1.5.tar.gz/node_modules/needle/examples/stream-multiple/app.js Added

roundcubemail-1.5.tar.gz/node_modules/needle/examples/stream-multiple/env.js Added

roundcubemail-1.5.tar.gz/node_modules/needle/examples/stream-multiple/package.json Added

roundcubemail-1.5.tar.gz/node_modules/needle/examples/stream-multiple/stream-multiple.js Added

@@ -0,0 +1,50 @@
+var needle = require('needle');
+const fs = require('fs-extra')
+
+function stream_multiple(req, res, _urls, stream_dir, index = 0) {
+    if (index == 0) {
+        // initial state
+    }
+
+    let writeStream;
+    const uri = _urlsindex;
+
+    if (index == undefined) {
+        index = 0;
+        stream_multiple(req, res, _urls, stream_dir, index);
+    } else {
+
+        writeStream = fs.createWriteStream(`${stream_dir}` + `${index}.jpeg`);
+
+        writeStream.on("ready", () => console.log({ msg: `STREAM::WRITE::READY::${index}` }));
+        writeStream.on("open", () => console.log({ msg: `STREAM::WRITE::OPEN::${index}` }));
+        writeStream.on("finish", () => console.log({ msg: `STREAM::WRITE::DONE::${index}` }));
+
+        writeStream.on('close', () => {
+            if (index >= _urls.length - 1) {
+                res.redirect('/');
+            } else {
+                stream_multiple(req, res, _urls, stream_dir, index + 1);
+            }
+        })
+
+        needle
+            .get(uri, function (error, response) {
+                if (response.bytes >= 1) {
+                    // you want to kill our servers
+                }
+
+                if (!error && response.statusCode == 200) {
+                    // good
+                } else {
+                    // then we can retry later
+                }
+            })
+            .pipe(writeStream)
+            .on('done', function () {
+                // needle 
+            });
+    }
+}
+
+module.exports = { stream_multiple }
\ No newline at end of file

roundcubemail-1.5.tar.gz/node_modules/needle/lib/decoder.js Changed

roundcubemail-1.5.tar.gz/node_modules/needle/lib/needle.js Changed

@@ -1,7 +1,7 @@
 //////////////////////////////////////////
 // Needle -- HTTP Client for Node.js
 // Written by Tomás Pollak <tomas@forkhq.com>
-// (c) 2012-2020 - Fork Ltd.
+// (c) 2012-2023 - Fork Ltd.
 // MIT Licensed
 //////////////////////////////////////////
 
@@ -10,7 +10,7 @@
     https       = require('https'),
     url         = require('url'),
     stream      = require('stream'),
-    debug       = require('debug')('needle'),
+    debug       = require('util').debuglog('needle'),
     stringify   = require('./querystring').build,
     multipart   = require('./multipart'),
     auth        = require('./auth'),
@@ -97,6 +97,9 @@
   follow_max              : 0,
   stream_length           : -1,
 
+  // abort signal
+  signal                  : null,
+
   // booleans
   compressed              : false,
   decode_response         : true,
@@ -106,7 +109,8 @@
   follow_keep_method      : false,
   follow_if_same_host     : false,
   follow_if_same_protocol : false,
-  follow_if_same_location : false
+  follow_if_same_location : false,
+  use_proxy_from_env_var  : true
 }
 
 var aliased = {
@@ -188,7 +192,8 @@
     http_opts : {
       agent: get_option('agent', defaults.agent),
       localAddress: get_option('localAddress', undefined),
-      lookup: get_option('lookup', undefined)
+      lookup: get_option('lookup', undefined),
+      signal: get_option('signal', defaults.signal)
     }, // passed later to http.request() directly
     headers   : {},
     output    : options.output,
@@ -205,6 +210,9 @@
     configkey = check_value('number', key);
   })
 
+  if (config.http_opts.signal && !(config.http_opts.signal instanceof AbortSignal))
+    throw new TypeError(typeof config.http_opts.signal + ' received for signal, but expected an AbortSignal');
+
   // populate http_opts with given TLS options
   tls_options.split(' ').forEach(function(key) {
     if (typeof optionskey != 'undefined') {
@@ -255,12 +263,14 @@
     }
   }
 
-  var env_proxy = utils.get_env_var('HTTP_PROXY', 'HTTPS_PROXY', true);
-  if (!config.proxy && env_proxy) config.proxy = env_proxy;
+  if (config.use_proxy_from_env_var) {
+    var env_proxy = utils.get_env_var('HTTP_PROXY', 'HTTPS_PROXY', true);
+    if (!config.proxy && env_proxy) config.proxy = env_proxy;
+  }
 
   // if proxy is present, set auth header from either url or proxy_user option.
   if (config.proxy) {
-    if (utils.should_proxy_to(uri)) {
+    if (!config.use_proxy_from_env_var || utils.should_proxy_to(uri)) {
       if (config.proxy.indexOf('http') === -1)
         config.proxy = 'http://' + config.proxy;
 
@@ -442,7 +452,8 @@
       returned     = 0,
       self         = this,
       request_opts = this.get_request_opts(method, uri, config),
-      protocol     = request_opts.protocol == 'https:' ? https : http;
+      protocol     = request_opts.protocol == 'https:' ? https : http,
+      signal       = request_opts.signal;
 
   function done(err, resp) {
     if (returned++ > 0)
@@ -478,19 +489,25 @@
     done(err || new Error('Unknown error when making request.'));
   }
 
+  function abort_handler() {
+    out.emit('err', new Error('Aborted by signal.'));
+    request.destroy();
+  }
+
   function set_timeout(type, milisecs) {
     if (timer) clearTimeout(timer);
     if (milisecs <= 0) return;
 
     timer = setTimeout(function() {
       out.emit('timeout', type);
-      request.abort();
+      request.destroy();
       // also invoke done() to terminate job on read_timeout
       if (type == 'read') done(new Error(type + ' timeout'));
+
+      signal && signal.removeEventListener('abort', abort_handler);
     }, milisecs);
   }
 
-
   debug('Making request #' + count, request_opts);
   request = protocol.request(request_opts, function(resp) {
 
@@ -763,7 +780,15 @@
     request.end();
   }
 
-  out.abort = function() { request.abort() }; // easier access
+  if (signal) { // abort signal given, so handle it
+    if (signal.aborted === true) {
+      abort_handler();
+    } else {
+      signal.addEventListener('abort', abort_handler, { once: true });
+    }
+  }
+
+  out.abort = function() { request.destroy() }; // easier access
   out.request = request;
   return out;
 }
@@ -798,12 +823,14 @@
     var target_key = aliased.optionskey || key;
 
     if (defaults.hasOwnProperty(target_key) && typeof objkey != 'undefined') {
-      if (target_key != 'parse_response' && target_key != 'proxy' && target_key != 'agent') {
-        // ensure type matches the original, except for proxy/parse_response that can be null/bool or string
+      if (target_key != 'parse_response' && target_key != 'proxy' && target_key != 'agent' && target_key != 'signal') {
+        // ensure type matches the original, except for proxy/parse_response that can be null/bool or string, and signal that can be null/AbortSignal
         var valid_type = defaultstarget_key.constructor.name;
 
         if (objkey.constructor.name != valid_type)
           throw new TypeError('Invalid type for ' + key + ', should be ' + valid_type);
+      } else if (target_key === 'signal' && objkey !== null && !(objkey instanceof AbortSignal)) {
+        throw new TypeError('Invalid type for ' + key + ', should be AbortSignal');
       }
       defaultstarget_key = objkey;
     } else {

roundcubemail-1.5.tar.gz/node_modules/needle/lib/parsers.js Changed

roundcubemail-1.5.tar.gz/node_modules/needle/package.json Changed

@@ -1,8 +1,8 @@
 {
   "_from": "needle@^3.1.0",
-  "_id": "needle@3.2.0",
+  "_id": "needle@3.3.1",
   "_inBundle": false,
-  "_integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==",
+  "_integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
   "_location": "/needle",
   "_phantomChildren": {},
   "_requested": {
@@ -18,8 +18,8 @@
   "_requiredBy": 
     "/less"
   ,
-  "_resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz",
-  "_shasum": "07d240ebcabfd65c76c03afae7f6defe6469df44",
+  "_resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
+  "_shasum": "63f75aec580c2e77e209f3f324e2cdf3d29bd049",
   "_spec": "needle@^3.1.0",
   "_where": "/tmp/roundcubemail-1.5/roundcubemail-1.5/node_modules/less",
   "author": {
@@ -34,7 +34,6 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "debug": "^3.2.6",
     "iconv-lite": "^0.6.3",
     "sax": "^1.2.4"
   },
@@ -99,5 +98,5 @@
     "cookie",
     "redirect"
   ,
-  "version": "3.2.0"
+  "version": "3.3.1"
 }

roundcubemail-1.5.tar.gz/node_modules/needle/test/decoder_spec.js Changed

@@ -11,36 +11,31 @@
 
   this.timeout(5000);
 
-  describe('Given content-type: "text/html; charset=EUC-JP"', function() {
-
-    var port = 2233;
-    var server;
-
-    function createServer() {
-      return http.createServer(function(req, res) {
-
-        req.on('data', function(chunk) {})
-
-        req.on('end', function() {
-          // We used to pull from a particular site that is no longer up.
-          // This is a local mirror pulled from archive.org
-          // https://web.archive.org/web/20181003202907/http://www.nina.jp/server/slackware/webapp/tomcat_charset.html
-          fs.readFile('test/tomcat_charset.html', function(err, data) {
-            if (err) {
-              res.writeHead(404);
-              res.end(JSON.stringify(err));
-              return;
-            }
-            res.writeHeader(200, { 'Content-Type': 'text/html; charset=EUC-JP' })
-            res.end(data);
-          });
-        })
-
+  function staticServerFor(file, content_type) {
+    return http.createServer(function(req, res) {
+      req.on('data', function(chunk) {})
+      req.on('end', function() {
+        // We used to pull from a particular site that is no longer up.
+        // This is a local mirror pulled from archive.org
+        // https://web.archive.org/web/20181003202907/http://www.nina.jp/server/slackware/webapp/tomcat_charset.html
+        fs.readFile(file, function(err, data) {
+          if (err) {
+            res.writeHead(404);
+            res.end(JSON.stringify(err));
+            return;
+          }
+          res.writeHeader(200, { 'Content-Type': content_type })
+          res.end(data);
+        });
       })
-    }
+    })
+  }
+
+  describe('Given content-type: "text/html; charset=EUC-JP"', function() {
+    var server, port = 2233;
 
     before(function(done) {
-      server = createServer();
+      server = staticServerFor('test/files/tomcat_charset.html', 'text/html; charset=EUC-JP')
       server.listen(port, done)
       url = 'http://localhost:' + port;
     })
@@ -50,35 +45,26 @@
     })
 
     describe('with decode = false', function() {
-
       it('does not decode', function(done) {
-
         needle.get(url, { decode: false }, function(err, resp) {
           resp.body.should.be.a.String;
           chardet.detect(resp.body).encoding.should.eql('windows-1252');
           resp.body.indexOf('EUCを使う').should.eql(-1);
           done();
         })
-
       })
-
     })
 
     describe('with decode = true', function() {
-
       it('decodes', function(done) {
-
         needle.get(url, { decode: true }, function(err, resp) {
           resp.body.should.be.a.String;
           chardet.detect(resp.body).encoding.should.eql('ascii');
           resp.body.indexOf('EUCを使う').should.not.eql(-1);
           done();
         })
-
       })
-
     })
-
   })
 
   describe('Given content-type: "text/html but file is charset: gb2312', function() {
@@ -119,6 +105,43 @@
     })
   })
 
+  describe('Given content-type: text/html; charset=maccentraleurope', function() {
+    var server, port = 2233;
+
+    // from 'https://wayback.archive-it.org/3259/20160921140616/https://www.arc.gov/research/MapsofAppalachia.asp?MAP_ID=11';
+    before(function(done) {
+      server = staticServerFor('test/files/Appalachia.html', 'text/html; charset=maccentraleurope')
+      server.listen(port, done)
+      url = 'http://localhost:' + port;
+    })
+
+    after(function(done) {
+      server.close(done)
+    })
+
+    describe('with decode = false', function() {
+      it('does not decode', function(done) {
+        needle.get(url, { decode: false }, function(err, resp) {
+          resp.body.should.be.a.String;
+          chardet.detect(resp.body).encoding.should.eql('ascii');
+          done();
+        })
+      })
+    })
+
+    describe('with decode = true', function() {
+      it('does not explode', function(done) {
+        (function() {
+          needle.get(url, { decode: true }, function(err, resp) {
+            resp.body.should.be.a.String;
+            chardet.detect(resp.body).encoding.should.eql('ascii');
+            done();
+          })
+        }).should.not.throw();
+      })
+    })
+  })
+
   describe('Given content-type: "text/html"', function () {
 
     var server,
@@ -150,7 +173,6 @@
       })
 
     })
-
   })
   
   describe('multibyte characters split across chunks', function () {

roundcubemail-1.5.tar.gz/node_modules/needle/test/errors_spec.js Changed

@@ -269,4 +269,138 @@
 
   })
 
+  var node_major_ver = process.version.split('.')0.replace('v', '');
+  if (node_major_ver >= 16) {
+    describe('when request is aborted by signal', function() {
+
+      var server,
+          url = 'http://localhost:3333/foo';
+  
+      before(function() {
+        server = helpers.server({ port: 3333, wait: 600 });
+      })
+  
+      after(function() {
+        server.close();
+      })
+  
+      afterEach(function() {
+        // reset signal to default
+        needle.defaults({signal: null});
+      })
+  
+      it('works if passing an already aborted signal aborts the request', function(done) {
+        var abortedSignal = AbortSignal.abort();
+        var start = new Date();
+  
+        abortedSignal.aborted.should.equal(true);
+  
+        needle.get(url, { signal: abortedSignal, response_timeout: 10000 }, function(err, res) {
+          var timediff = (new Date() - start);
+  
+          should.not.exist(res);
+          err.code.should.equal('ABORT_ERR');
+          timediff.should.be.within(0, 50);
+  
+          done();
+        });
+      })
+  
+      it('works if request aborts before timing out', function(done) {
+        var cancel = new AbortController();
+        var start = new Date();
+  
+        needle.get(url, { signal: cancel.signal, response_timeout: 500, open_timeout: 500, read_timeout: 500 }, function(err, res) {
+          var timediff = (new Date() - start);
+  
+          should.not.exist(res);
+          if (node_major_ver <= 16)
+            err.code.should.equal('ECONNRESET');
+          if (node_major_ver > 16)
+            err.code.should.equal('ABORT_ERR');
+          cancel.signal.aborted.should.equal(true);
+          timediff.should.be.within(200, 250);
+  
+          done();
+        });
+  
+        function abort() {
+          cancel.abort();
+        }
+        setTimeout(abort, 200);
+      })
+  
+      it('works if request times out before being aborted', function(done) {
+        var cancel = new AbortController();
+        var start = new Date();
+  
+        needle.get(url, { signal: cancel.signal, response_timeout: 200, open_timeout: 200, read_timeout: 200 }, function(err, res) {
+          var timediff = (new Date() - start);
+  
+          should.not.exist(res);
+          err.code.should.equal('ECONNRESET');
+          timediff.should.be.within(200, 250);
+        });
+  
+        function abort() {
+          cancel.signal.aborted.should.equal(false);
+          done();
+        }
+        setTimeout(abort, 500);
+      })
+  
+      it('works if setting default signal aborts all requests', function(done) {
+        var cancel = new AbortController();
+  
+        needle.defaults({signal: cancel.signal});
+  
+        var start = new Date();
+        var count = 0;
+        function cb(err, res) {
+          var timediff = (new Date() - start);
+  
+          should.not.exist(res);
+          if (node_major_ver <= 16)
+            err.code.should.equal('ECONNRESET');
+          if (node_major_ver > 16)
+            err.code.should.equal('ABORT_ERR');
+          cancel.signal.aborted.should.equal(true);
+          timediff.should.be.within(200, 250);
+  
+          if ( count++ === 2 ) done();
+        }
+  
+        needle.get(url, { timeout: 300 }, cb);
+        needle.get(url, { timeout: 350 }, cb);
+        needle.get(url, { timeout: 400 }, cb);
+  
+        function abort() {
+          cancel.abort();
+        }
+        setTimeout(abort, 200);
+      })
+  
+      it('does not work if invalid signal passed', function(done) {
+        try {
+          needle.get(url, { signal: 'invalid signal' }, function(err, res) {
+            done(new Error('A bad option error expected to be thrown'));
+          });
+        } catch(e) {
+          e.should.be.a.TypeError;
+          done();
+        }
+      })
+  
+      it('does not work if invalid signal set by default', function(done) {
+        try {
+          needle.defaults({signal: new Error(), timeout: 1200});
+          done(new Error('A bad option error expected to be thrown'));
+        } catch(e) {
+          e.should.be.a.TypeError;
+          done();
+        }
+      })
+  
+    })
+  }
 })

roundcubemail-1.5.tar.gz/node_modules/needle/test/files Added

roundcubemail-1.5.tar.gz/node_modules/needle/test/files/Appalachia.html Added

@@ -0,0 +1,797 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=windows-1252">
+<title>County Economic Status in Appalachia, FY 2004 - Appalachian Regional Commission</title>
+<link href="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/style.css" rel="stylesheet" type="text/css">
+
+<script type="text/javascript" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/functions.js.asp"></script>
+<script src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/frameResizer.js" type="text/javascript"></script>
+
+
+
+
+<meta name="keywords" content="economic status maps, maps, County Economic Status in Appalachia, FY 2004">
+
+<meta name="description" content="This map shows ARCs economic classification of the Region's counties for FY 2004.">
+
+
+
+		<link rel="apple-touch-icon" sizes="57x57" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-57x57.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="60x60" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-60x60.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="72x72" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-72x72.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="76x76" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-76x76.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="114x114" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-114x114.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="120x120" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-120x120.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="144x144" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-144x144.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="152x152" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-152x152.png?v=5AA66MbXqM">
+		<link rel="apple-touch-icon" sizes="180x180" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/apple-touch-icon-180x180.png?v=5AA66MbXqM">
+		<link rel="icon" type="image/png" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/favicon-32x32.png?v=5AA66MbXqM" sizes="32x32">
+		<link rel="icon" type="image/png" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/android-chrome-192x192.png?v=5AA66MbXqM" sizes="192x192">
+		<link rel="icon" type="image/png" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/favicon-96x96.png?v=5AA66MbXqM" sizes="96x96">
+		<link rel="icon" type="image/png" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/favicon-16x16.png?v=5AA66MbXqM" sizes="16x16">
+		<meta name="msapplication-config" content="/icons/browserconfig.xml">
+
+		<link rel="shortcut icon" href="https://wayback.archive-it.org/3259/20160318141818im_/http://www.arc.gov/icons/favicon.ico?v=5AA66MbXqM">
+		<meta name="msapplication-TileColor" content="#2d89ef">
+		<meta name="msapplication-TileImage" content="/icons/mstile-144x144.png?v=5AA66MbXqM">
+		<meta name="theme-color" content="#ffffff">
+
+
+</head>
+
+<body style="background-color:#cccccc; margin:0;"><wb_div id="wm-disclaim" dir="ltr" style="display: none;" lang="en">
+<wb_div id="wm-disclaim-hide" onclick="document.getElementById('wm-disclaim').style.display='none'">
+hide
+</wb_div>
+You are viewing an archived web page collected  at the request of <a href="https://archive-it.org/organizations/593">Federal Depository Library Program Web Archive</a>  using <a href="https://archive-it.org/">Archive-It</a>. This page was captured  on 14:18:18 Mar 18, 2016,
+and is part of the <a href="https://archive-it.org/public/collection.html?id=3259">ARC, Appalachian Regional Commission</a> collection.
+The information on this web page may be out of date. See <a href="https://wayback.archive-it.org/3259/*/http://www.arc.gov/research/MapsofAppalachia.asp?MAP_ID=11">All versions</a> of this archived page.
+<span id="wm-media-button" style="color: rgb(0, 0, 0) !important;">Found 0 archived media items out of 0 total on this page. </span>
+<script id="lazyScript" type="text/javascript" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/MapsofAppalachia.asp%20MAP_ID=11"></script>
+<span id="aitDiv"></span>
+                <wb_div id="qaMissingUrlsDiv" style="display: none"><a href="https://wayback.archive-it.org/livewebRecord/3259/20160318141818/https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?MAP_ID=11">Enable QA</a>
+
+<a id="qaMissingUrlsLink" target="_blank" style="margin-left: 20px; display: none" href="https://partner.archive-it.org/593/collections/3259/qa?page=http%3A//www.arc.gov/research/MapsofAppalachia.asp%3FMAP_ID%3D11">View Missing URLs</a>
+
+<script type="text/javascript" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/missingUrlRecord.html"></script>
+<script id="loadMissingCountScript" type="text/javascript" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/missing_url_record.html"></script>
+</wb_div>
+
+
+<script type="text/javascript">var _____WB$wombat$assign$function_____ = function(name) {return (self._wb_wombat && self._wb_wombat.local_init && self._wb_wombat.local_init(name)) || selfname; };
+if (!self.__WB_pmw) { self.__WB_pmw = function(obj) { this.__WB_source = obj; return this; } }
+{
+let window = _____WB$wombat$assign$function_____("window");
+let globalThis = _____WB$wombat$assign$function_____("globalThis");
+let self = _____WB$wombat$assign$function_____("self");
+let document = _____WB$wombat$assign$function_____("document");
+let location = _____WB$wombat$assign$function_____("location");
+let top = _____WB$wombat$assign$function_____("top");
+let parent = _____WB$wombat$assign$function_____("parent");
+let frames = _____WB$wombat$assign$function_____("frames");
+let opener = _____WB$wombat$assign$function_____("opener");
+{
+//<!CDATA
+//lazily loading AIT metadata link generation script
+var lazyLoader = function(evt)
+{
+  document.getElementById('lazyScript').src = 'https://partner.archive-it.org/metadata_link/3259/http%3A//www.arc.gov/research/MapsofAppalachia.asp%3FMAP_ID%3D11';
+  document.getElementById('loadMissingCountScript').src = 'https://partner.archive-it.org/missing_url_record?getJS=true&type=count&collId=3259&checkBefore=20221117023313&cPage=http%3A%2F%2Fwww.arc.gov%2Fresearch%2FMapsofAppalachia.asp%3FMAP_ID%3D11&timestamp=20160318141818';
+};
+
+//ie8 and below do not support addEventListener
+if (navigator.appName.indexOf('MSIE 7') > 0){
+  //alert("msie");
+}
+
+if (window.addEventListener){
+  window.addEventListener("load", lazyLoader, true);
+} else if (window.attachEvent){
+  window.attachEvent("onload", lazyLoader);
+}
+//>
+
+}}</script>
+
+</wb_div>             
+
+
+<style>
+  #wm-media-curtain {
+    display: none !important;
+    width: 100vw !important;
+    height: 100vh !important;
+    grid-template-columns: 5% 90% 5%;
+    z-index: 2000000001 !important;
+    background-color: #000000f7 !important;
+    line-height:normal !important;
+    padding: 0 !important;
+    color: #000 !important;
+    position: fixed !important;
+    top: 0 !important;
+    left: 0 !important;
+    font-size: medium !important;
+    font-family: sans-serif !important;
+    font-weight: normal !important;
+  }
+  #wm-media-prev, #wm-media-next {
+    align-self: center !important;
+    justify-self: center !important;
+    color: #fff !important;
+    font-size: 3rem !important;
+    opacity: 0.3 !important;
+  }
+  #wm-media-prev {
+    grid-column: 1 !important;
+    grid-row: 1 / 3 !important;
+    cursor: pointer !important;
+  }
+  #wm-media-next {
+    grid-column: 3 !important;
+    grid-row: 1 / 3 !important;
+    cursor: pointer !important;
+  }
+  #wm-media-close-button {
+    align-self: start !important;
+    justify-self: center !important;
+    color: #fff !important;
+    font-size: 3rem !important;
+    opacity: 0.3 !important;
+    grid-column: 3 !important;
+    grid-row: 1 !important;
+    cursor: pointer !important;
+  }
+  #wm-media-close-button:hover, #wm-media-close-button:active,
+  #wm-media-close-button:focus, #wm-media-prev:hover,
+  #wm-media-prev:active, #wm-media-prev:focus, #wm-media-next:hover,
+  #wm-media-next:active, #wm-media-next:focus {
+    opacity: 0.9 !important;
+  }
+  #wm-media-player-container {
+    align-self: center !important;
+    justify-self: center !important;
+    color: #fff !important;
+    grid-row: 1 / 3 !important;
+    grid-column: 2 !important;
+  }
+  #wm-media-page-number {
+    align-self: end !important;
+    justify-self: center !important;
+    color: #fff !important;
+    grid-row: 2 !important;
+    grid-column: 2 !important;
+    padding-bottom: 3vh !important;
+  }
+  #wm-media-title, #wm-media-description {
+    /* width: 50vw !important; */
+    margin: 1em auto !important;
+  }
+  #wm-media-title {
+    font-weight: bold !important;
+  }
+</style>
+
+<div id="wm-media-curtain">
+  <div id="wm-media-prev" onclick="__wmMediaPrev()">&lt;</div>
+  <div id="wm-media-player-container">
+    <div id="wm-media-title">&nbsp;</div>
+    <div id="wm-media-player">&nbsp;</div>
+    <div id="wm-media-description">&nbsp;</div>
+  </div>
+  <div id="wm-media-page-number">&nbsp;</div>
+  <div id="wm-media-close-button" onclick="document.getElementById('wm-media-curtain').style.setProperty('display', 'none', 'important')">
+    ?</div>
+  <div id="wm-media-next" onclick="__wmMediaNext()">&gt;</div>
+</div>
+
+<style type="text/css">
+#wm-disclaim {
+display:block;
+line-height:normal !important;
+border:1px solid #000 !important;
+padding:5px !important;
+position:relative !important;
+z-index: 2147483643 !important;
+color:#000 !important;
+
+background-color:lightYellow !important;
+
+font-size:medium !important;
+font-family:sans-serif !important;
+font-weight:normal !important;
+text-align:center !important;
+}
+
+#wm-disclaim a {
+color:#00f !important;
+text-decoration:underline !important;
+font-size:medium !important;
+font-weight:normal !important;
+}
+
+#wm-disclaim a:hover {
+background-color: transparent !important;
+}
+
+#wm-disclaim-hide {
+float:right !important;
+margin:0 0 5px 5px !important;
+border:1px solid #ccc !important;
+padding:1px 5px !important;
+cursor:default !important;
+font-size:x-small !important;
+font-weight:bold !important;
+color:#666 !important;
+}
+#wm-disclaim-hide:hover {
+border:1px outset #ccc !important;
+}
+#wm-disclaim-hide:focus, #wm-disclaim-hide:active {
+border:1px inset #ccc !important;
+}
+
+#wm-disclaim-img {
+margin-top: -8px !important;
+float: left !important;
+vertical-align:middle !important;
+padding: 0px !important;
+}
+</style>
+
+
+<script type="text/javascript" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/disclaim-element.js"></script>
+<script type="text/javascript">
+var disclaimBanner = document.getElementById("wm-disclaim");
+if(disclaimBanner != null) {
+  disclaimElement(disclaimBanner);
+}
+</script>
+
+<script>
+function fixUpWBBanner() {
+  var wb_banner = document.getElementById("wm-disclaim");
+
+  if (wb_banner) {
+    if (document.body.firstChild !== wb_banner) {
+      document.body.insertBefore(wb_banner, document.body.firstChild);
+    }
+  }
+}
+
+setInterval(fixUpWBBanner, 2000);
+</script>
+
+
+<script>
+  var __wmAllMedia = ;
+  var __wmArchivedMedia = ;
+  var __wmPlayerIndex = -1;
+
+  function __wmMediaNext() {
+    if (__wmPlayerIndex + 1 < __wmArchivedMedia.length) {
+      __wmPlayerIndex++;
+      __wmUpdateTheaterState();
+    }
+  }
+
+  function __wmMediaPrev() {
+    if (__wmPlayerIndex > 0) {
+      __wmPlayerIndex--;
+      __wmUpdateTheaterState();
+    }
+  }
+
+  function __wmUpdateTheaterState() {
+    var activeMedia = __wmArchivedMedia__wmPlayerIndex;
+
+    if (activeMedia.title) {
+      document.getElementById("wm-media-title").textContent = activeMedia.title;
+    }
+    if (activeMedia.description) {
+      document.getElementById("wm-media-description").textContent = activeMedia.description;
+    }
+    document.getElementById("wm-media-page-number").textContent =
+      (__wmPlayerIndex + 1) + " of " + __wmArchivedMedia.length;
+
+    var newPlayerE;
+    if (activeMedia.isAudio) {
+      newPlayerE = document.createElement("audio");
+    } else {
+      newPlayerE = document.createElement("video");
+      if (activeMedia.wbThumb) {
+        newPlayerE.setAttribute("poster", activeMedia.wbThumb);
+      }
+      newPlayerE.addEventListener("loadeddata", function(e) {
+        document.getElementById("wm-media-title").style.setProperty("width", newPlayerE.videoWidth + "px", "important");
+        document.getElementById("wm-media-description").style.setProperty("width", newPlayerE.videoWidth + "px", "important");
+      });
+    }
+    newPlayerE.id = "wm-media-player";
+    newPlayerE.setAttribute("controls", "true");
+
+    var oldPlayerE = document.getElementById("wm-media-player");
+
+    newPlayerE.addEventListener("error", function(e) {
+      if (newPlayerE.error) { // sometimes this event fires for no reason???
+        var errorE = document.createElement("div");
+        errorE.id = "wm-media-player";
+        errorE.textContent = "Failed to load media (it may not have been captured). ";
+        var linkE = document.createElement("a");
+        linkE.setAttribute("href", activeMedia.wbUrl);
+        linkE.textContent = "Details";
+        errorE.appendChild(linkE);
+        var oldPlayerE = document.getElementById("wm-media-player");
+        oldPlayerE.parentElement.replaceChild(errorE, oldPlayerE);
+      }
+    });
+
+    newPlayerE.src = activeMedia.wbUrl;
+    var oldPlayerE = document.getElementById("wm-media-player");
+    oldPlayerE.parentElement.replaceChild(newPlayerE, oldPlayerE);
+
+    if (__wmPlayerIndex > 0) {
+      document.getElementById("wm-media-prev").style.setProperty("display", "initial", "important");
+    } else {
+      document.getElementById("wm-media-prev").style.setProperty("display", "none", "important");
+    }
+
+    if (__wmPlayerIndex + 1 < __wmArchivedMedia.length) {
+      document.getElementById("wm-media-next").style.setProperty("display", "initial", "important");
+    } else {
+      document.getElementById("wm-media-next").style.setProperty("display", "none", "important");
+    }
+  }
+
+(function() {
+  var mediaInfoLoaded = false;
+  var mediaPlaced = false;
+  var pageUrl = 'http://www.arc.gov/research/MapsofAppalachia.asp?MAP_ID=11';
+  var ydlJsonUrl = 'https://wayback.archive-it.org/3259/20160318141818/youtube-dl:http://www.arc.gov/research/MapsofAppalachia.asp?MAP_ID=11';
+  var totalAudio;
+  var totalVideo;
+  var archivedAudio;
+  var archivedVideo;
+
+  function countEndingDots(s) {
+    var i = s.length - 1;
+    var count = 0;
+    while (i >= 0 && si == '.') {
+      count += 1;
+      i -= 1;
+    }
+    return count;
+  }
+
+  function updateButtonWhileLoading() {
+    var oldText = document.getElementById('wm-media-button').textContent;
+    var oldDots = countEndingDots(oldText);
+    var newText;
+    if (oldDots >= 3) {
+      newText = oldText.substring(0, oldText.length - oldDots);
+    } else {
+      newText = oldText + ".";
+    }
+    document.getElementById('wm-media-button').textContent = newText;
+
+  }
+  var buttonUpdater = setInterval(updateButtonWhileLoading, 500);
+
+  function finalizeButton() {
+    clearInterval(buttonUpdater);
+    // "Found 5 archived media items out of 5 total in page. Play Archived Media"
+    var text = "Found " + __wmArchivedMedia.length + " archived media "
+      + (__wmArchivedMedia.length == 1 ? "item" : "items") + " out of "
+      + __wmAllMedia.length + " total on this page. ";
+    var e = document.getElementById("wm-media-button");
+    e.textContent = text;
+    e.style.setProperty("color", "#000", "important");
+    if (__wmArchivedMedia && __wmArchivedMedia.length) {
+      var playE = document.createElement("span");
+      playE.textContent = "??";
+      playE.style.setProperty("cursor", "pointer", "important");
+      playE.addEventListener("click", function(e) {
+        document.getElementById("wm-media-curtain").style.setProperty("display", "grid", "important");
+      });
+      e.appendChild(playE);
+    }
+  }
+
+  function placeMediaOnPageIfReady(e) {
+    console.log(e.type + " document.readyState=" + document.readyState);
+    if (e.type === "mediaInfoLoaded") {
+      mediaInfoLoaded = true;
+    }
+    if (!mediaPlaced && mediaInfoLoaded && document.readyState === "complete") {
+      mediaPlaced = true;
+      if (__wmArchivedMedia && __wmArchivedMedia.length) {
+        placeMediaOnPage(__wmArchivedMedia)
+      }
+    }
+  }
+  document.addEventListener("mediaInfoLoaded", placeMediaOnPageIfReady);
+  document.addEventListener("readystatechange", placeMediaOnPageIfReady);
+
+  function prepareMedia() {
+    window.fetch(ydlJsonUrl)
+      .then(function(response) {
+        return response.json();
+      })
+      .catch(function(e) {
+        return null;
+      })
+      .then(function(ydlJson) {
+        if (ydlJson) {
+          __wmAllMedia = enumerateMedia(ydlJson);
+        }
+        return __wmAllMedia;
+      })
+      .then(function(allMedia) {
+        var allMediaPromises = ;
+        if (allMedia && allMedia.length) {
+          allMediaPromises = checkIfArchived(allMedia);
+        }
+        return allMediaPromises;
+      })
+      .then(function(allMedia) {   // promises are resolved now
+        __wmAllMedia = allMedia;
+        if (allMedia && allMedia.length) {
+          __wmArchivedMedia = allMedia.filter(m => m.isArchived);
+        }
+        document.dispatchEvent(new Event("mediaInfoLoaded"));
+        return __wmArchivedMedia;
+      })
+      .then(function(archivedMedia) {
+        if (archivedMedia && archivedMedia.length) {
+          __wmPlayerIndex = 0;
+          __wmUpdateTheaterState();
+        }
+        return archivedMedia;
+      })
+      .then(function(archivedMedia) {
+        finalizeButton();
+      })
+      .catch(function(err) {
+        console.warn("error loading or setting up media stuff", err);
+      });
+
+    document.addEventListener('keydown', function(e) {
+      if (e.keyCode == 27) { // esc
+        document.getElementById('wm-media-curtain').style.setProperty('display', 'none', 'important');
+      } else if (e.keyCode == 37) { // left
+        __wmMediaPrev();
+      } else if (e.keyCode == 39) { // right
+        __wmMediaNext();
+      }
+    });
+  }
+
+  function enumerateMedia(ydlJson) {
+    var entries = ydlJson.entries || ydlJson;
+    var media = ;
+
+    for (var i = 0; i < entries.length; i++) {
+      var entry = entriesi;
+      var url = entry.url.slice(entry.url.indexOf('/http')+1);
+      if (entry.protocol != "https" && entry.protocol != "http") {
+        var nnnnn = String(i + 1).padStart(5, "0");
+        url = entry.webpage_url.slice(entry.webpage_url.indexOf('/http')+1);
+        url = "youtube-dl:" + nnnnn + ":" + url;
+      }
+      media.push({
+        liveUrl: url,
+        wbUrl: ydlJsonUrl.replace(/youtube-dl:.*/, url),
+        isAudio: entry.format && entry.format.includes("audio only"),
+        width: entry.width,
+        height: entry.height,
+        wbThumb: ydlJsonUrl.replace(/youtube-dl:.*/, entry.thumbnail.slice(entry.thumbnail.indexOf('/http')+1)),
+        title: entry.title,
+        description: entry.description
+      });
+    }
+
+    return media;
+  }
+
+  /* sets isArchived: true/false for each media element */
+  function checkIfArchived(media) {
+    var promises = ;
+    for (var i = 0; i < media.length; i++) {
+      var promise = (function(mediaItem) {
+        return window.fetch(mediaItem.wbUrl, {method: "HEAD"})
+          .then(function(response) {
+            mediaItem.isArchived = response.ok;
+            return mediaItem;
+          });
+      })(mediai);
+      promises.push(promise);
+    }
+    var allPromise = Promise.all(promises); // wait for all to resolve
+    return allPromise;
+  }
+
+  function findElementsToReplace() {
+    var result = ;
+    var elements = document.querySelectorAll("audio,video,object,embed,iframe");
+    for (var i = 0; i < elements.length; i++) {
+      var e = elementsi;
+      if (e.id == "wm-media-player") {
+        continue; // don't replace lightbox player!
+      } else if (e.tagName == "IFRAME") {
+        if (e.src.indexOf("youtube.com/embed/") > 0 || e.src.indexOf("player.vimeo.com/video") > 0) {
+          result.push(e);
+        }
+      } else {
+        result.push(e);
+      }
+    }
+    return result;
+  }
+
+  function placeMediaOnPage(media) {
+    var elementsToReplace = findElementsToReplace();
+    for (var i = 0; i < elementsToReplace.length && i < media.length; i++) {
+      if (!mediai.isArchived)
+        continue;
+
+      var mediaE = document.createElement(!mediai.isAudio ? "video" : "audio");
+      mediaE.setAttribute("controls", "true");
+      // mediaE.setAttribute("style", "width: 100%; height: 100%");
+      mediaE.setAttribute("style", "width: 100%; height: auto");
+      mediaE.src = mediai.wbUrl;
+
+      elementsToReplacei.parentElement.replaceChild(mediaE, elementsToReplacei);
+    }
+  }
+
+  prepareMedia();
+})();
+
+</script>
+
+<div class="centersite">
+	<div class="header">
+		<div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/index.asp"><img src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/top.jpg" style="width:1024px;height:124px;" alt="Link to ARC home page." border="0"></a></div>
+
+		<div class="searchbar"> 
+			<form action="/3259/20160318141818/http://www.arc.gov/search.asp" method="GET"><div class="searcharc">Search ARC</div>
+<input type="text" size="10" name="KEYWORDS" class="searchbox">
+<input class="searchgo" type="submit" value="Go">
+</form>		</div>
+	</div>
+	<div class="middlehome" style="background: #ffffff; ">
+		<div class="homeleftrail">
+
+			<div class="nav">
+
+				
+
+ <div style="margin-top:56px;"><div style="width:186px" class="container"><ul><li style="width:100%;"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/about/index.asp" class="mainlink">About ARC</a></li><li style="width:100%;"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/appalachian_region/TheAppalachianRegion.asp" class="mainlink">Appalachian Region</a></li><li style="width:100%;"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/program_areas/index.asp" class="mainlink">Program Areas</a></li><li style="width:100%;"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/funding/GrantsandFunding.asp" class="mainlink">Grants and Funding</a></li></ul><div style="clear:left;"></div></div></div><div class="sectiononwrapper"><div class="sectionon" style="width:170px;"><a class="sectiononlink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/RegionalDataandResearch.asp">Research, Maps, and Data</a></div><ul id="tmenu0" style="display: block;"><li class="subnav topborder" style="white-space: normal; margin-left: 10px; text-indent: -10px; cursor: default;"><img class="plusminus" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/offarrow.jpg" cc2_id="0" width="8" height="11"><div style="display: inline; padding-left: 3px;"></div><span cc2_id="0"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Research Reports</a></span><ul style="display: none;"><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=1" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Asset-Based Development</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=6" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Business</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=7" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Demographics</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=8" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Distressed Counties</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=9" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Education</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=10" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Energy</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=11" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Evaluations</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_CATEGORY=21" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Export and Trade Development</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=12" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Foundations</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=13" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Health Care</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=14" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Infrastructure</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=19" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Leadership Development and Capacity Building</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_CATEGORY=23" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Natural Resources</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=15" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Socioeconomic Research</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=16" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Telecommunications</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=17" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Tools</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=20" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Tourism Development</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/ResearchReports.asp?F_Category=18" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Transportation</a></li></ul></li><li class="subnav topborder" style="white-space: normal; margin-left: 10px; text-indent: -10px; cursor: default;"><img class="plusminus" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/offarrow.jpg" cc2_id="0" width="8" height="11"><div style="display: inline; padding-left: 3px;"></div><span cc2_id="0"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Maps</a></span><ul style="display: none;"><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=1" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Economic Status</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=2" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Education</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=3" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Geography</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=4" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Income</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=5" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Population</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=6" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Poverty</a></li><li class="subnav" style="white-space: normal; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=7" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Unemployment</a></li></ul></li><li class="subnav topborder" style="white-space: normal; margin-left: 10px; text-indent: -10px; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/DataReports.asp" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Data Reports</a></li><li class="subnav topborder" style="white-space: normal; margin-left: 10px; text-indent: -10px; cursor: default;"><div style="display: inline; padding-left: 11px;"></div><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/EconomicReports.asp" onclick="event.cancelBubble=true;if(event.stopPropagation) event.stopPropagation();">Economic Reports</a></li></ul></div><div><div style="width:186px" class="container"><ul><li style="width:100%;"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/news/index.asp" class="mainlink">Newsroom</a></li><li style="width:100%;"><a href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/publications/index.asp" class="mainlink">Publications</a></li></ul><div style="clear:left;"></div></div></div>
+<table width="100%" cellspacing="0" cellpadding="0" border="0">
+<tbody><tr><td>
+<div class="leftbottomintro"><br>
+<p><br>
+</p>
+</div>
+</td></tr>
+</tbody></table>
+
+				
+			</div>
+
+		</div>
+		<div class="intmiddlerail">
+
+			<div class="breadcrumbs">
+<div style="float:left;width:455px;">
+<a class="breadcrumblink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/index.asp">Home</a>:&nbsp;&nbsp;<a class="breadcrumblink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/RegionalDataandResearch.asp">Research, Maps, and Data</a>:&nbsp;&nbsp;<a class="breadcrumblink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp">Maps</a>:&nbsp;&nbsp;<a class="breadcrumblink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?F_CATEGORY_ID=1">Economic Status</a>:&nbsp;&nbsp;<span class="youarehere">County Economic Status in Appalachia, FY 2004</span></div>
+<div style="float:right;width:200px;" align="right"><a class="breadcrumblink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?MAP_ID=11&amp;print=y">Print this page</a>&nbsp;&nbsp;<a class="breadcrumblink" href="javascript:void(0);" onclick="TellAFriend('http%3A%2F%2Fwww%2Earc%2Egov%2Fresearch%2FMapsofAppalachia%2Easp%3FMAP%5FID%3D11');">Email this page</a></div><div class="clear">&nbsp;</div>
+
+</div>
+
+
+<img src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/spacer.gif" width="738" height="10"><br>
+			
+<div class="content">
+
+   
+    <h2>County Economic Status in Appalachia, FY 2004</h2>
+   
+    
+            <span class="mapsubtitle">(Effective October 1, 2003 through September 30, 2004)</span>
+    <p>Each fiscal year the Appalachian Regional Commission classifies 
+the Regions counties into one of four economic levels based on a 
+comparison of county and national rates for three economic indicators: 
+three-year average unemployment rates, per-capita market income rates, 
+and poverty rates. See the methodology for a description of each 
+economic level.</p>
+
+
+    
+    <div class="mapwrapper">
+    
+        <div class="map">
+            <img src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/County-Economic-Status_FY2004_Map.gif" alt="This maps shows ARCÕs economic classification of the 410 counties in the Appalachian Region for FY 2004 (October 1, 2003 through September 30, 2004). Ninety-one counties are classified as distressed, 289 are classified as transitional, 22 are classified as competitive, and 8 are classified as attainment. For a list of county classifications, see the downloadable Excel file.">
+        </div>
+        
+        <div class="mapnav">
+            <div class="maphead">Map Options</div>
+
+            <div class="mapoptions">
+                <div class="mapoption"><a class="mapoptionlink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/MapsofAppalachia.asp?MAP_ID=11&amp;PRINT=Y">Print</a></div>
+                <div class="mapoption">
+Related Files<br>
+<div style="text-indent:-20px;margin-left:20px;"><a class="mapoptionsublink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/assets/maps/related/County-Economic-Status_FY2004_Map.pdf">PDF version of the map (400 KB)</a></div>
+<div style="text-indent:-20px;margin-left:20px;"><a class="mapoptionsublink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/assets/maps/related/County-Economic-Status_FY2004_Data.xls">Excel file of supporting data for the map (90 KB)</a></div>
+</div>
+<div class="mapoption">
+Related Links<br>
+<a class="mapoptionsublink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/reports/custom_report.asp?REPORT_ID=27">Data Report</a><br>
+</div>
+<div class="mapoption"><a class="mapoptionlink" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/research/SourceandMethodologyCountyEconomicStatusFY2002FY2005.asp">Source and Methodology</a></div>
+
+            </div>
+        </div>
+
+        <div class="clear"></div>
+    </div>
+        
+		
+
+			</div>
+		</div>
+		<div class="clear"></div>
+	</div>
+	<div class="footer">
+		<a class="footernav" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/sitemap.asp">Site Map</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<a class="footernav" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/ContactUs.asp">Contact ARC</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<a class="footernav" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/ARCPrivacyPolicy.asp">Privacy Policy</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<a class="footernav" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/ARCWebPolicy.asp">Web Policy</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<a class="footernav" href="https://wayback.archive-it.org/3259/20160318141818/http://www.usa.gov/" target="top">USA.gov</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<a class="footernav" href="https://wayback.archive-it.org/3259/20160318141818/http://www.arc.gov/about/OfficeofInspectorGeneral.asp">Office of &nbsp;Inspector General</a>
+	</div>
+
+</div>
+
+
+<script language="JavaScript">///////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+node7 = true
+function tmenudata0()
+{
+
+
+    /*---------------------------------------------
+    Image Settinngs (icons and plus minus symbols)
+    ---------------------------------------------*/
+
+	this.imgage_gap = 3			//The image gap is applied to the left and right of the folder and document icons.
+						//In the absence of a folder or document icon the gap is applied between the
+						//plus / minus symbols and the text only.
+
+
+	this.plus_image = "/images/interior/offarrow.jpg"	//specifies a custom plus image.
+	this.minus_image = "/images/interior/onarrow.jpg"		//specifies a custom minus image.
+	this.pm_width_height = "8,11"					//Width & Height  - Note: Both images must be the same dimensions.
+
+
+	//this.folder_image = "folder.gif"				//Automatically applies to all items which may be expanded.
+	//this.document_image = "/images/spacer.gif"		//Automatically applies to all items which are not expandable.
+	//this.icon_width_height = "8,11"					//Width & Height  - Note: Both images must be the same dimensions.
+
+
+
+
+    /*---------------------------------------------
+    General Settings
+    ---------------------------------------------*/
+
+
+	this.indent = 0;			//The indent distance in pixels for each level of the tree.
+	this.use_hand_cursor = true;		//Use a hand mouse cursor for expandable items, or the default arrow.
+
+
+    /*---------------------------------------------
+    Tree Menu Styles
+    ---------------------------------------------*/
+
+
+	this.main_item_styles =        "text-decoration:none; 			       		\
+                                       font-weight:normal;			           	\
+                                       font-family:Arial;			           	\
+                                       font-size:12px;			               		\
+                                       color:#307546;			               		\
+                                       padding-top:5px;							\
+                                       padding-bottom:5px;						\
+                                       padding-left:10px;						\
+                                       "
+
+
+    	this.sub_item_styles =         "text-decoration:none;					\
+    								   padding-top:0;						\
+    								   padding-bottom:0;					\
+                                       font-weight:normal;					\
+                                       font-family:Arial;					\
+                                       font-size:12px;						\
+                                       color:#307546;"
+
+
+
+	/* Styles may be formatted as multi-line (seen above), or on a single line as shown below.
+	   The expander_hover_styles apply to menu items which expand to show child menus.*/
+
+
+
+	this.main_container_styles = "margin-top:3px;padding-left:0px;"
+	this.sub_container_styles = "background-color:#ffffff;padding-left:10px;"
+
+	this.main_link_styles = "color:#307546; text-decoration:none; padding:2 2 2 0 ;"
+	this.main_link_hover_styles = "padding:2; color:#307546;"
+
+
+	this.sub_link_styles = "color:#307546; font-size:11px;margin-left:-10px;"
+	this.sub_link_hover_styles = "color:#307546;  text-decoration:underline;margin-left:-10px;"
+
+
+	this.main_expander_hover_styles = "color:#307546; text-decoration:underline;"
+
+	this.sub_expander_hover_styles = "background-color:#ffffff;  color:#307546;text-decoration:underline;"
+
+
+}</script>
+
+
+
+<script language="JavaScript" src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/tmenu.js"></script><style type="text/css">#tmenu0 {width:100%;-moz-user-select:none;margin:0px;padding:0px;list-style:none;margin-top:3px;padding-left:0px;;}#tmenu0 li{white-space:nowrap;list-style:none;margin:0px;padding:0px;text-decoration:none; 			       		                                       font-weight:normal;			           	                                       font-family:Arial;			           	                                       font-size:12px;			               		                                       color:#307546;			               		                                       padding-top:5px;							                                       padding-bottom:5px;						                                       padding-left:10px;						                                       }#tmenu0 ul li{text-decoration:none;					    								   padding-top:0;						    								   padding-bottom:0;					                                       font-weight:normal;					                                       font-family:Arial;					                                       font-size:12px;						                                       color:#307546;}#tmenu0 ul{list-style:none;margin:0px;padding:0px;padding-left:0px;background-color:#ffffff;padding-left:10px;}#tmenu0 a{color:#307546; text-decoration:none; padding:2 2 2 0 ;}#tmenu0 a:hover{padding:2; color:#307546;}#tmenu0 ul a{color:#307546; font-size:11px;margin-left:-10px;}#tmenu0 ul a:hover{color:#307546;  text-decoration:underline;margin-left:-10px;}.ctmmainhover {color:#307546; text-decoration:underline;}.ctmsubhover {background-color:#ffffff;  color:#307546;text-decoration:underline;}#tmenu0 li span,.plusminus{cursor:hand;cursor:pointer;}</style>
+
+
+	
+    <div class="clear">&nbsp;</div>
+	
+
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://wayback.archive-it.org/3259/20160318141818/https://ssl." : "https://wayback.archive-it.org/3259/20160318141818/http://www."); document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script src="County%20Economic%20Status%20in%20Appalachia,%20FY%202004%20-%20Appalachian%20Regional%20Commission_files/ga.js" type="text/javascript"></script>
+<script type="text/javascript">
+try {
+var pageTracker = _gat._getTracker("UA-11532409-1");
+pageTracker._trackPageview();
+} catch(err) {}</script>
+
+
+
+
+
+
+
+</body></html>
+
+
+
\ No newline at end of file

roundcubemail-1.5.tar.gz/node_modules/needle/test/files/tomcat_charset.html Changed

roundcubemail-1.5.tar.gz/node_modules/needle/test/parsing_spec.js Changed

@@ -544,4 +544,45 @@
 
   });
 
+  describe('when response is a HAL JSON content-type', function () {
+
+    var json_string = '{"name": "Tomás", "_links": {"href": "https://github.com/tomas/needle.git"}}';
+
+    before(function(done){
+      server = http.createServer(function(req, res) {
+        res.setHeader('Content-Type', 'application/hal+json');
+        res.end(json_string);
+      }).listen(port, done);
+    });
+
+    after(function(done){
+      server.close(done);
+    });
+
+    describe('and parse option is not passed', function() {
+
+      describe('with default parse_response', function() {
+
+        before(function() {
+          needle.defaults().parse_response.should.eql('all')
+        })
+
+        it('should return object', function(done){
+          needle.get('localhost:' + port, function(err, response, body){
+            should.ifError(err);
+            body.should.deepEqual({
+              'name': 'Tomás',
+              '_links': {
+                'href': 'https://github.com/tomas/needle.git'
+              }});
+            done();
+          });
+        });
+
+      });
+
+    })
+
+  });
+
 })

roundcubemail-1.5.tar.gz/node_modules/needle/test/proxy_spec.js Changed

roundcubemail-1.5.tar.gz/package-lock.json Changed

@@ -42,14 +42,6 @@
         "is-what": "^3.14.1"
       }
     },
-    "debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
     "errno": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
@@ -125,17 +117,11 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
-    "ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
     "needle": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz",
-      "integrity": "sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-3.3.1.tgz",
+      "integrity": "sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==",
       "requires": {
-        "debug": "^3.2.6",
         "iconv-lite": "^0.6.3",
         "sax": "^1.2.4"
       }

roundcubemail-1.5.tar.gz/plugins/calendar/calendar.php Changed

@@ -26,15 +26,17 @@
 #AllowDynamicProperties
 class calendar extends rcube_plugin
 {
-    const FREEBUSY_UNKNOWN   = 0;
-    const FREEBUSY_FREE      = 1;
-    const FREEBUSY_BUSY      = 2;
-    const FREEBUSY_TENTATIVE = 3;
-    const FREEBUSY_OOF       = 4;
+    public const FREEBUSY_UNKNOWN   = 0;
+    public const FREEBUSY_FREE      = 1;
+    public const FREEBUSY_BUSY      = 2;
+    public const FREEBUSY_TENTATIVE = 3;
+    public const FREEBUSY_OOF       = 4;
 
-    const SESSION_KEY = 'calendar_temp';
+    public const SESSION_KEY = 'calendar_temp';
 
     public $task = '?(?!logout).*';
+
+    /** @var rcmail */
     public $rc;
     public $lib;
     public $resources_dir;
@@ -45,6 +47,8 @@
     public $gmt_offset;
     public $dst_active;
     public $ui;
+    public $event;
+    public $invitestatus;
 
     public $defaults = 
         'calendar_default_view' => "agendaWeek",
@@ -63,6 +67,8 @@
         'calendar_itip_after_action'   => 0,
     ;
 
+    private $token;
+
     // These are implemented with __get()
     //  private $ical;
     //  private $itip;
@@ -72,11 +78,11 @@
     /**
      * Plugin initialization.
      */
-    function init()
+    public function init()
     {
-        $this->rc = rcube::get_instance();
+        $this->rc = rcmail::get_instance();
 
-        $this->register_task('calendar', 'calendar');
+        $this->register_task('calendar');
 
         // load calendar configuration
         $this->load_config();
@@ -84,11 +90,9 @@
         // catch iTIP confirmation requests that don're require a valid session
         if ($this->rc->action == 'attend' && !empty($_REQUEST'_t')) {
             $this->add_hook('startup', $this, 'itip_attend_response');
-        }
-        else if ($this->rc->action == 'feed' && !empty($_REQUEST'_cal')) {
+        } elseif ($this->rc->action == 'feed' && !empty($_REQUEST'_cal')) {
             $this->add_hook('startup', $this, 'ical_feed_export');
-        }
-        else if ($this->rc->task != 'login') {
+        } elseif ($this->rc->task != 'login') {
             // default startup routine
             $this->add_hook('startup', $this, 'startup');
         }
@@ -195,14 +199,12 @@
                     // @TODO: do EXPUNGE on kolab objects?
                 }
             }
-        }
-        else if ($args'task' == 'settings') {
+        } elseif ($args'task' == 'settings') {
             // add hooks for Calendar settings
             $this->add_hook('preferences_sections_list', $this, 'preferences_sections_list');
             $this->add_hook('preferences_list', $this, 'preferences_list');
             $this->add_hook('preferences_save', $this, 'preferences_save');
-        }
-        else if ($args'task' == 'mail') {
+        } elseif ($args'task' == 'mail') {
             // hooks to catch event invitations on incoming mails
             if ($args'action' == 'show' || $args'action' == 'preview') {
                 $this->add_hook('template_object_messagebody', $this, 'mail_messagebody_html');
@@ -212,7 +214,9 @@
             if ($this->api->output->type == 'html' && (empty($_GET'_rel') || $_GET'_rel' != 'event')) {
                 $this->api->output->add_label('calendar.createfrommail');
                 $this->api->add_content(
-                    html::tag('li', 'role' => 'menuitem',
+                    html::tag(
+                        'li',
+                        'role' => 'menuitem',
                         $this->api->output->button(
                             'command'  => 'calendar-create-from-mail',
                             'label'    => 'calendar.createfrommail',
@@ -228,8 +232,7 @@
 
             $this->add_hook('messages_list', $this, 'mail_messages_list');
             $this->add_hook('message_compose', $this, 'mail_message_compose');
-        }
-        else if ($args'task' == 'addressbook') {
+        } elseif ($args'task' == 'addressbook') {
             if ($this->rc->config->get('calendar_contact_birthdays')) {
                 $this->add_hook('contact_update', $this, 'contact_update');
                 $this->add_hook('contact_create', $this, 'contact_update');
@@ -328,7 +331,7 @@
     /**
      * Render the main calendar view from skin template
      */
-    function calendar_view()
+    public function calendar_view()
     {
         $this->rc->output->set_pagetitle($this->gettext('calendar'));
 
@@ -336,8 +339,17 @@
         $this->ui->addJS();
 
         $this->ui->init_templates();
-        $this->rc->output->add_label('lowest','low','normal','high','highest','delete',
-            'cancel','uploading','noemailwarning','close'
+        $this->rc->output->add_label(
+            'lowest',
+            'low',
+            'normal',
+            'high',
+            'highest',
+            'delete',
+            'cancel',
+            'uploading',
+            'noemailwarning',
+            'close'
         );
 
         // initialize attendees autocompletion
@@ -373,11 +385,11 @@
      * Handler for preferences_sections_list hook.
      * Adds Calendar settings sections into preferences sections list.
      *
-     * @param array Original parameters
+     * @param array $p Original parameters
      *
      * @return array Modified parameters
      */
-    function preferences_sections_list($p)
+    public function preferences_sections_list($p)
     {
         $p'list''calendar' = 
             'id'      => 'calendar',
@@ -391,11 +403,11 @@
      * Handler for preferences_list hook.
      * Adds options blocks into Calendar settings sections in Preferences.
      *
-     * @param array Original parameters
+     * @param array $p Original parameters
      *
      * @return array Modified parameters
      */
-    function preferences_list($p)
+    public function preferences_list($p)
     {
         if ($p'section' != 'calendar') {
             return $p;
@@ -475,9 +487,9 @@
                 return $p;
             }
 
-            $first_hour  = $this->rc->config->get('calendar_first_hour', $this->defaults'calendar_first_hour');
             $time_format = $this->rc->config->get('calendar_time_format', $this->defaults'calendar_time_format');
             $time_format = $this->rc->config->get('time_format', libcalendaring::to_php_date_format($time_format));
+            $first_hour  = $this->rc->config->get('calendar_first_hour', $this->defaults'calendar_first_hour');
             $field_id    = 'rcmfd_firsthour';
 
             $select_hours = new html_select('name' => '_first_hour', 'id' => $field_id);
@@ -500,14 +512,22 @@
             $field_id   = 'rcmfd_workstart';
             $work_start = $this->rc->config->get('calendar_work_start', $this->defaults'calendar_work_start');
             $work_end   = $this->rc->config->get('calendar_work_end', $this->defaults'calendar_work_end');
+            $time_format = $this->rc->config->get('calendar_time_format', $this->defaults'calendar_time_format');
+            $time_format = $this->rc->config->get('time_format', libcalendaring::to_php_date_format($time_format));
+
+            $select_hours = new html_select('name' => '_work_start', 'id' => $field_id);
+            for ($h = 0; $h < 24; $h++) {
+                $select_hours->add(date($time_format, mktime($h, 0, 0)), $h);
+            }
 
             $p'blocks''view''options''workinghours' = 
                 'title'   => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
-                'content' => html::div('input-group',
-                    $select_hours->show($work_start, 'name' => '_work_start', 'id' => $field_id)
-                    . html::span('input-group-append input-group-prepend', html::span('input-group-text',' &mdash; '))
+                'content' => html::div(
+                    'input-group',
+                    $select_hours->show($work_start)
+                    . html::span('input-group-append input-group-prepend', html::span('input-group-text', ' &mdash; '))
                     . $select_hours->show($work_end, 'name' => '_work_end', 'id' => $field_id)
-                )
+                ),
             ;
         }
 
@@ -542,9 +562,9 @@
             }
 
             $alarm_type = $alarm_offset = '';
+            $field_id    = 'rcmfd_alarm';
 
             if (!isset($no_override'calendar_default_alarm_type')) {
-                $field_id    = 'rcmfd_alarm';
                 $select_type = new html_select('name' => '_alarm_type', 'id' => $field_id);
                 $select_type->add($this->gettext('none'), '');
 
@@ -556,7 +576,6 @@
             }
 
             if (!isset($no_override'calendar_default_alarm_offset')) {
-                $field_id      = 'rcmfd_alarm';
                 $input_value   = new html_inputfield('name' => '_alarm_value', 'id' => $field_id . 'value', 'size' => 3);
                 $select_offset = new html_select('name' => '_alarm_offset', 'id' => $field_id . 'offset');
 
@@ -630,7 +649,7 @@
             $select   = new html_select(
                     'name'     => '_after_action',
                     'id'       => $field_id,
-                    'onchange' => "\$('#{$field_id}_select')this.value == 4 ? 'show' : 'hide'()"
+                    'onchange' => "\$('#{$field_id}_select')this.value == 4 ? 'show' : 'hide'()",
             );
 
             $select->add($this->gettext('afternothing'), '');
@@ -680,8 +699,10 @@
             foreach ($categories as $name => $color) {
                 $key = md5($name);
                 $field_class = 'rcmfd_category_' . str_replace(' ', '_', $name);
-                $category_remove = html::span('input-group-append',
-                    html::a(
+                $category_remove = html::span(
+                    'input-group-append',
+                    html::a(
+                        
                             'class'   => 'button icon delete input-group-text',
                             'onclick' => '$(this).parent().parent().remove()',
                             'title'   => $this->gettext('remove_category'),
@@ -691,8 +712,8 @@
                     )
                 );
 
-                $category_name  = new html_inputfield(array('name' => "_categories$key", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable));
-                $category_color = new html_inputfield(array('name' => "_colors$key", 'class' => "$field_class colors", 'size' => 6));
+                $category_name  = new html_inputfield('name' => "_categories$key", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable);
+                $category_color = new html_inputfield('name' => "_colors$key", 'class' => "$field_class colors", 'size' => 6);
                 $hidden         = '';
 
                 if (!empty($this->driver->categoriesimmutable)) {
@@ -703,13 +724,14 @@
                     . html::div('input-group', $category_name->show($name) . $category_color->show($color) . $category_remove);
             }
 
-            $p'blocks''categories''options''category_' . $name = 
+            $p'blocks''categories''options''categoriesdefault' = 
                 'content' => html::div('id' => 'calendarcategories', $categories_list),
             ;
 
             $field_id = 'rcmfd_new_category';
             $new_category = new html_inputfield('name' => '_new_category', 'id' => $field_id, 'size' => 30);
-            $add_category = html::span('input-group-append',
+            $add_category = html::span(
+                'input-group-append',
                 html::a(
                     
                         'type'    => 'button',
@@ -727,7 +749,8 @@
             ;
 
             $this->rc->output->add_label('delete', 'calendar.remove_category');
-            $this->rc->output->add_script('
+            $this->rc->output->add_script(
+                '
 function rcube_calendar_add_category() {
     var name = $("#rcmfd_new_category").val();
     if (name.length) {
@@ -747,7 +770,8 @@
                 'foot'
             );
 
-            $this->rc->output->add_script('
+            $this->rc->output->add_script(
+                '
 $("#rcmfd_new_category").keypress(function(event) {
     if (event.which == 13) {
         rcube_calendar_add_category();
@@ -775,7 +799,7 @@
                     'name'    => '_contact_birthdays',
                     'id'      => $field_id,
                     'value'   => 1,
-                    'onclick' => '$(".calendar_birthday_props").prop("disabled",!this.checked)'
+                    'onclick' => '$(".calendar_birthday_props").prop("disabled",!this.checked)',
             );
 
             $p'blocks''birthdays''options''contact_birthdays' = 
@@ -800,8 +824,11 @@
                 }
 
                 $active = in_array($source'id', (array) $this->rc->config->get('calendar_birthday_adressbooks')) ? $source'id' : '';
-                $sources = html::tag('li', null,
-                    html::label(null,
+                $sources = html::tag(
+                    'li',
+                    null,
+                    html::label(
+                        null,
                         $checkbox->show($active, 'value' => $source'id')
                         . rcube::Q(!empty($source'realname') ? $source'realname' : $source'name')
                     )
@@ -833,7 +860,8 @@
 
             $p'blocks''birthdays''options''birthdays_alarmoffset' = 
                 'title'   => html::label($field_id, rcube::Q($this->gettext('showalarms'))),
-                'content' => html::div('input-group',
+                'content' => html::div(
+                    'input-group',
                     $select_type->show($preset_type)
                     . $input_value->show($preset0) . ' ' . $select_offset->show($preset1)
                 ),
@@ -847,11 +875,11 @@
      * Handler for preferences_save hook.
      * Executed on Calendar settings form submit.
      *
-     * @param array Original parameters
+     * @param array $p Original parameters
      *
      * @return array Modified parameters
      */
-    function preferences_save($p)
+    public function preferences_save($p)
     {
         if ($p'section' == 'calendar') {
             $this->load_driver();
@@ -913,8 +941,7 @@
                         $oldname = $old_categories$key;
                         $this->driver->replace_category($oldname, $name, $color);
                         unset($old_categories$key);
-                    }
-                    else {
+                    } else {
                         $this->driver->add_category($name, $color);
                     }
 
@@ -936,105 +963,103 @@
     /**
      * Dispatcher for calendar actions initiated by the client
      */
-    function calendar_action()
+    public function calendar_action()
     {
         $action  = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
         $cal     = rcube_utils::get_input_value('c', rcube_utils::INPUT_GPC);
         $success = false;
         $reload  = false;
+        $jsenv = ;
 
         if (isset($cal'showalarms')) {
             $cal'showalarms' = intval($cal'showalarms');
         }
 
         switch ($action) {
-        case "form-new":
-        case "form-edit":
-            echo $this->ui->calendar_editform($action, $cal);
-            exit;
+            case "form-new":
+            case "form-edit":
+                echo $this->ui->calendar_editform($action, $cal);
+                exit;
+
+            case "new":
+                $success = $this->driver->create_calendar($cal);
+                $reload  = true;
+                break;
+
+            case "edit":
+                $success = $this->driver->edit_calendar($cal);
+                $reload  = true;
+                break;
 
-        case "new":
-            $success = $this->driver->create_calendar($cal);
-            $reload  = true;
-            break;
-
-        case "edit":
-            $success = $this->driver->edit_calendar($cal);
-            $reload  = true;
-            break;
-
-        case "delete":
-            if ($success = $this->driver->delete_calendar($cal)) {
-                $this->rc->output->command('plugin.destroy_source', 'id' => $cal'id');
-            }
-            break;
-
-        case "subscribe":
-            if (!$this->driver->subscribe_calendar($cal)) {
-                $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
-            }
-            else {
-                $calendars = $this->driver->list_calendars();
-                $calendar  = !empty($calendars$cal'id') ? $calendars$cal'id' : null;
-
-                // find parent folder and check if it's a "user calendar"
-                // if it's also activated we need to refresh it (#5340)
-                while (!empty($calendar'parent')) {
-                    if (isset($calendars$calendar'parent')) {
-                        $calendar = $calendars$calendar'parent';
+            case "delete":
+                if ($success = $this->driver->delete_calendar($cal)) {
+                    $this->rc->output->command('plugin.destroy_source', 'id' => $cal'id');
+                }
+                break;
+
+            case "subscribe":
+                if (!$this->driver->subscribe_calendar($cal)) {
+                    $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
+                } else {
+                    $calendars = $this->driver->list_calendars();
+                    $calendar  = !empty($calendars$cal'id') ? $calendars$cal'id' : null;
+
+                    // find parent folder and check if it's a "user calendar"
+                    // if it's also activated we need to refresh it (#5340)
+                    while (!empty($calendar'parent')) {
+                        if (isset($calendars$calendar'parent')) {
+                            $calendar = $calendars$calendar'parent';
+                        } else {
+                            break;
+                        }
                     }
-                    else {
-                        break;
+
+                    if ($calendar && $calendar'id' != $cal'id'
+                        && !empty($calendar'active')
+                        && $calendar'group' == "other user"
+                    ) {
+                        $this->rc->output->command('plugin.refresh_source', $calendar'id');
                     }
                 }
+                return;
 
-                if ($calendar && $calendar'id' != $cal'id'
-                    && !empty($calendar'active')
-                    && $calendar'group' == "other user"
-                ) {
-                    $this->rc->output->command('plugin.refresh_source', $calendar'id');
-                }
-            }
-            return;
+            case "search":
+                $results    = ;
+                $color_mode = $this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring');
+                $query      = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+                $source     = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
 
-        case "search":
-            $results    = ;
-            $color_mode = $this->rc->config->get('calendar_event_coloring', $this->defaults'calendar_event_coloring');
-            $query      = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
-            $source     = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+                foreach ((array) $this->driver->search_calendars($query, $source) as $id => $prop) {
+                    $editname = $prop'editname';
+                    unset($prop'editname');  // force full name to be displayed
+                    $prop'active' = false;
 
-            foreach ((array) $this->driver->search_calendars($query, $source) as $id => $prop) {
-                $editname = $prop'editname';
-                unset($prop'editname');  // force full name to be displayed
-                $prop'active' = false;
+                    // let the UI generate HTML and CSS representation for this calendar
+                    $html = $this->ui->calendar_list_item($id, $prop, $jsenv);
+                    $cal  = $jsenv$id ?? ; // @phpstan-ignore-line
+                    $cal'editname' = $editname;
+                    $cal'html'     = $html;
 
-                // let the UI generate HTML and CSS representation for this calendar
-                $html = $this->ui->calendar_list_item($id, $prop, $jsenv);
-                $cal  = $jsenv$id;
-                $cal'editname' = $editname;
-                $cal'html'     = $html;
+                    if (!empty($prop'color')) {
+                        $cal'css' = $this->ui->calendar_css_classes($id, $prop, $color_mode);
+                    }
 
-                if (!empty($prop'color')) {
-                    $cal'css' = $this->ui->calendar_css_classes($id, $prop, $color_mode);
+                    $results = $cal;
                 }
 
-                $results = $cal;
-            }
-
-            // report more results available
-            if (!empty($this->driver->search_more_results)) {
-                $this->rc->output->show_message('autocompletemore', 'notice');
-            }
+                // report more results available
+                if (!empty($this->driver->search_more_results)) {
+                    $this->rc->output->show_message('autocompletemore', 'notice');
+                }
 
-            $reqid = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
-            $this->rc->output->command('multi_thread_http_response', $results, $reqid);
-            return;
+                $reqid = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
+                $this->rc->output->command('multi_thread_http_response', $results, $reqid);
+                return;
         }
 
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
-        }
-        else {
+        } else {
             $error_msg = $this->gettext('errorsaving');
             if (!empty($this->driver->last_error)) {
                 $error_msg .= ': ' . $this->driver->last_error;
@@ -1052,7 +1077,7 @@
     /**
      * Dispatcher for event actions initiated by the client
      */
-    function event_action()
+    public function event_action()
     {
         $action  = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
         $event   = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
@@ -1074,367 +1099,355 @@
         }
 
         switch ($action) {
-        case "new":
-            // create UID for new event
-            $event'uid' = $this->generate_uid();
-            if (!$this->write_preprocess($event, $action)) {
-                $got_msg = true;
-            }
-            else if ($success = $this->driver->new_event($event)) {
-                $event'id'        = $event'uid';
-                $event'_savemode' = 'all';
-
-                $this->cleanup_event($event);
-                $this->event_save_success($event, null, $action, true);
-                $this->talk_room_update($event);
-            }
-
-            $reload = $success && !empty($event'recurrence') ? 2 : 1;
-            break;
-
-        case "edit":
-            if (!$this->write_preprocess($event, $action)) {
-                $got_msg = true;
-            }
-            else if ($success = $this->driver->edit_event($event)) {
-                $this->cleanup_event($event);
-                $this->event_save_success($event, $old, $action, $success);
-                $this->talk_room_update($event);
-            }
-
-            $reload = $success && (!empty($event'recurrence') || !empty($event'_savemode') || !empty($event'_fromcalendar')) ? 2 : 1;
-            break;
-
-        case "resize":
-            if (!$this->write_preprocess($event, $action)) {
-                $got_msg = true;
-            }
-            else if ($success = $this->driver->resize_event($event)) {
-                $this->event_save_success($event, $old, $action, $success);
-            }
-
-            $reload = !empty($event'_savemode') ? 2 : 1;
-            break;
+            case "new":
+                // create UID for new event
+                $event'uid' = $this->generate_uid();
+                if (!$this->write_preprocess($event, $action)) {
+                    $got_msg = true;
+                } elseif ($success = $this->driver->new_event($event)) {
+                    $event'id'        = $event'uid';
+                    $event'_savemode' = 'all';
+
+                    $this->cleanup_event($event);
+                    $this->event_save_success($event, null, $action, true);
+                    $this->talk_room_update($event);
+                }
 
-        case "move":
-            if (!$this->write_preprocess($event, $action)) {
-                $got_msg = true;
-            }
-            else if ($success = $this->driver->move_event($event)) {
-                $this->event_save_success($event, $old, $action, $success);
-            }
+                $reload = $success && !empty($event'recurrence') ? 2 : 1;
+                break;
 
-            $reload = $success && !empty($event'_savemode') ? 2 : 1;
-            break;
+            case "edit":
+                if (!$this->write_preprocess($event, $action)) {
+                    $got_msg = true;
+                } elseif ($success = $this->driver->edit_event($event)) {
+                    $this->cleanup_event($event);
+                    $this->event_save_success($event, $old, $action, $success);
+                    $this->talk_room_update($event);
+                }
 
-        case "remove":
-            // remove previous deletes
-            $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0;
+                $reload = $success && (!empty($event'recurrence') || !empty($event'_savemode') || !empty($event'_fromcalendar')) ? 2 : 1;
+                break;
 
-            // search for event if only UID is given
-            if (!isset($event'calendar') && !empty($event'uid')) {
-                if (!($event = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE))) {
-                    break;
+            case "resize":
+                if (!$this->write_preprocess($event, $action)) {
+                    $got_msg = true;
+                } elseif ($success = $this->driver->resize_event($event)) {
+                    $this->event_save_success($event, $old, $action, $success);
                 }
-                $undo_time = 0;
-            }
-
-            // Note: the driver is responsible for setting $_SESSION'calendar_event_undo'
-            //       containing 'ts' and 'data' elements
-            $success = $this->driver->remove_event($event, $undo_time < 1);
-            $reload = (!$success || !empty($event'_savemode')) ? 2 : 1;
-
-            if ($undo_time > 0 && $success) {
-                // display message with Undo link.
-                $onclick = sprintf("%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))",
-                    rcmail_output::JS_OBJECT_NAME,
-                    rcmail_output::JS_OBJECT_NAME
-                );
-                $msg = html::span(null, $this->gettext('successremoval'))
-                    . ' ' . html::a('onclick' => $onclick, $this->gettext('undo'));
 
-                $this->rc->output->show_message($msg, 'confirmation', null, true, $undo_time);
-                $got_msg = true;
-            }
-            else if ($success) {
-                $this->rc->output->show_message('calendar.successremoval', 'confirmation');
-                $got_msg = true;
-            }
+                $reload = !empty($event'_savemode') ? 2 : 1;
+                break;
 
-            // send cancellation for the main event
-            if (isset($event'_savemode') && $event'_savemode' == 'all') {
-                unset($old'_instance', $old'recurrence_date', $old'recurrence_id');
-            }
-            // send an update for the main event's recurrence rule instead of a cancellation message
-            else if (isset($event'_savemode') && $event'_savemode' == 'future' && !is_bool($success)) {
-                $event'_savemode' = 'all';  // force event_save_success() to load master event
-                $action  = 'edit';
-                $success = true;
-            }
+            case "move":
+                if (!$this->write_preprocess($event, $action)) {
+                    $got_msg = true;
+                } elseif ($success = $this->driver->move_event($event)) {
+                    $this->event_save_success($event, $old, $action, $success);
+                }
 
-            // send iTIP reply that participant has declined the event
-            if ($success && !empty($event'_decline')) {
-                $emails    = $this->get_user_emails();
-                $organizer = null;
+                $reload = $success && !empty($event'_savemode') ? 2 : 1;
+                break;
 
-                foreach ($old'attendees' as $i => $attendee) {
-                    if ($attendee'role' == 'ORGANIZER') {
-                        $organizer = $attendee;
-                    }
-                    else if (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
-                        $old'attendees'$i'status' = 'DECLINED';
-                        $reply_sender = $attendee'email';
+            case "remove":
+                // remove previous deletes
+                $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0;
+
+                // search for event if only UID is given
+                if (!isset($event'calendar') && !empty($event'uid')) {
+                    if (!($event = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE))) {
+                        break;
                     }
+                    $undo_time = 0;
                 }
 
-                if ($event'_savemode' == 'future' && $event'id' != $old'id') {
-                    $old'thisandfuture' = true;
-                }
-
-                $itip = $this->load_itip();
-                $itip->set_sender_email($reply_sender);
-
-                if ($organizer && $itip->send_itip_message($old, 'REPLY', $organizer, 'itipsubjectdeclined', 'itipmailbodydeclined')) {
-                    $mailto = !empty($organizer'name') ? $organizer'name' : $organizer'email';
-                    $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
+                // Note: the driver is responsible for setting $_SESSION'calendar_event_undo'
+                //       containing 'ts' and 'data' elements
+                $success = $this->driver->remove_event($event, $undo_time < 1);
+                $reload = (!$success || !empty($event'_savemode')) ? 2 : 1;
+
+                if ($undo_time > 0 && $success) {
+                    // display message with Undo link.
+                    $onclick = sprintf(
+                        "%s.http_request('event', 'action=undo', %s.display_message('', 'loading'))",
+                        rcmail_output::JS_OBJECT_NAME,
+                        rcmail_output::JS_OBJECT_NAME
+                    );
+                    $msg = html::span(null, $this->gettext('successremoval'))
+                        . ' ' . html::a('onclick' => $onclick, $this->gettext('undo'));
 
-                    $this->rc->output->command('display_message', $msg, 'confirmation');
-                }
-                else {
-                    $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+                    $this->rc->output->show_message($msg, 'confirmation', null, true, $undo_time);
+                    $got_msg = true;
+                } elseif ($success) {
+                    $this->rc->output->show_message('calendar.successremoval', 'confirmation');
+                    $got_msg = true;
                 }
-            }
-            else if ($success) {
-                $this->event_save_success($event, $old, $action, $success);
-            }
 
-            break;
-
-        case "undo":
-            // Restore deleted event
-            if (!empty($_SESSION'calendar_event_undo''data')) {
-                $event   = $_SESSION'calendar_event_undo''data';
-                $success = $this->driver->restore_event($event);
-            }
-
-            if ($success) {
-                $this->rc->session->remove('calendar_event_undo');
-                $this->rc->output->show_message('calendar.successrestore', 'confirmation');
-                $got_msg = true;
-                $reload  = 2;
-            }
-
-            break;
-
-        case "rsvp":
-            $itip_sending  = $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
-            $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_POST);
-            $attendees     = rcube_utils::get_input_value('attendees', rcube_utils::INPUT_POST);
-            $reply_comment = $event'comment';
-
-            $this->write_preprocess($event, 'edit');
-            $ev = $this->driver->get_event($event);
-            $ev'attendees' = $event'attendees';
-            $ev'free_busy' = $event'free_busy';
-            $ev'_savemode' = $event'_savemode';
-            $ev'comment'   = $reply_comment;
-
-            // send invitation to delegatee + add it as attendee
-            if ($status == 'delegated' && !empty($event'to')) {
-                $itip = $this->load_itip();
-                if ($itip->delegate_to($ev, $event'to', !empty($event'rsvp'), $attendees)) {
-                    $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
-                    $noreply = false;
+                // send cancellation for the main event
+                if (isset($event'_savemode') && $event'_savemode' == 'all') {
+                    unset($old'_instance', $old'recurrence_date', $old'recurrence_id');
+                }
+                // send an update for the main event's recurrence rule instead of a cancellation message
+                elseif (isset($event'_savemode') && $event'_savemode' == 'future' && !is_bool($success)) {
+                    $event'_savemode' = 'all';  // force event_save_success() to load master event
+                    $action  = 'edit';
+                    $success = true;
                 }
-            }
-
-            $event = $ev;
-
-            // compose a list of attendees affected by this change
-            $updated_attendees = array_filter(array_map(function($j) use ($event) {
-                    return $event'attendees'$j;
-                },
-                $attendees
-            ));
 
-            if ($success = $this->driver->edit_rsvp($event, $status, $updated_attendees)) {
-                $noreply = rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC);
-                $noreply = intval($noreply) || $status == 'needs-action' || $itip_sending === 0;
-                $reload  = $event'calendar' != $ev'calendar' || !empty($event'recurrence') ? 2 : 1;
-                $emails  = $this->get_user_emails();
-                $ownedResourceEmails = $this->owned_resources_emails();
-                $organizer = null;
-                $resourceConfirmation = false;
+                // send iTIP reply that participant has declined the event
+                if ($success && !empty($event'_decline')) {
+                    $emails    = $this->get_user_emails();
+                    $organizer = null;
+                    $reply_sender = null;
 
-                foreach ($event'attendees' as $i => $attendee) {
-                    if ($attendee'role' == 'ORGANIZER') {
-                        $organizer = $attendee;
-                    }
-                    else if (!empty($attendee'email') && in_array_nocase($attendee'email', $emails)) {
-                        $reply_sender = $attendee'email';
+                    foreach ($old'attendees' as $i => $attendee) {
+                        if ($attendee'role' == 'ORGANIZER') {
+                            $organizer = $attendee;
+                        } elseif (!empty($attendee'email') && in_array(strtolower($attendee'email'), $emails)) {
+                            $old'attendees'$i'status' = 'DECLINED';
+                            $reply_sender = $attendee'email';
+                        }
                     }
-                    else if (!empty($attendee'cutype') && $attendee'cutype' == 'RESOURCE' && !empty($attendee'email') && in_array_nocase($attendee'email', $ownedResourceEmails)) {
-                        $resourceConfirmation = true;
-                        // Note on behalf of which resource this update is going to be sent out
-                        $event'_resource' = $attendee'email';
+
+                    if ($event'_savemode' == 'future' && $event'id' != $old'id') {
+                        $old'thisandfuture' = true;
                     }
-                }
 
-                if (!$noreply) {
                     $itip = $this->load_itip();
                     $itip->set_sender_email($reply_sender);
-                    $event'thisandfuture' = $event'_savemode' == 'future';
-                    $bodytextprefix = $resourceConfirmation ? 'itipmailbodyresource' : 'itipmailbody';
 
-                    if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, $bodytextprefix . $status)) {
+                    if ($organizer && $itip->send_itip_message($old, 'REPLY', $organizer, 'itipsubjectdeclined', 'itipmailbodydeclined')) {
                         $mailto = !empty($organizer'name') ? $organizer'name' : $organizer'email';
                         $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
 
                         $this->rc->output->command('display_message', $msg, 'confirmation');
-                    }
-                    else {
+                    } else {
                         $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
                     }
+                } elseif ($success) {
+                    $this->event_save_success($event, $old, $action, $success);
                 }
 
-                // refresh all calendars
-                if ($event'calendar' != $ev'calendar') {
-                    $this->rc->output->command('plugin.refresh_calendar', 'source' => null, 'refetch' => true);
-                    $reload = 0;
-                }
-            }
-
-            break;
+                break;
 
-        case "dismiss":
-            $event'ids' = explode(',', $event'id');
-            $plugin  = $this->rc->plugins->exec_hook('dismiss_alarms', $event);
-            $success = $plugin'success';
+            case "undo":
+                // Restore deleted event
+                if (!empty($_SESSION'calendar_event_undo''data')) {
+                    $event   = $_SESSION'calendar_event_undo''data';
+                    $success = $this->driver->restore_event($event);
+                }
 
-            foreach ($event'ids' as $id) {
-                if (strpos($id, 'cal:') === 0) {
-                    $success |= $this->driver->dismiss_alarm(substr($id, 4), $event'snooze');
+                if ($success) {
+                    $this->rc->session->remove('calendar_event_undo');
+                    $this->rc->output->show_message('calendar.successrestore', 'confirmation');
+                    $got_msg = true;
+                    $reload  = 2;
                 }
-            }
 
-            break;
+                break;
+
+            case "rsvp":
+                $itip_sending  = $this->rc->config->get('calendar_itip_send_option', $this->defaults'calendar_itip_send_option');
+                $status        = rcube_utils::get_input_value('status', rcube_utils::INPUT_POST);
+                $attendees     = rcube_utils::get_input_value('attendees', rcube_utils::INPUT_POST);
+                $reply_comment = $event'comment';
+
+                $this->write_preprocess($event, 'edit');
+                $ev = $this->driver->get_event($event);
+                $ev'attendees' = $event'attendees';
+                $ev'free_busy' = $event'free_busy';
+                $ev'_savemode' = $event'_savemode';
+                $ev'comment'   = $reply_comment;
 
-        case "changelog":
-            $data = $this->driver->get_event_changelog($event);
-            if (is_array($data) && !empty($data)) {
-                $lib = $this->lib;
-                $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
-                array_walk($data, function(&$change) use ($lib, $dtformat) {
-                    if (!empty($change'date')) {
-                        $dt = $lib->adjust_timezone($change'date');
+                // send invitation to delegatee + add it as attendee
+                if ($status == 'delegated' && !empty($event'to')) {
+                    $itip = $this->load_itip();
+                    if ($itip->delegate_to($ev, $event'to', !empty($event'rsvp'), $attendees)) {
+                        $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
+                        $noreply = false;
+                    }
+                }
 
-                        if ($dt instanceof DateTimeInterface) {
-                            $change'date' = $this->rc->format_date($dt, $dtformat, false);
+                $event = $ev;
+
+                // compose a list of attendees affected by this change
+                $updated_attendees = array_filter(array_map(
+                    function ($j) use ($event) {
+                        return $event'attendees'$j;
+                    },
+                    $attendees
+                ));
+
+                if ($success = $this->driver->edit_rsvp($event, $status, $updated_attendees)) {
+                    $noreply = rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC);
+                    $noreply = intval($noreply) || $status == 'needs-action' || $itip_sending === 0;
+                    $reload  = $event'calendar' != $ev'calendar' || !empty($event'recurrence') ? 2 : 1;
+                    $emails  = $this->get_user_emails();
+                    $ownedResourceEmails = $this->owned_resources_emails();
+                    $organizer = null;
+                    $resourceConfirmation = false;
+                    $reply_sender = null;
+
+                    foreach ($event'attendees' as $i => $attendee) {
+                        if ($attendee'role' == 'ORGANIZER') {
+                            $organizer = $attendee;
+                        } elseif (!empty($attendee'email') && in_array_nocase($attendee'email', $emails)) {
+                            $reply_sender = $attendee'email';
+                        } elseif (!empty($attendee'cutype') && $attendee'cutype' == 'RESOURCE' && !empty($attendee'email') && in_array_nocase($attendee'email', $ownedResourceEmails)) {
+                            $resourceConfirmation = true;
+                            // Note on behalf of which resource this update is going to be sent out
+                            $event'_resource' = $attendee'email';
                         }
                     }
-                });
 
-                $this->rc->output->command('plugin.render_event_changelog', $data);
-            }
-            else {
-                $this->rc->output->command('plugin.render_event_changelog', false);
-            }
+                    if (!$noreply) {
+                        $itip = $this->load_itip();
+                        $itip->set_sender_email($reply_sender);
+                        $event'thisandfuture' = $event'_savemode' == 'future';
+                        $bodytextprefix = $resourceConfirmation ? 'itipmailbodyresource' : 'itipmailbody';
+
+                        if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, $bodytextprefix . $status)) {
+                            $mailto = !empty($organizer'name') ? $organizer'name' : $organizer'email';
+                            $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
+
+                            $this->rc->output->command('display_message', $msg, 'confirmation');
+                        } else {
+                            $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+                        }
+                    }
 
-            $got_msg = true;
-            $reload  = false;
+                    // refresh all calendars
+                    if ($event'calendar' != $ev'calendar') {
+                        $this->rc->output->command('plugin.refresh_calendar', 'source' => null, 'refetch' => true);
+                        $reload = 0;
+                    }
+                }
 
-            break;
+                break;
 
-        case "diff":
-            $data = $this->driver->get_event_diff($event, $event'rev1', $event'rev2');
-            if (is_array($data)) {
-                // convert some properties, similar to self::_client_event()
-                $lib = $this->lib;
-                array_walk($data'changes', function(&$change, $i) use ($event, $lib) {
-                    // convert date cols
-                    foreach ('start', 'end', 'created', 'changed' as $col) {
-                        if ($change'property' == $col) {
-                            $change'old' = $lib->adjust_timezone($change'old', strlen($change'old') == 10)->format('c');
-                            $change'new' = $lib->adjust_timezone($change'new', strlen($change'new') == 10)->format('c');
-                        }
+            case "dismiss":
+                $event'ids' = explode(',', $event'id');
+                $plugin  = $this->rc->plugins->exec_hook('dismiss_alarms', $event);
+                $success = $plugin'success';
+
+                foreach ($event'ids' as $id) {
+                    if (strpos($id, 'cal:') === 0) {
+                        $success |= $this->driver->dismiss_alarm(substr($id, 4), $event'snooze');
                     }
-                    // create textual representation for alarms and recurrence
-                    if ($change'property' == 'alarms') {
-                        if (is_array($change'old')) {
-                            $change'old_' = libcalendaring::alarm_text($change'old');
-                        }
-                        if (is_array($change'new')) {
-                            $change'new_' = libcalendaring::alarm_text(array_merge((array)$change'old', $change'new'));
+                }
+
+                break;
+
+            case "changelog":
+                $data = $this->driver->get_event_changelog($event);
+                if (is_array($data) && !empty($data)) {
+                    $lib = $this->lib;
+                    $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
+                    array_walk($data, function (&$change) use ($lib, $dtformat) {
+                        if (!empty($change'date')) {
+                            $dt = $lib->adjust_timezone($change'date');
+
+                            if ($dt instanceof DateTimeInterface) {
+                                $change'date' = $this->rc->format_date($dt, $dtformat, false);
+                            }
                         }
-                    }
-                    if ($change'property' == 'recurrence') {
-                        if (is_array($change'old')) {
-                            $change'old_' = $lib->recurrence_text($change'old');
+                    });
+
+                    $this->rc->output->command('plugin.render_event_changelog', $data);
+                } else {
+                    $this->rc->output->command('plugin.render_event_changelog', false);
+                }
+
+                $got_msg = true;
+                $reload  = false;
+
+                break;
+
+            case "diff":
+                $data = $this->driver->get_event_diff($event, $event'rev1', $event'rev2');
+                if (is_array($data)) {
+                    // convert some properties, similar to self::_client_event()
+                    $lib = $this->lib;
+                    array_walk($data'changes', function (&$change, $i) use ($lib) {
+                        // convert date cols
+                        foreach ('start', 'end', 'created', 'changed' as $col) {
+                            if ($change'property' == $col) {
+                                $change'old' = $lib->adjust_timezone($change'old', strlen($change'old') == 10)->format('c');
+                                $change'new' = $lib->adjust_timezone($change'new', strlen($change'new') == 10)->format('c');
+                            }
                         }
-                        if (is_array($change'new')) {
-                            $change'new_' = $lib->recurrence_text(array_merge((array)$change'old', $change'new'));
+                        // create textual representation for alarms and recurrence
+                        if ($change'property' == 'alarms') {
+                            if (is_array($change'old')) {
+                                $change'old_' = libcalendaring::alarm_text($change'old');
+                            }
+                            if (is_array($change'new')) {
+                                $change'new_' = libcalendaring::alarm_text(array_merge((array)$change'old', $change'new'));
+                            }
                         }
-                    }
-                    if ($change'property' == 'attachments') {
-                        if (is_array($change'old')) {
-                            $change'old''classname' = rcube_utils::file2class($change'old''mimetype', $change'old''name');
+                        if ($change'property' == 'recurrence') {
+                            if (is_array($change'old')) {
+                                $change'old_' = $lib->recurrence_text($change'old');
+                            }
+                            if (is_array($change'new')) {
+                                $change'new_' = $lib->recurrence_text(array_merge((array)$change'old', $change'new'));
+                            }
                         }
-                        if (is_array($change'new')) {
-                            $change'new''classname' = rcube_utils::file2class($change'new''mimetype', $change'new''name');
+                        if ($change'property' == 'attachments') {
+                            if (is_array($change'old')) {
+                                $change'old''classname' = rcube_utils::file2class($change'old''mimetype', $change'old''name');
+                            }
+                            if (is_array($change'new')) {
+                                $change'new''classname' = rcube_utils::file2class($change'new''mimetype', $change'new''name');
+                            }
                         }
-                    }
-                    // compute a nice diff of description texts
-                    if ($change'property' == 'description') {
-                        $change'diff_' = libkolab::html_diff($change'old', $change'new');
-                    }
-                });
-
-                $this->rc->output->command('plugin.event_show_diff', $data);
-            }
-            else {
-                $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
-            }
+                        // compute a nice diff of description texts
+                        if ($change'property' == 'description') {
+                            $change'diff_' = libkolab::html_diff($change'old', $change'new');
+                        }
+                    });
+
+                    $this->rc->output->command('plugin.event_show_diff', $data);
+                } else {
+                    $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
+                }
 
-            $got_msg = true;
-            $reload  = false;
+                $got_msg = true;
+                $reload  = false;
 
-            break;
+                break;
 
-        case "show":
-            if ($event = $this->driver->get_event_revison($event, $event'rev')) {
-                $this->rc->output->command('plugin.event_show_revision', $this->_client_event($event));
-            }
-            else {
-                $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
-            }
+            case "show":
+                if ($event = $this->driver->get_event_revison($event, $event'rev')) {
+                    $this->rc->output->command('plugin.event_show_revision', $this->_client_event($event));
+                } else {
+                    $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
+                }
 
-            $got_msg = true;
-            $reload  = false;
-            break;
+                $got_msg = true;
+                $reload  = false;
+                break;
 
-        case "restore":
-            if ($success = $this->driver->restore_event_revision($event, $event'rev')) {
-                $_event = $this->driver->get_event($event);
-                $reload = $_event'recurrence' ? 2 : 1;
-                $msg = $this->gettext('name' => 'objectrestoresuccess', 'vars' => 'rev' => $event'rev');
-                $this->rc->output->command('display_message', $msg, 'confirmation');
-                $this->rc->output->command('plugin.close_history_dialog');
-            }
-            else {
-                $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
-                $reload = 0;
-            }
+            case "restore":
+                if ($success = $this->driver->restore_event_revision($event, $event'rev')) {
+                    $_event = $this->driver->get_event($event);
+                    $reload = $_event'recurrence' ? 2 : 1;
+                    $msg = $this->gettext('name' => 'objectrestoresuccess', 'vars' => 'rev' => $event'rev');
+                    $this->rc->output->command('display_message', $msg, 'confirmation');
+                    $this->rc->output->command('plugin.close_history_dialog');
+                } else {
+                    $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
+                    $reload = 0;
+                }
 
-            $got_msg = true;
-            break;
+                $got_msg = true;
+                break;
         }
 
         // show confirmation/error message
         if (!$got_msg) {
             if ($success) {
                 $this->rc->output->show_message('successfullysaved', 'confirmation');
-            }
-            else {
+            } else {
                 $this->rc->output->show_message('calendar.errorsaving', 'error');
             }
         }
@@ -1447,8 +1460,7 @@
             $args = 'source' => $event'calendar';
             if ($reload > 1) {
                 $args'refetch' = true;
-            }
-            else if ($success && $action != 'remove') {
+            } elseif ($success && $action != 'remove') {
                 $args'update' = $this->_client_event($this->driver->get_event($event), true);
             }
             $this->rc->output->command('plugin.refresh_calendar', $args);
@@ -1496,17 +1508,14 @@
             ) {
                 if (!empty($event'recurrence_id')) {
                     $event'id' = $event'recurrence_id';
-                }
-                else if (!empty($old'recurrence_id')) {
+                } elseif (!empty($old'recurrence_id')) {
                     $event'id' = $old'recurrence_id';
-                }
-                else {
+                } else {
                     $event'id' = $old'id';
                 }
                 $event = $this->driver->get_event($event, 0, true);
                 unset($event'_instance', $event'recurrence_date');
-            }
-            else {
+            } else {
                 // make sure we have the complete record
                 $event = $action == 'remove' ? $old : $this->driver->get_event($event, 0, true);
             }
@@ -1519,13 +1528,12 @@
 
             // only notify if data really changed (TODO: do diff check on client already)
             if (!$old || $action == 'remove' || self::event_diff($event, $old)) {
-                $comment = isset($event'_comment') ? $event'_comment' : null;
+                $comment = $event'_comment' ?? null;
                 $sent    = $this->notify_attendees($event, $old, $action, $comment);
 
                 if ($sent > 0) {
                     $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
-                }
-                else if ($sent < 0) {
+                } elseif ($sent < 0) {
                     $this->rc->output->show_message('calendar.errornotifying', 'error');
                 }
             }
@@ -1536,7 +1544,7 @@
      * Handler for load-requests from fullcalendar
      * This will return pure JSON formatted output
      */
-    function load_events()
+    public function load_events()
     {
         $start  = $this->input_timestamp('start', rcube_utils::INPUT_GET);
         $end    = $this->input_timestamp('end', rcube_utils::INPUT_GET);
@@ -1577,8 +1585,8 @@
     {
         $path = explode('/', $msgref);
         $msg  = array_pop($path);
-        $mbox = join('/', $path);
-        list($uid, $mime_id) = explode('#', $msg);
+        $mbox = implode('/', $path);
+        $uid, $mime_id = explode('#', $msg);
         $events = ;
 
         if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
@@ -1712,8 +1720,7 @@
         foreach ((array) $p'ids' as $id) {
             if (strpos($id, 'cal:bday:') === 0) {
                 $p'success' |= $this->driver->dismiss_birthday_alarm(substr($id, 9), $p'snooze');
-            }
-            else if (strpos($id, 'cal:') === 0) {
+            } elseif (strpos($id, 'cal:') === 0) {
                 $p'success' |= $this->driver->dismiss_alarm(substr($id, 4), $p'snooze');
             }
         }
@@ -1724,7 +1731,7 @@
     /**
      * Handler for check-recent requests which are accidentally sent to calendar
      */
-    function check_recent()
+    public function check_recent()
     {
         // NOP
         $this->rc->output->send();
@@ -1733,7 +1740,7 @@
     /**
      * Hook triggered when a contact is saved
      */
-    function contact_update($p)
+    public function contact_update($p)
     {
         // clear birthdays calendar cache
         if (!empty($p'record''birthday')) {
@@ -1745,7 +1752,7 @@
     /**
      *
      */
-    function import_events()
+    public function import_events()
     {
         // Upload progress update
         if (!empty($_GET'_progress')) {
@@ -1776,7 +1783,7 @@
                             $filename = $zip->getNameIndex($i);
                             if (preg_match('/\.ics$/i', $filename)) {
                                 $tmpfile = $tmpdir . '/' . basename($filename);
-                                if (copy('zip://' . $_FILES'_data''tmp_name' . '#'.$filename, $tmpfile)) {
+                                if (copy('zip://' . $_FILES'_data''tmp_name' . '#' . $filename, $tmpfile)) {
                                     $count += $this->import_from_file($tmpfile, $calendar, $rangestart, $errors);
                                     unlink($tmpfile);
                                 }
@@ -1785,18 +1792,15 @@
 
                         rmdir($tmpdir);
                         $zip->close();
-                    }
-                    else {
+                    } else {
                         $errors = 1;
                         $msg = 'Failed to open zip file.';
                     }
-                }
-                else {
+                } else {
                     $errors = 1;
                     $msg = 'Zip files are not supported for import.';
                 }
-            }
-            else {
+            } else {
                 // attempt to import teh uploaded file directly
                 $count = $this->import_from_file($_FILES'_data''tmp_name', $calendar, $rangestart, $errors);
             }
@@ -1804,21 +1808,18 @@
             if ($count) {
                 $this->rc->output->command('display_message', $this->gettext('name' => 'importsuccess', 'vars' => 'nr' => $count), 'confirmation');
                 $this->rc->output->command('plugin.import_success', 'source' => $calendar, 'refetch' => true);
-            }
-            else if (!$errors) {
+            } elseif (empty($errors)) {
                 $this->rc->output->command('display_message', $this->gettext('importnone'), 'notice');
                 $this->rc->output->command('plugin.import_success', 'source' => $calendar);
+            } else {
+                $this->rc->output->command('plugin.import_error', 'message' => $this->gettext('importerror')
+                    . (!empty($msg) ? ': ' . $msg : ''));
             }
-            else {
-                $this->rc->output->command('plugin.import_error', 'message' => $this->gettext('importerror') . ($msg ? ': ' . $msg : ''));
-            }
-        }
-        else {
+        } else {
             if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
                 $max = $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize')));
                 $msg = $this->rc->gettext('name' => 'filesizeerror', 'vars' => 'size' => $max);
-            }
-            else {
+            } else {
                 $msg = $this->rc->gettext('fileuploaderror');
             }
 
@@ -1858,8 +1859,7 @@
 
             if ($this->driver->new_event($event)) {
                 $count++;
-            }
-            else {
+            } else {
                 $errors++;
             }
         }
@@ -1870,7 +1870,7 @@
     /**
      * Construct the ics file for exporting events to iCalendar format;
      */
-    function export_events($terminate = true)
+    public function export_events($terminate = true)
     {
         $start       = rcube_utils::get_input_value('start', rcube_utils::INPUT_GET);
         $end         = rcube_utils::get_input_value('end', rcube_utils::INPUT_GET);
@@ -1912,8 +1912,7 @@
                         $filename = 'event';
                     }
                 }
-            }
-            else {
+            } else {
                 $events = $this->driver->load_events($start, $end, null, $calid, 0);
                 if (empty($filename)) {
                     $filename = $calid;
@@ -1922,7 +1921,7 @@
         }
 
         header("Content-Type: text/calendar");
-        header("Content-Disposition: inline; filename=".$filename.'.ics');
+        header("Content-Disposition: inline; filename=" . $filename . '.ics');
 
         $this->get_ical()->export($events, '', true, $attachments ? $this->driver, 'get_attachment_body' : null);
 
@@ -1934,7 +1933,7 @@
     /**
      * Handler for iCal feed requests
      */
-    function ical_feed_export()
+    public function ical_feed_export()
     {
         $session_exists = !empty($_SESSION'user_id');
 
@@ -1974,15 +1973,14 @@
             $calhash = base64_decode($calhash);
         }
 
-        list($user, $_GET'source') = explode(':', $calhash, 2);
+        $user, $_GET'source' = explode(':', $calhash, 2);
 
         // sanity check user
         if ($this->rc->user->get_username() == $user) {
             $this->setup();
             $this->load_driver();
             $this->export_events(false);
-        }
-        else {
+        } else {
             header('HTTP/1.0 404 Not Found');
         }
 
@@ -1997,7 +1995,7 @@
     /**
      *
      */
-    function load_settings()
+    public function load_settings()
     {
         $this->lib->load_settings();
         $this->defaults += $this->lib->defaults;
@@ -2041,8 +2039,8 @@
             $settings'identity' = 
                 'name'   => $identity'name',
                 'email'  => strtolower($identity'email'),
-                'emails' => ';' . strtolower(join(';', $identity'emails')),
-                'ownedResources' => ';' . strtolower(join(';', $identity'ownedResources'))
+                'emails' => ';' . strtolower(implode(';', $identity'emails')),
+                'ownedResources' => ';' . strtolower(implode(';', $identity'ownedResources')),
             ;
         }
 
@@ -2066,12 +2064,12 @@
     /**
      * Encode events as JSON
      *
-     * @param array Events as array
-     * @param bool  Add CSS class names according to calendar and categories
+     * @param array $events Events as array
+     * @param bool  $addcss Add CSS class names according to calendar and categories
      *
      * @return string JSON encoded events
      */
-    function encode($events, $addcss = false)
+    public function encode($events, $addcss = false)
     {
         $json = ;
         foreach ($events as $event) {
@@ -2127,8 +2125,7 @@
                 }
                 if (!empty($attendee'status') && $attendee'status' == 'DELEGATED' && empty($attendee'rsvp')) {
                     $event'attendees'$i'noreply' = true;
-                }
-                else {
+                } else {
                     unset($event'attendees'$i'noreply');
                 }
             }
@@ -2205,9 +2202,9 @@
             $refdate  = strtotime($date);
             $start    = round(($refdate + rand(-$spread, $spread)) / 600) * 600;
             $duration = round(rand(30, 360) / 30) * 30 * 60;
-            $allday   = rand(0,20) > 18;
-            $alarm    = rand(-30,12) * 5;
-            $fb       = rand(0,2);
+            $allday   = rand(0, 20) > 18;
+            $alarm    = rand(-30, 12) * 5;
+            $fb       = rand(0, 2);
 
             if (date('G', $start) > 23) {
                 $start -= 3600;
@@ -2235,20 +2232,20 @@
                 . " by image noise.");
             // $chars = "!# abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 1234567890";
             for ($i = 0; $i < $len; $i++) {
-                $title .= $wordsrand(0,count($words)-1) . " ";
+                $title .= $wordsrand(0, count($words) - 1) . " ";
             }
 
             $this->driver->new_event(
                 'uid'        => $this->generate_uid(),
-                'start'      => new DateTime('@'.$start),
-                'end'        => new DateTime('@'.($start + $duration)),
+                'start'      => new DateTime('@' . $start),
+                'end'        => new DateTime('@' . ($start + $duration)),
                 'allday'     => $allday,
                 'title'      => rtrim($title),
                 'free_busy'  => $fb == 2 ? 'outofoffice' : ($fb ? 'busy' : 'free'),
                 'categories' => $catsarray_rand($cats),
                 'calendar'   => array_rand($cals),
                 'alarms'     => $alarm > 0 ? "-{$alarm}M:DISPLAY" : '',
-                'priority'   => rand(0,9),
+                'priority'   => rand(0, 9),
             );
         }
 
@@ -2291,8 +2288,7 @@
             $event      = $this->lib->mail_get_itip_object($mbox, $uid, $part, 'event');
             $attachment = $event'attachments'$id;
             $attachment'body' = &$attachment'data';
-        }
-        else {
+        } else {
             $attachment = $this->driver->get_attachment($id, $event);
         }
 
@@ -2301,7 +2297,7 @@
             $handler->attachment_page($attachment);
         }
         // deliver attachment content
-        else if ($attachment) {
+        elseif ($attachment) {
             if ($calendar != '--invitation--itip') {
                 $attachment'body' = $this->driver->get_attachment_body($id, $event);
             }
@@ -2319,10 +2315,10 @@
      */
     private function is_html($event)
     {
-          // check for opening and closing <html> or <body> tags
+        // check for opening and closing <html> or <body> tags
         return !empty($event'description')
             && preg_match('/<(html|body)(\s+a-z|>)/', $event'description', $m)
-            && strpos($event'description', '</'.$m1.'>') > 0;
+            && strpos($event'description', '</' . $m1 . '>') > 0;
     }
 
     /**
@@ -2358,8 +2354,7 @@
                 if (!$next) {
                     $this->rc->output->show_message('calendar.recurrenceerror', 'error');
                     return false;
-                }
-                else if ($event'start' != $next) {
+                } elseif ($event'start' != $next) {
                     $diff = $event'start'->diff($event'end', true);
 
                     $event'start' = $next;
@@ -2380,7 +2375,8 @@
 
         // convert link references into simple URIs
         if (array_key_exists('links', $event)) {
-            $event'links' = array_map(function($link) {
+            $event'links' = array_map(
+                function ($link) {
                     return is_array($link) ? $link'uri' : strval($link);
                 },
                 (array) $event'links'
@@ -2405,8 +2401,7 @@
                 }
                 if (!isset($attendee'rsvp')) {
                     $event'attendees'$i'rsvp' = true;
-                }
-                else if (is_string($attendee'rsvp')) {
+                } elseif (is_string($attendee'rsvp')) {
                     $event'attendees'$i'rsvp' = $attendee'rsvp' == 'true' || $attendee'rsvp' == '1';
                 }
             }
@@ -2421,12 +2416,12 @@
                 $event'attendees'$organizer'email' = $identity'email';
             }
             // set owner as organizer if yet missing
-            else if ($organizer === false && $owner !== false) {
+            elseif ($organizer === false && $owner !== false) {
                 $event'attendees'$owner'role' = 'ORGANIZER';
                 unset($event'attendees'$owner'rsvp');
             }
             // fallback to the selected identity
-            else if ($organizer === false && !empty($identity)) {
+            elseif ($organizer === false && !empty($identity)) {
                 $event'attendees' = 
                     'role'  => 'ORGANIZER',
                     'name'  => $identity'name',
@@ -2514,15 +2509,14 @@
             $is_new   = !in_array($attendee'email', $old_attendees);
             $is_rsvp  = $is_new || $event'sequence' > $old'sequence';
             $bodytext = $is_cancelled ? 'eventcancelmailbody' : ($is_new ? 'invitationmailbody' : 'eventupdatemailbody');
-            $subject  = $is_cancelled ? 'eventcancelsubject'  : ($is_new ? 'invitationsubject' : ($event'title' ? 'eventupdatesubject' : 'eventupdatesubjectempty'));
+            $subject  = $is_cancelled ? 'eventcancelsubject' : ($is_new ? 'invitationsubject' : ($event'title' ? 'eventupdatesubject' : 'eventupdatesubjectempty'));
 
             $event'comment' = $comment;
 
             // finally send the message
             if ($itip->send_itip_message($event, $method, $attendee, $subject, $bodytext, $message, $is_rsvp)) {
                 $sent++;
-            }
-            else {
+            } else {
                 $sent = -100;
             }
         }
@@ -2546,8 +2540,7 @@
 
                 if ($itip->send_itip_message($vevent, 'CANCEL', $attendee, 'eventcancelsubject', 'eventcancelmailbody')) {
                     $sent++;
-                }
-                else {
+                } else {
                     $sent = -100;
                 }
             }
@@ -2565,8 +2558,12 @@
         $start = $this->input_timestamp('start', rcube_utils::INPUT_GPC);
         $end   = $this->input_timestamp('end', rcube_utils::INPUT_GPC);
 
-        if (!$start) $start = time();
-        if (!$end) $end = $start + 3600;
+        if (!$start) {
+            $start = time();
+        }
+        if (!$end) {
+            $end = $start + 3600;
+        }
 
         $status = 'UNKNOWN';
         $fbtypemap = 
@@ -2574,7 +2571,7 @@
             calendar::FREEBUSY_FREE      => 'FREE',
             calendar::FREEBUSY_BUSY      => 'BUSY',
             calendar::FREEBUSY_TENTATIVE => 'TENTATIVE',
-            calendar::FREEBUSY_OOF       => 'OUT-OF-OFFICE'
+            calendar::FREEBUSY_OOF       => 'OUT-OF-OFFICE',
         ;
 
         // if the backend has free-busy information
@@ -2584,7 +2581,7 @@
             $status = 'FREE';
 
             foreach ($fblist as $slot) {
-                list($from, $to, $type) = $slot;
+                $from, $to, $type = $slot;
                 if ($from < $end && $to > $start) {
                     $status = isset($type) && !empty($fbtypemap$type) ? $fbtypemap$type : 'BUSY';
                     break;
@@ -2611,9 +2608,15 @@
         $interval  = intval(rcube_utils::get_input_value('interval', rcube_utils::INPUT_GPC));
         $strformat = $interval > 60 ? 'Ymd' : 'YmdHis';
 
-        if (!$start) $start = time();
-        if (!$end)   $end = $start + 86400 * 30;
-        if (!$interval) $interval = 60;  // 1 hour
+        if (!$start) {
+            $start = time();
+        }
+        if (!$end) {
+            $end = $start + 86400 * 30;
+        }
+        if (!$interval) {
+            $interval = 60;
+        }  // 1 hour
 
         $fblist = $this->driver->get_freebusy_list($email, $start, $end);
         $slots  = '';
@@ -2621,7 +2624,7 @@
         // prepare freebusy list before use (for better performance)
         if (is_array($fblist)) {
             foreach ($fblist as $idx => $slot) {
-                list($from, $to, ) = $slot;
+                $from, $to,  = $slot;
 
                 // check for possible all-day times
                 if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
@@ -2633,9 +2636,10 @@
         }
 
         // build a list from $start till $end with blocks representing the fb-status
+        $t_end = 0;
         for ($s = 0, $t = $start; $t <= $end; $s++) {
             $t_end = $t + $interval * 60;
-            $dt = new DateTime('@'.$t);
+            $dt = new DateTime('@' . $t);
             $dt->setTimezone($this->timezone);
 
             // determine attendee's status
@@ -2643,18 +2647,17 @@
                 $status = self::FREEBUSY_FREE;
 
                 foreach ($fblist as $slot) {
-                    list($from, $to, $type) = $slot;
+                    $from, $to, $type = $slot;
 
                     if ($from < $t_end && $to > $t) {
-                        $status = isset($type) ? $type : self::FREEBUSY_BUSY;
+                        $status = $type ?? self::FREEBUSY_BUSY;
                         if ($status == self::FREEBUSY_BUSY) {
                             // can't get any worse :-)
                             break;
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 $status = self::FREEBUSY_UNKNOWN;
             }
 
@@ -2721,8 +2724,8 @@
     /**
      * Compare two event objects and return differing properties
      *
-     * @param array Event A
-     * @param array Event B
+     * @param array $a Event A
+     * @param array $b Event B
      *
      * @return array List of differing event properties
      */
@@ -2733,8 +2736,8 @@
 
         foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
             if (empty($ignore$key) && $key0 != '_') {
-                $av = isset($a$key) ? $a$key : null;
-                $bv = isset($b$key) ? $b$key : null;
+                $av = $a$key ?? null;
+                $bv = $b$key ?? null;
 
                 if ($av != $bv) {
                     $diff = $key;
@@ -2756,10 +2759,11 @@
     /**
      * Update attendee properties on the given event object
      *
-     * @param array The event object to be altered
-     * @param array List of hash arrays each represeting an updated/added attendee
+     * @param array $event     The event object to be altered
+     * @param array $attendees List of hash arrays each represeting an updated/added attendee
+     * @param array $removed   List of attendees' addresses to remove
      */
-    public static function merge_attendee_data(&$event, $attendees, $removed = null)
+    public static function merge_attendee_data(&$event, $attendees, $removed = )
     {
         if (!empty($attendees) && !is_array($attendees0)) {
             $attendees = $attendees;
@@ -2783,7 +2787,7 @@
 
         // filter out removed attendees
         if (!empty($removed)) {
-            $event'attendees' = array_filter($event'attendees', function($attendee) use ($removed) {
+            $event'attendees' = array_filter($event'attendees', function ($attendee) use ($removed) {
                 return !in_array($attendee'email', $removed);
             });
         }
@@ -2839,7 +2843,7 @@
     /**
      * Handler for load-requests for resource data
      */
-    function resources_list()
+    public function resources_list()
     {
         $data = ;
 
@@ -2856,21 +2860,21 @@
     /**
      * Handler for requests loading resource owner information
      */
-    function resources_owner()
+    public function resources_owner()
     {
         if ($directory = $this->resources_directory()) {
             $id   = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
             $data = $directory->get_resource_owner($id);
         }
 
-        $this->rc->output->command('plugin.resource_owner', $data);
+        $this->rc->output->command('plugin.resource_owner', $data ?? null);
         $this->rc->output->send();
     }
 
     /**
      * Deliver event data for a resource's calendar
      */
-    function resources_calendar()
+    public function resources_calendar()
     {
         $events = ;
 
@@ -2927,7 +2931,7 @@
     /**
      * Handler for calendar/itip-status requests
      */
-    function event_itip_status()
+    public function event_itip_status()
     {
         $data = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
 
@@ -2938,6 +2942,7 @@
         $is_shared = $mode & calendar_driver::FILTER_SHARED;
         $itip      = $this->load_itip();
         $response  = $itip->get_itip_status($data, $existing);
+        $calendars = null;
 
         // get a list of writeable calendars to save new events to
         if (
@@ -2950,7 +2955,7 @@
                 'name'       => 'calendar',
                 'id'         => 'itip-saveto',
                 'is_escaped' => true,
-                'class'      => 'form-control custom-select'
+                'class'      => 'form-control custom-select',
             );
 
             $calendar_select->add('--', '');
@@ -2968,12 +2973,13 @@
 
         if (!empty($calendar_select)) {
             $default_calendar   = $this->get_default_calendar($calendars);
-            $response'select' = html::span('folder-select', $this->gettext('saveincalendar')
+            $response'select' = html::span(
+                'folder-select',
+                $this->gettext('saveincalendar')
                 . '&nbsp;'
                 . $calendar_select->show($is_shared ? $existing'calendar' : $default_calendar'id')
             );
-        }
-        else if (!empty($data'nosave')) {
+        } elseif (!empty($data'nosave')) {
             $response'select' = html::tag('input', 'type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => '');
         }
 
@@ -2987,7 +2993,7 @@
             $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
             $events    = $this->driver->load_events($day_start->format('U'), $day_end->format('U'), null, array_keys($calendars));
 
-            usort($events, function($a, $b) { return $a'start' > $b'start' ? 1 : -1; });
+            usort($events, function ($a, $b) { return $a'start' > $b'start' ? 1 : -1; });
 
             $before = $after = ;
             foreach ($events as $event) {
@@ -3002,8 +3008,7 @@
 
                 if ($event'start' < $event_start) {
                     $before = $this->mail_agenda_event_row($event);
-                }
-                else {
+                } else {
                     $after = $this->mail_agenda_event_row($event);
                 }
             }
@@ -3011,8 +3016,8 @@
             $response'append' = 
                 'selector' => '.calendar-agenda-preview',
                 'replacements' => 
-                    '%before%' => !empty($before) ? join("\n", array_slice($before,  -3)) : html::div('event-row no-event', $this->gettext('noearlierevents')),
-                    '%after%'  => !empty($after)  ? join("\n", array_slice($after, 0, 3)) : html::div('event-row no-event', $this->gettext('nolaterevents')),
+                    '%before%' => !empty($before) ? implode("\n", array_slice($before, -3)) : html::div('event-row no-event', $this->gettext('noearlierevents')),
+                    '%after%'  => !empty($after) ? implode("\n", array_slice($after, 0, 3)) : html::div('event-row no-event', $this->gettext('nolaterevents')),
                 ,
             ;
         }
@@ -3023,7 +3028,7 @@
     /**
      * Handler for calendar/itip-remove requests
      */
-    function event_itip_remove()
+    public function event_itip_remove()
     {
         $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
         $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
@@ -3039,8 +3044,7 @@
 
         if ($success) {
             $this->rc->output->show_message('calendar.successremoval', 'confirmation');
-        }
-        else {
+        } else {
             $this->rc->output->show_message('calendar.errorsaving', 'error');
         }
     }
@@ -3072,7 +3076,7 @@
                     $this->invitestatus = html::div('rsvp-status declined', $itip->gettext('eventcancelled'));
                 }
                 // save submitted RSVP status
-                else if (!empty($_POST'rsvp')) {
+                elseif (!empty($_POST'rsvp')) {
                     $status = null;
                     foreach ('accepted', 'tentative', 'declined' as $method) {
                         if ($_POST'rsvp' == $itip->gettext('itip' . $method)) {
@@ -3084,9 +3088,8 @@
                     // send itip reply to organizer
                     $invitation'event''comment' = rcube_utils::get_input_value('_comment', rcube_utils::INPUT_POST);
                     if ($status && $itip->update_invitation($invitation, $invitation'attendee', strtoupper($status))) {
-                        $this->invitestatus = html::div('rsvp-status ' . strtolower($status), $itip->gettext('youhave'.strtolower($status)));
-                    }
-                    else {
+                        $this->invitestatus = html::div('rsvp-status ' . strtolower($status), $itip->gettext('youhave' . strtolower($status)));
+                    } else {
                         $this->rc->output->command('display_message', $this->gettext('errorsaving'), 'error', -1);
                     }
 
@@ -3106,12 +3109,10 @@
                             if ($this->driver->new_event($invitation'event')) {
                                 $msg = $this->gettext('name' => 'importedsuccessfully', 'vars' => 'calendar' => $calendar'name');
                                 $this->rc->output->command('display_message', $msg, 'confirmation');
-                            }
-                            else {
+                            } else {
                                 $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
                             }
-                        }
-                        else if ($existing
+                        } elseif ($existing
                             && ($this->event'sequence' >= $existing'sequence'
                                 || $this->event'changed' >= $existing'changed')
                             && ($calendar = $this->driver->get_calendar($existing'calendar'))
@@ -3136,8 +3137,7 @@
                             if ($this->driver->edit_event($this->event)) {
                                 $msg = $this->gettext('name' => 'updatedsuccessfully', 'vars' => 'calendar' => $calendar->get_name());
                                 $this->rc->output->command('display_message', $msg, 'confirmation');
-                            }
-                            else {
+                            } else {
                                 $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
                             }
                         }
@@ -3153,8 +3153,7 @@
                 }
 
                 $this->rc->output->set_pagetitle($itip->gettext('itipinvitation') . ' ' . $this->event'title');
-            }
-            else {
+            } else {
                 $this->rc->output->command('display_message', $this->gettext('itipinvalidrequest'), 'error', -1);
             }
 
@@ -3169,10 +3168,12 @@
     {
         $hidden = new html_hiddenfield('name' => "_t", 'value' => $this->token);
 
-        return html::tag('form', 
+        return html::tag(
+            'form',
+            
                 'action' => $this->rc->url('task' => 'calendar', 'action' => 'attend'),
                 'method' => 'post',
-                'noclose' => true
+                'noclose' => true,
              + $attrib
         ) . $hidden->show();
     }
@@ -3184,8 +3185,7 @@
     {
         if (!empty($event'allday')) {
             $time = $this->gettext('all-day');
-        }
-        else {
+        } else {
             $start = is_object($event'start') ? clone $event'start' : $event'start';
             $end = is_object($event'end') ? clone $event'end' : $event'end';
 
@@ -3193,7 +3193,8 @@
                 . ' - ' . $this->rc->format_date($end, $this->rc->config->get('time_format'));
         }
 
-        return html::div(rtrim('event-row ' . ($class ?: ($event'className' ?? ''))),
+        return html::div(
+            rtrim('event-row ' . ($class ?: ($event'className' ?? ''))),
             html::span('event-date', $time)
             . html::span('event-title', rcube::Q($event'title'))
         );
@@ -3205,14 +3206,14 @@
     public function mail_messages_list($p)
     {
         if (!empty($p'cols') && in_array('attachment', (array) $p'cols') && !empty($p'messages')) {
+            /** @var rcube_message_header $header */
             foreach ($p'messages' as $header) {
-                $part = new StdClass;
+                $part = new StdClass();
                 $part->mimetype = $header->ctype;
 
                 if (libcalendaring::part_is_vcalendar($part)) {
                     $header->list_flags'attachmentClass' = 'ical';
-                }
-                else if (in_array($header->ctype, 'multipart/alternative', 'multipart/mixed')) {
+                } elseif (in_array($header->ctype, 'multipart/alternative', 'multipart/mixed')) {
                     // TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
                     if (!empty($header->structure) && !empty($header->structure->parts)) {
                         foreach ($header->structure->parts as $part) {
@@ -3261,13 +3262,15 @@
 
                 // prepare a small agenda preview to be filled with actual event data on async request
                 if ($ical_objects->method == 'REQUEST') {
-                    $append = html::div('calendar-agenda-preview',
+                    $append = html::div(
+                        'calendar-agenda-preview',
                         html::tag('h3', 'preview-title', $this->gettext('agenda') . ' ' . html::span('date', $date_str))
                         . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%'
                     );
                 }
 
-                $html .= html::div('calendar-invitebox invitebox boxinformation',
+                $html .= html::div(
+                    'calendar-invitebox invitebox boxinformation',
                     $this->itip->mail_itip_inline_ui(
                         $event,
                         $ical_objects->method,
@@ -3289,12 +3292,13 @@
         if ($html) {
             $this->ui->init();
             $p'content' = $html . $p'content';
-            $this->rc->output->add_label('calendar.savingdata','calendar.deleteventconfirm','calendar.declinedeleteconfirm');
+            $this->rc->output->add_label('calendar.savingdata', 'calendar.deleteventconfirm', 'calendar.declinedeleteconfirm');
         }
 
         // add "Save to calendar" button into attachment menu
         if ($has_events) {
-            $this->add_button(
+            $this->add_button(
+                
                     'id'         => 'attachmentsavecal',
                     'name'       => 'attachmentsavecal',
                     'type'       => 'link',
@@ -3334,6 +3338,8 @@
         $success   = false;
         $deleted   = false;
         $dontsave  = false;
+        $existing = null;
+        $event_attendee = null;
 
         if ($status == 'delegated') {
             $to = rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true);
@@ -3357,8 +3363,7 @@
 
                 if ($itip->delegate_to($event, $delegate, !empty($rsvpme))) {
                     $this->rc->output->show_message('calendar.itipsendsuccess', 'confirmation');
-                }
-                else {
+                } else {
                     $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
                 }
 
@@ -3376,7 +3381,7 @@
             $cal_id    = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST);
             $dontsave  = $cal_id === '' && $event'_method' == 'REQUEST';
             $calendars = $this->driver->list_calendars($mode);
-            $calendar  = isset($calendars$cal_id) ? $calendars$cal_id : null;
+            $calendar  = $calendars$cal_id ?? null;
 
             // select default calendar except user explicitly selected 'none'
             if (!$calendar && !$dontsave) {
@@ -3385,7 +3390,7 @@
 
             $metadata = 
                 'uid'       => $event'uid',
-                '_instance' => isset($event'_instance') ? $event'_instance' : null,
+                '_instance' => $event'_instance' ?? null,
                 'changed'   => is_object($event'changed') ? $event'changed'->format('U') : 0,
                 'sequence'  => intval($event'sequence' ?? 0),
                 'fallback'  => strtoupper((string) $status),
@@ -3403,8 +3408,7 @@
 
                     if ($attendee_role == 'ORGANIZER') {
                         $organizer = $attendee;
-                    }
-                    else if ($attendee_email && in_array(strtolower($attendee_email), $emails)) {
+                    } elseif ($attendee_email && in_array(strtolower($attendee_email), $emails)) {
                         $event'attendees'$i'status' = strtoupper($status);
                         if (!in_array($event'attendees'$i'status', 'NEEDS-ACTION', 'DELEGATED')) {
                             $event'attendees'$i'rsvp' = false;  // unset RSVP attribute
@@ -3437,7 +3441,7 @@
                 $existing = $this->find_event($event, $mode);
 
                 // we'll create a new copy if user decided to change the calendar
-                if ($existing && $cal_id && $calendar && $calendar'id' != $existing'calendar') {
+                if ($existing && $cal_id && $calendar'id' != $existing'calendar') {
                     $existing = null;
                 }
 
@@ -3446,7 +3450,6 @@
                     unset($event'free_busy');
                 }
 
-                $event_attendee   = null;
                 $update_attendees = ;
 
                 if ($existing) {
@@ -3479,12 +3482,12 @@
                             if ($attendee'status' == 'DELEGATED') {
                                 //Also find and copy the delegatee
                                 $delegatee_email = $attendee'email';
-                                $delegatees = array_filter($event'attendees', function($attendee) use ($delegatee_email){ return $attendee'role' != 'ORGANIZER' && $this->itip->compare_email($attendee'delegated-from', $delegatee_email); });
+                                $delegatees = array_filter($event'attendees', function ($attendee) use ($delegatee_email) { return $attendee'role' != 'ORGANIZER' && $this->itip->compare_email($attendee'delegated-from', $delegatee_email); });
 
                                 if ($delegatee = $this->itip->find_attendee_by_email($event'attendees', 'delegated-from', $attendee'email')) {
                                     $update_attendees = $delegatee;
                                     if (!in_array_nocase($delegatee'email', $existing_attendee_emails)) {
-                                        $existing'attendees' = $delegated_attendee;
+                                        $existing'attendees' = $delegatee'email';
                                     }
                                 }
                             }
@@ -3509,27 +3512,25 @@
                             $success = $this->driver->update_attendees($existing, $update_attendees);
                         }
                         // update the entire attendees block
-                        else if (
+                        elseif (
                             ($event'sequence' >= $existing'sequence' || $event'changed' >= $existing'changed')
                             && $event_attendee
                         ) {
                             $existing'attendees' = $event_attendee;
                             $success = $this->driver->update_attendees($existing, $update_attendees);
-                        }
-                        else if (!$event_attendee) {
+                        } elseif (!$event_attendee) {
                             $error_msg = $this->gettext('errorunknownattendee');
-                        }
-                        else {
+                        } else {
                             $error_msg = $this->gettext('newerversionexists');
                         }
                     }
                     // delete the event when declined (#1670)
-                    else if ($status == 'declined' && $delete) {
+                    elseif ($status == 'declined' && $delete) {
                         $deleted = $this->driver->remove_event($existing, true);
                         $success = true;
                     }
                     // import the (newer) event
-                    else if ($event'sequence' >= $existing'sequence' || $event'changed' >= $existing'changed') {
+                    elseif ($event'sequence' >= $existing'sequence' || $event'changed' >= $existing'changed') {
                         $event'id'       = $existing'id';
                         $event'calendar' = $existing'calendar';
 
@@ -3545,8 +3546,7 @@
                         // update attachments list, allow attachments update only on REQUEST (#5342)
                         if ($event'_method' == 'REQUEST') {
                             $event'deleted_attachments' = true;
-                        }
-                        else {
+                        } else {
                             unset($event'attachments');
                         }
 
@@ -3559,20 +3559,17 @@
                         }
 
                         $success = $this->driver->edit_event($event);
-                    }
-                    else if (!empty($status)) {
+                    } elseif (!empty($status)) {
                         $existing'attendees' = $event'attendees';
                         if ($status == 'declined' || ($event_attendee && ($event_attendee'role' ?? '') == 'NON-PARTICIPANT')) {
                             // show me as free when declined (#1670)
                             $existing'free_busy' = 'free';
                         }
                         $success = $this->driver->edit_event($existing);
-                    }
-                    else {
+                    } else {
                         $error_msg = $this->gettext('newerversionexists');
                     }
-                }
-                else if (!$existing && ($status != 'declined' || $this->rc->config->get('kolab_invitation_calendars'))) {
+                } elseif (empty($existing) && ($status != 'declined' || $this->rc->config->get('kolab_invitation_calendars'))) {
                     if ($status == 'declined'
                         || ($event'status' ?? '') == 'CANCELLED'
                         || ($event_attendee && ($event_attendee'role' ?? '') == 'NON-PARTICIPANT')
@@ -3587,7 +3584,7 @@
                         if ($master'recurrence' && empty($master'_instance')) {
                             // compute recurring events until this instance's date
                             if ($recurrence_date = rcube_utils::anytodatetime($instance, $master'start'->getTimezone())) {
-                                $recurrence_date->setTime(23,59,59);
+                                $recurrence_date->setTime(23, 59, 59);
 
                                 foreach ($this->driver->get_recurring_events($master, $master'start', $recurrence_date) as $recurring) {
                                     if ($recurring'_instance' == $instance) {
@@ -3601,12 +3598,10 @@
 
                                 $master'calendar' = $event'calendar' = $calendar'id';
                                 $success = $this->driver->new_event($master);
-                            }
-                            else {
+                            } else {
                                 $master = null;
                             }
-                        }
-                        else {
+                        } else {
                             $master = null;
                         }
                     }
@@ -3616,15 +3611,12 @@
                         $event'calendar' = $calendar'id';
                         $success = $this->driver->new_event($event);
                     }
-                }
-                else if ($status == 'declined') {
+                } elseif ($status == 'declined') {
                     $error_msg = null;
                 }
-            }
-            else if ($status == 'declined' || $dontsave) {
+            } elseif ($status == 'declined' || $dontsave) {
                 $error_msg = null;
-            }
-            else {
+            } else {
                 $error_msg = $this->gettext('nowritecalendarfound');
             }
         }
@@ -3632,31 +3624,29 @@
         if ($success) {
             if ($event'_method' == 'REPLY') {
                 $message = 'attendeupdateesuccess';
-            }
-            else {
+            } else {
                 $message = $deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully');
             }
 
-            $msg = $this->gettext('name' => $message, 'vars' => 'calendar' => $calendar'name');
+            $msg = $this->gettext('name' => $message, 'vars' => 'calendar' => $calendar'name' ?? '');
             $this->rc->output->command('display_message', $msg, 'confirmation');
         }
 
         if ($success || $dontsave) {
-            $metadata'calendar' = isset($event'calendar') ? $event'calendar' : null;
+            $metadata'calendar' = $event'calendar' ?? null;
             $metadata'nosave'   = $dontsave;
             $metadata'rsvp'     = !empty($metadata'rsvp');
 
             $metadata'after_action' = $this->rc->config->get('calendar_itip_after_action', $this->defaults'calendar_itip_after_action');
             $this->rc->output->command('plugin.itip_message_processed', $metadata);
             $error_msg = null;
-        }
-        else if ($error_msg) {
+        } elseif ($error_msg) {
             $this->rc->output->command('display_message', $error_msg, 'error');
         }
 
         // send iTip reply
         if ($event'_method' == 'REQUEST' && !empty($organizer) && !$noreply && !$error_msg && !empty($reply_sender)
-            && !in_array(strtolower($organizer'email'), $emails)
+            && !in_array(strtolower($organizer'email'), $emails ?? )
         ) {
             $event'comment' = $comment;
             $itip = $this->load_itip();
@@ -3666,8 +3656,7 @@
                 $mailto = $organizer'name' ? $organizer'name' : $organizer'email';
                 $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
                 $this->rc->output->command('display_message', $msg, 'confirmation');
-            }
-            else {
+            } else {
                 $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
             }
         }
@@ -3678,7 +3667,7 @@
     /**
      * Handler for calendar/itip-remove requests
      */
-    function mail_itip_decline_reply()
+    public function mail_itip_decline_reply()
     {
         $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
         $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
@@ -3698,16 +3687,14 @@
 
             $itip = $this->load_itip();
 
-            if ($itip->send_itip_message($event, 'CANCEL', $attendee, 'itipsubjectcancel', 'itipmailbodycancel')) {
-                $mailto = !empty($attendee'name') ? $attendee'name' : $attendee'email';
+            if ($itip->send_itip_message($event, 'CANCEL', $attendee ?? null, 'itipsubjectcancel', 'itipmailbodycancel')) {
+                $mailto = !empty($attendee'name') ? $attendee'name' : ($attendee'email' ?? '');
                 $msg    = $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $mailto);
                 $this->rc->output->command('display_message', $msg, 'confirmation');
-            }
-            else {
+            } else {
                 $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
             }
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
         }
     }
@@ -3715,7 +3702,7 @@
     /**
      * Handler for calendar/itip-delegate requests
      */
-    function mail_itip_delegate()
+    public function mail_itip_delegate()
     {
         // forward request to mail_import_itip() with the right status
         $_POST'_status' = $_REQUEST'_status' = 'delegated';
@@ -3730,7 +3717,6 @@
         $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
         $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
         $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
-        $charset = RCUBE_CHARSET;
 
         // establish imap connection
         $imap = $this->rc->get_storage();
@@ -3738,13 +3724,9 @@
 
         if ($uid && $mime_id) {
             $part = $imap->get_message_part($uid, $mime_id);
-            // $headers = $imap->get_message_headers($uid);
 
             if ($part) {
-                if (!empty($part->ctype_parameters'charset')) {
-                    $charset = $part->ctype_parameters'charset';
-                }
-                $events = $this->get_ical()->import($part, $charset);
+                $events = $this->get_ical()->import($part);
             }
         }
 
@@ -3763,8 +3745,7 @@
 
                     if (!$this->driver->get_event($event'uid', calendar_driver::FILTER_WRITEABLE)) {
                         $success += (bool)$this->driver->new_event($event);
-                    }
-                    else {
+                    } else {
                         $existing++;
                     }
                 }
@@ -3774,11 +3755,9 @@
         if ($success) {
             $msg = $this->gettext('name' => 'importsuccess', 'vars' => 'nr' => $success);
             $this->rc->output->command('display_message', $msg, 'confirmation');
-        }
-        else if ($existing) {
+        } elseif ($existing) {
             $this->rc->output->command('display_message', $this->gettext('importwarningexists'), 'warning');
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
         }
     }
@@ -3812,14 +3791,13 @@
                 $event'links' = $msgref;
             }
             // copy mail attachments to event
-            else if (!empty($message->attachments) && !empty($this->driver->attachments)) {
+            elseif (!empty($message->attachments) && !empty($this->driver->attachments)) {
                 $handler = new kolab_attachments_handler();
                 $event'attachments' = $handler->copy_mail_attachments(self::SESSION_KEY, 'cal-', $message);
             }
 
             $this->rc->output->set_env('event_prop', $event);
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
         }
 
@@ -3837,7 +3815,7 @@
         if (!empty($args'param''calendar_event')) {
             $this->load_driver();
 
-            list($cal, $id) = explode(':', $args'param''calendar_event', 2);
+            $cal, $id = explode(':', $args'param''calendar_event', 2);
 
             if ($event = $this->driver->get_event('id' => $id, 'calendar' => $cal)) {
                 $filename = asciiwords($event'title');
@@ -3879,8 +3857,7 @@
 
         if ($room_url) {
             $this->rc->output->command('plugin.talk_room_created', 'url' => $room_url);
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('talkroomcreateerror'), 'error');
         }
     }
@@ -3905,8 +3882,7 @@
                 if (!empty($attendee'email')) {
                     if ($attendee'role' == 'ORGANIZER') {
                         $organizer = $attendee'email';
-                    }
-                    else if ($attendee'cutype' == 'INDIVIDUAL') {
+                    } elseif ($attendee'cutype' == 'INDIVIDUAL') {
                         $participants = $attendee'email';
                     }
                 }
@@ -3950,11 +3926,11 @@
      */
     public function user_delete($args)
     {
-         // delete itipinvitations entries related to this user
-         $db = $this->rc->get_dbh();
-         $table_itipinvitations = $db->table_name('itipinvitations', true);
+        // delete itipinvitations entries related to this user
+        $db = $this->rc->get_dbh();
+        $table_itipinvitations = $db->table_name('itipinvitations', true);
 
-         $db->query("DELETE FROM $table_itipinvitations WHERE `user_id` = ?", $args'user'->ID);
+        $db->query("DELETE FROM $table_itipinvitations WHERE `user_id` = ?", $args'user'->ID);
 
         $this->setup();
         $this->load_driver();
@@ -3984,8 +3960,7 @@
             $object->set($event);
 
             $recurrence = new kolab_date_recurrence($object);
-        }
-        else {
+        } else {
             // fallback to libcalendaring recurrence implementation
             $recurrence = new libcalendaring_recurrence($this->lib, $event);
         }
@@ -4014,15 +3989,15 @@
     public function __get($name)
     {
         switch ($name) {
-        case 'ical':
-            return $this->get_ical();
+            case 'ical':
+                return $this->get_ical();
 
-        case 'itip':
-            return $this->load_itip();
+            case 'itip':
+                return $this->load_itip();
 
-        case 'driver':
-            $this->load_driver();
-            return $this->driver;
+            case 'driver':
+                $this->load_driver();
+                return $this->driver;
         }
 
         return null;

roundcubemail-1.5.tar.gz/plugins/calendar/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/calendar/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/caldav/caldav_calendar.php Changed

@@ -42,8 +42,8 @@
     /**
      * Factory method to instantiate a caldav_calendar object
      *
-     * @param string $id       Calendar ID (encoded IMAP folder name)
-     * @param object $calendar Calendar plugin object
+     * @param string   $id       Calendar ID (encoded IMAP folder name)
+     * @param calendar $calendar Calendar plugin object
      *
      * @return caldav_calendar Self instance
      */
@@ -59,8 +59,7 @@
     {
         if ($folder_or_id instanceof kolab_storage_dav_folder) {
             $this->storage = $folder_or_id;
-        }
-        else {
+        } else {
             // $this->storage = kolab_storage_dav::get_folder($folder_or_id, 'event');
         }
 
@@ -78,13 +77,13 @@
             if ($this->storage->get_namespace() == 'personal') {
                 $this->editable = true;
                 $this->rights = 'lrswikxteav';
-            }
-            else {
+            } else {
                 $rights = $this->storage->get_myrights();
                 if ($rights) {
                     $this->rights = $rights;
                     if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
-                        $this->editable = strpos($rights, 'i');;
+                        $this->editable = strpos($rights, 'i');
+                        ;
                     }
                 }
             }
@@ -118,16 +117,16 @@
      */
     public function get_caldav_url()
     {
-/*
-        if ($template = $this->cal->rc->config->get('calendar_caldav_url', null)) {
-            return strtr($template, 
-                    '%h' => $_SERVER'HTTP_HOST',
-                    '%u' => urlencode($this->cal->rc->get_user_name()),
-                    '%i' => urlencode($this->storage->get_uid()),
-                    '%n' => urlencode($this->name),
-            );
-        }
-*/
+        /*
+                if ($template = $this->cal->rc->config->get('calendar_caldav_url', null)) {
+                    return strtr($template, 
+                            '%h' => $_SERVER'HTTP_HOST',
+                            '%u' => urlencode($this->cal->rc->get_user_name()),
+                            '%i' => urlencode($this->storage->get_uid()),
+                            '%n' => urlencode($this->name),
+                    );
+                }
+        */
         return false;
     }
 
@@ -166,8 +165,7 @@
                 // check for match on the first instance already
                 if (!empty($master'_instance') && $master'_instance' == $instance_id) {
                     $this->events$id = $master;
-                }
-                else if (!empty($master'recurrence')) {
+                } elseif (!empty($master'recurrence')) {
                     $start_date = $master'start';
                     // For performance reasons we'll get only the specific instance
                     if (($date = substr($id, strlen($master_id) + 1, 8)) && strlen($date) == 8 && is_numeric($date)) {
@@ -190,43 +188,41 @@
     {
         $event = $this->get_event($event'id');
         $data = $this->storage->get_attachment($id, $event);
-/*
-        if ($data === false) {
-            // try again with master UID
-            $uid = preg_replace('/-\d+(T\d{6})?$/', '', $event'id');
-            if ($uid != $event'id') {
-                $data = $this->storage->get_attachment($uid, $id); // TODO
-            }
-        }
-*/
+        /*
+                if ($data === false) {
+                    // try again with master UID
+                    $uid = preg_replace('/-\d+(T\d{6})?$/', '', $event'id');
+                    if ($uid != $event'id') {
+                        $data = $this->storage->get_attachment($uid, $id); // TODO
+                    }
+                }
+        */
         return $data;
     }
 
     /**
-     * @param int    Event's new start (unix timestamp)
-     * @param int    Event's new end (unix timestamp)
-     * @param string Search query (optional)
-     * @param bool   Include virtual events (optional)
-     * @param array  Additional parameters to query storage
-     * @param array  Additional query to filter events
+     * @param int    $start        Event's new start (unix timestamp)
+     * @param int    $end          Event's new end (unix timestamp)
+     * @param string $search       Search query (optional)
+     * @param bool   $virtual      Include virtual events (optional)
+     * @param array  $query        Additional parameters to query storage
+     * @param array  $filter_query Additional query to filter events
      *
      * @return array A list of event records
      */
-    public function list_events($start, $end, $search = null, $virtual = 1, $query = , $filter_query = null)
+    public function list_events($start, $end, $search = null, $virtual = true, $query = , $filter_query = null)
     {
         // convert to DateTime for comparisons
         // #5190: make the range a little bit wider
         // to workaround possible timezone differences
         try {
             $start = new DateTime('@' . ($start - 12 * 3600));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $start = new DateTime('@0');
         }
         try {
             $end = new DateTime('@' . ($end + 12 * 3600));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $end = new DateTime('today +10 years');
         }
 
@@ -323,7 +319,7 @@
                 $events = array_merge($events, $this->get_recurring_events($event, $start, $end));
             }
             // add top-level exceptions (aka loose single occurrences)
-            else if (!empty($record'exceptions')) {
+            elseif (!empty($record'exceptions')) {
                 foreach ($record'exceptions' as $ex) {
                     $component = $this->_to_driver_event($ex, false, false, $record);
                     if ($component'start' <= $end && $component'end' >= $start) {
@@ -335,7 +331,7 @@
 
         // post-filter all events by fulltext search and partstat values
         $me = $this;
-        $events = array_filter($events, function($event) use ($words, $partstat_exclude, $user_emails, $me) {
+        $events = array_filter($events, function ($event) use ($words, $partstat_exclude, $user_emails, $me) {
             // fulltext search
             if (count($words)) {
                 $hits = 0;
@@ -372,9 +368,9 @@
     /**
      * Get number of events in the given calendar
      *
-     * @param int   Date range start (unix timestamp)
-     * @param int   Date range end (unix timestamp)
-     * @param array Additional query to filter events
+     * @param int   $start        Date range start (unix timestamp)
+     * @param int   $end          Date range end (unix timestamp)
+     * @param array $filter_query Additional query to filter events
      *
      * @return int Number of events
      */
@@ -382,16 +378,14 @@
     {
         // convert to DateTime for comparisons
         try {
-            $start = new DateTime('@'.$start);
-        }
-        catch (Exception $e) {
+            $start = new DateTime('@' . $start);
+        } catch (Exception $e) {
             $start = new DateTime('@0');
         }
         if ($end) {
             try {
-                $end = new DateTime('@'.$end);
-            }
-            catch (Exception $e) {
+                $end = new DateTime('@' . $end);
+            } catch (Exception $e) {
                 $end = null;
             }
         }
@@ -409,8 +403,7 @@
                 $query = 'tags', '!=', 'x-partstat:' . $email . ':needs-action';
                 $query = 'tags', '!=', 'x-partstat:' . $email . ':declined';
             }
-        }
-        else if (is_array($filter_query)) {
+        } elseif (is_array($filter_query)) {
             $query = array_merge($query, $filter_query);
         }
 
@@ -439,11 +432,13 @@
         $saved  = $this->storage->save($object, 'event');
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving event object to DAV server"
+                    'message' => "Error saving event object to DAV server",
                 ,
-                true, false
+                true,
+                false
             );
             return false;
         }
@@ -455,7 +450,7 @@
 
         $this->events = $event'uid' => $this->_to_driver_event($object, true);
 
-        return true;
+        return $saved;
     }
 
     /**
@@ -483,14 +478,15 @@
         $saved = $this->storage->save($object, 'event', $old'uid');
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving event object to CalDAV server"
+                    'message' => "Error saving event object to CalDAV server",
                 ,
-                true, false
+                true,
+                false
             );
-        }
-        else {
+        } else {
             // save links in configuration.relation object
             // if ($this->save_links($event'uid', $links)) {
             //     $object'links' = $links;
@@ -521,11 +517,13 @@
         $deleted = $this->storage->delete($uid, $force);
 
         if (!$deleted) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error deleting event '{$uid}' from CalDAV server"
+                    'message' => "Error deleting event '{$uid}' from CalDAV server",
                 ,
-                true, false
+                true,
+                false
             );
         }
 
@@ -551,8 +549,10 @@
     protected function get_links($uid)
     {
         return ; // TODO
+        /*
         $storage = kolab_storage_config::get_instance();
         return $storage->get_object_links($uid);
+        */
     }
 
     /**
@@ -561,18 +561,20 @@
     protected function save_links($uid, $links)
     {
         return false; // TODO
+        /*
         $storage = kolab_storage_config::get_instance();
         return $storage->save_object_links($uid, (array) $links);
+        */
     }
 
     /**
      * Create instances of a recurring event
      *
-     * @param array    $event    Hash array with event properties
-     * @param DateTime $start    Start date of the recurrence window
-     * @param DateTime $end      End date of the recurrence window
-     * @param string   $event_id ID of a specific recurring event instance
-     * @param int      $limit    Max. number of instances to return
+     * @param array     $event    Hash array with event properties
+     * @param DateTime  $start    Start date of the recurrence window
+     * @param ?DateTime $end      End date of the recurrence window
+     * @param string    $event_id ID of a specific recurring event instance
+     * @param int       $limit    Max. number of instances to return
      *
      * @return array List of recurring event instances
      */
@@ -589,6 +591,7 @@
         $exdata = ;
         $futuredata = ;
         $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+        $recurrence_rule = null;
 
         if (!empty($event'recurrence')) {
             // copy the recurrence rule from the master event (to be used in the UI)
@@ -696,8 +699,7 @@
                 if ($limit && count($events) >= $limit) {
                     return $events;
                 }
-            }
-            else if ($next_event'start' > $end) {
+            } elseif ($next_event'start' > $end) {
                 // stop loop if out of range
                 break;
             }
@@ -745,14 +747,13 @@
             && empty($record'recurrence_id') && empty($record'_instance')
         ) {
             $record'_instance' = $record'start'->format($recurrence_id_format);
-        }
-        else if (isset($record'recurrence_date') && $record'recurrence_date' instanceof DateTimeInterface) {
+        } elseif (isset($record'recurrence_date') && $record'recurrence_date' instanceof DateTimeInterface) {
             $record'_instance' = $record'recurrence_date'->format($recurrence_id_format);
         }
 
         // clean up exception data
         if (!empty($record'recurrence') && !empty($record'recurrence''EXCEPTIONS')) {
-            array_walk($record'recurrence''EXCEPTIONS', function(&$exception) {
+            array_walk($record'recurrence''EXCEPTIONS', function (&$exception) {
                 unset($exception'_attachments');
             });
         }
@@ -803,7 +804,7 @@
         }
 
         // remove some internal properties which should not be cached
-        $cleanup_fn = function(&$event) {
+        $cleanup_fn = function (&$event) {
             unset($event'_savemode', $event'_fromcalendar', $event'_identity', $event'_folder_id',
                 $event'calendar', $event'className', $event'recurrence_id',
                 $event'attachments', $event'deleted_attachments');
@@ -865,13 +866,11 @@
             foreach ($prop as $key => $val) {
                 if (is_numeric($key)) {
                     $out .= self::_complex2string($val);
-                }
-                else if (!in_array($key, $ignorekeys)) {
+                } elseif (!in_array($key, $ignorekeys)) {
                     $out .= $val . ' ';
                 }
             }
-        }
-        else if (is_string($prop) || is_numeric($prop)) {
+        } elseif (is_string($prop) || is_numeric($prop)) {
             $out .= $prop . ' ';
         }

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/caldav/caldav_driver.php Changed

@@ -80,7 +80,7 @@
 
         // get all folders that support VEVENT, sorted by namespace/name
         $folders = $this->storage->get_folders('event');
-            // + $this->storage->get_user_folders('event', true);
+        // + $this->storage->get_user_folders('event', true);
 
         $this->calendars = ;
 
@@ -99,6 +99,8 @@
 
     /**
      * Convert kolab_storage_folder into caldav_calendar
+     *
+     * @return caldav_calendar|kolab_user_calendar
      */
     protected function _to_calendar($folder)
     {
@@ -109,8 +111,7 @@
         if ($folder instanceof kolab_storage_folder_user) {
             $calendar = new kolab_user_calendar($folder, $this->cal);
             $calendar->subscriptions = count($folder->children) > 0;
-        }
-        else {
+        } else {
             $calendar = new caldav_calendar($folder, $this->cal);
         }
 
@@ -120,8 +121,8 @@
     /**
      * Get a list of available calendars from this source.
      *
-     * @param int    $filter Bitmask defining filter criterias
-     * @param object $tree   Reference to hierarchical folder tree object
+     * @param int                           $filter Bitmask defining filter criterias
+     * @param ?kolab_storage_folder_virtual $tree   Reference to hierarchical folder tree object
      *
      * @return array List of calendars
      */
@@ -134,121 +135,122 @@
         $prefs     = $this->rc->config->get('kolab_calendars', );
 
         // include virtual folders for a full folder tree
-/*
+        /*
         if (!is_null($tree)) {
             $folders = $this->storage->folder_hierarchy($folders, $tree);
         }
-*/
+        */
         $parents = array_keys($this->calendars);
 
         foreach ($folders as $id => $cal) {
             $parent_id = null;
-/*
-            $path = explode('/', $cal->name);
-
-            // find parent
-            do {
-                array_pop($path);
-                $parent_id = $this->storage->folder_id(implode('/', $path));
-            }
-            while (count($path) > 1 && !in_array($parent_id, $parents));
-
-            // restore "real" parent ID
-            if ($parent_id && !in_array($parent_id, $parents)) {
-                $parent_id = $this->storage->folder_id($cal->get_parent());
-            }
+            /*
+                        $path = explode('/', $cal->name);
+
+                        // find parent
+                        do {
+                            array_pop($path);
+                            $parent_id = $this->storage->folder_id(implode('/', $path));
+                        }
+                        while (count($path) > 1 && !in_array($parent_id, $parents));
+
+                        // restore "real" parent ID
+                        if ($parent_id && !in_array($parent_id, $parents)) {
+                            $parent_id = $this->storage->folder_id($cal->get_parent());
+                        }
+
+                        $parents = $cal->id;
+
+                        if ($cal instanceof kolab_storage_folder_virtual) {
+                            $calendars$cal->id = 
+                                'id'       => $cal->id,
+                                'name'     => $cal->get_name(),
+                                'listname' => $cal->get_foldername(),
+                                'editname' => $cal->get_foldername(),
+                                'virtual'  => true,
+                                'editable' => false,
+                                'group'    => $cal->get_namespace(),
+                            ;
+                        }
+                        else {
+            */
+            // additional folders may come from kolab_storage_dav::folder_hierarchy() above
+            // make sure we deal with caldav_calendar instances
+            $cal = $this->_to_calendar($cal);
+            $this->calendars$cal->id = $cal;
+
+            $is_user = false; // ($cal instanceof caldav_user_calendar);
+
+            $calendars$cal->id = 
+                'id'        => $cal->id,
+                'name'      => $cal->get_name(),
+                'listname'  => $cal->get_foldername(),
+                'editname'  => $cal->get_foldername(),
+                'title'     => '', // $cal->get_title(),
+                'color'     => $cal->get_color(),
+                'editable'  => $cal->editable,
+                'group'     => $is_user ? 'other user' : $cal->get_namespace(), // @phpstan-ignore-line
+                'active'    => !isset($prefs$cal->id'active') || !empty($prefs$cal->id'active'),
+                'owner'     => $cal->get_owner(),
+                'removable' => !$cal->default,
+                // extras to hide some elements in the UI
+                'subscriptions' => $cal->subscriptions,
+                'driver' => 'caldav',
+            ;
 
-            $parents = $cal->id;
-
-            if ($cal->virtual) {
-                $calendars$cal->id = 
-                    'id'       => $cal->id,
-                    'name'     => $cal->get_name(),
-                    'listname' => $cal->get_foldername(),
-                    'editname' => $cal->get_foldername(),
-                    'virtual'  => true,
-                    'editable' => false,
-                    'group'    => $cal->get_namespace(),
-                ;
-            }
-            else {
-*/
-                // additional folders may come from kolab_storage_dav::folder_hierarchy() above
-                // make sure we deal with caldav_calendar instances
-                $cal = $this->_to_calendar($cal);
-                $this->calendars$cal->id = $cal;
-
-                $is_user = ($cal instanceof caldav_user_calendar);
-
-                $calendars$cal->id = 
-                    'id'        => $cal->id,
-                    'name'      => $cal->get_name(),
-                    'listname'  => $cal->get_foldername(),
-                    'editname'  => $cal->get_foldername(),
-                    'title'     => '', // $cal->get_title(),
-                    'color'     => $cal->get_color(),
-                    'editable'  => $cal->editable,
-                    'group'     => $is_user ? 'other user' : $cal->get_namespace(),
-                    'active'    => !isset($prefs$cal->id'active') || !empty($prefs$cal->id'active'),
-                    'owner'     => $cal->get_owner(),
-                    'removable' => !$cal->default,
-                    // extras to hide some elements in the UI
-                    'subscriptions' => $cal->subscriptions,
-                    'driver' => 'caldav',
+            // @phpstan-ignore-next-line
+            if (!$is_user) {
+                $calendars$cal->id += 
+                    'default'    => $cal->default,
+                    'rights'     => $cal->rights,
+                    'showalarms' => $cal->alarms,
+                    'history'    => !empty($this->bonnie_api),
+                    'children'   => true,  // TODO: determine if that folder indeed has child folders
+                    'parent'     => $parent_id,
+                    'subtype'    => $cal->subtype,
+                    'caldavurl'  => '', // $cal->get_caldav_url(),
                 ;
-
-                if (!$is_user) {
-                    $calendars$cal->id += 
-                        'default'    => $cal->default,
-                        'rights'     => $cal->rights,
-                        'showalarms' => $cal->alarms,
-                        'history'    => !empty($this->bonnie_api),
-                        'children'   => true,  // TODO: determine if that folder indeed has child folders
-                        'parent'     => $parent_id,
-                        'subtype'    => $cal->subtype,
-                        'caldavurl'  => '', // $cal->get_caldav_url(),
-                    ;
-                }
-/*
             }
-*/
+            /*
+                        }
+            */
             if ($cal->subscriptions) {
                 $calendars$cal->id'subscribed' = $cal->is_subscribed();
             }
         }
-/*
-        // list virtual calendars showing invitations
-        if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
-            foreach (self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED as $id) {
-                $cal = new caldav_invitation_calendar($id, $this->cal);
-                if (!($filter & self::FILTER_ACTIVE) || $cal->is_active()) {
-                    $calendars$id = 
-                        'id'         => $cal->id,
-                        'name'       => $cal->get_name(),
-                        'listname'   => $cal->get_name(),
-                        'editname'   => $cal->get_foldername(),
-                        'title'      => $cal->get_title(),
-                        'color'      => $cal->get_color(),
-                        'editable'   => $cal->editable,
-                        'rights'     => $cal->rights,
-                        'showalarms' => $cal->alarms,
-                        'history'    => !empty($this->bonnie_api),
-                        'group'      => 'x-invitations',
-                        'default'    => false,
-                        'active'     => $cal->is_active(),
-                        'owner'      => $cal->get_owner(),
-                        'children'   => false,
-                        'counts'     => $id == self::INVITATIONS_CALENDAR_PENDING,
-                    ;
-
-
-                    if (is_object($tree)) {
-                        $tree->children = $cal;
+        /*
+                // list virtual calendars showing invitations
+                if ($this->rc->config->get('kolab_invitation_calendars') && !($filter & self::FILTER_INSERTABLE)) {
+                    foreach (self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED as $id) {
+                        $cal = new caldav_invitation_calendar($id, $this->cal);
+                        if (!($filter & self::FILTER_ACTIVE) || $cal->is_active()) {
+                            $calendars$id = 
+                                'id'         => $cal->id,
+                                'name'       => $cal->get_name(),
+                                'listname'   => $cal->get_name(),
+                                'editname'   => $cal->get_foldername(),
+                                'title'      => $cal->get_title(),
+                                'color'      => $cal->get_color(),
+                                'editable'   => $cal->editable,
+                                'rights'     => $cal->rights,
+                                'showalarms' => $cal->alarms,
+                                'history'    => !empty($this->bonnie_api),
+                                'group'      => 'x-invitations',
+                                'default'    => false,
+                                'active'     => $cal->is_active(),
+                                'owner'      => $cal->get_owner(),
+                                'children'   => false,
+                                'counts'     => $id == self::INVITATIONS_CALENDAR_PENDING,
+                            ;
+
+
+                            if (is_object($tree)) {
+                                $tree->children = $cal;
+                            }
+                        }
                     }
                 }
-            }
-        }
-*/
+        */
         // append the virtual birthdays calendar
         if ($this->rc->config->get('calendar_contact_birthdays', false) && !($filter & self::FILTER_INSERTABLE)) {
             $id    = self::BIRTHDAY_CALENDAR_ID;
@@ -277,9 +279,9 @@
     /**
      * Get the caldav_calendar instance for the given calendar ID
      *
-     * @param string Calendar identifier
+     * @param string $id Calendar identifier
      *
-     * @return ?caldav_calendar Object nor null if calendar doesn't exist
+     * @return caldav_calendar|caldav_invitation_calendar|null Object nor null if calendar doesn't exist
      */
     public function get_calendar($id)
     {
@@ -306,7 +308,7 @@
     /**
      * Create a new calendar assigned to the current user
      *
-     * @param array Hash array with calendar properties
+     * @param array $prop Hash array with calendar properties
      *    name: Calendar name
      *   color: The color of the calendar
      *
@@ -353,8 +355,7 @@
 
         if (isset($prop'showalarms') && $id == self::BIRTHDAY_CALENDAR_ID) {
             $prefs'calendar_birthdays_alarm_type' = $prop'showalarms' ? $this->alarm_types0 : '';
-        }
-        else if (isset($prop'showalarms')) {
+        } elseif (isset($prop'showalarms')) {
             $prefs'kolab_calendars'$id'showalarms' = !empty($prop'showalarms');
         }
 
@@ -413,8 +414,8 @@
     /**
      * Search for shared or otherwise not listed calendars the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
      *
      * @return array List of calendars
      */
@@ -422,61 +423,60 @@
     {
         $this->calendars = ;
         $this->search_more_results = false;
-/*
-        // find unsubscribed IMAP folders that have "event" type
-        if ($source == 'folders') {
-            foreach ((array) $this->storage->search_folders('event', $query, 'other') as $folder) {
-                $calendar = new kolab_calendar($folder->name, $this->cal);
-                $this->calendars$calendar->id = $calendar;
-            }
-        }
-        // find other user's virtual calendars
-        else if ($source == 'users') {
-            // we have slightly more space, so display twice the number
-            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
-
-            foreach ($this->storage->search_users($query, 0, , $limit, $count) as $user) {
-                $calendar = new caldav_user_calendar($user, $this->cal);
-                $this->calendars$calendar->id = $calendar;
-
-                // search for calendar folders shared by this user
-                foreach ($this->storage->list_user_folders($user, 'event', false) as $foldername) {
-                    $cal = new caldav_calendar($foldername, $this->cal);
-                    $this->calendars$cal->id = $cal;
-                    $calendar->subscriptions = true;
+        /*
+                // find unsubscribed IMAP folders that have "event" type
+                if ($source == 'folders') {
+                    foreach ((array) $this->storage->search_folders('event', $query, 'other') as $folder) {
+                        $calendar = new kolab_calendar($folder->name, $this->cal);
+                        $this->calendars$calendar->id = $calendar;
+                    }
                 }
-            }
+                // find other user's virtual calendars
+                else if ($source == 'users') {
+                    // we have slightly more space, so display twice the number
+                    $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
+
+                    foreach ($this->storage->search_users($query, 0, , $limit, $count) as $user) {
+                        $calendar = new caldav_user_calendar($user, $this->cal);
+                        $this->calendars$calendar->id = $calendar;
+
+                        // search for calendar folders shared by this user
+                        foreach ($this->storage->list_user_folders($user, 'event', false) as $foldername) {
+                            $cal = new caldav_calendar($foldername, $this->cal);
+                            $this->calendars$cal->id = $cal;
+                            $calendar->subscriptions = true;
+                        }
+                    }
 
-            if ($count > $limit) {
-                $this->search_more_results = true;
-            }
-        }
+                    if ($count > $limit) {
+                        $this->search_more_results = true;
+                    }
+                }
 
-        // don't list the birthday calendar
-        $this->rc->config->set('calendar_contact_birthdays', false);
-        $this->rc->config->set('kolab_invitation_calendars', false);
-*/
+                // don't list the birthday calendar
+                $this->rc->config->set('calendar_contact_birthdays', false);
+                $this->rc->config->set('kolab_invitation_calendars', false);
+        */
         return $this->list_calendars();
     }
 
     /**
      * Get events from source.
      *
-     * @param int    Event's new start (unix timestamp)
-     * @param int    Event's new end (unix timestamp)
-     * @param string Search query (optional)
-     * @param mixed  List of calendar IDs to load events from (either as array or comma-separated string)
-     * @param bool   Include virtual events (optional)
-     * @param int    Only list events modified since this time (unix timestamp)
+     * @param int    $start         Event's new start (unix timestamp)
+     * @param int    $end           Event's new end (unix timestamp)
+     * @param string $search        Search query (optional)
+     * @param mixed  $calendars     List of calendar IDs to load events from (either as array or comma-separated string)
+     * @param bool   $virtual       Include virtual events (optional)
+     * @param int    $modifiedsince Only list events modified since this time (unix timestamp)
      *
      * @return array A list of event records
      */
-    public function load_events($start, $end, $search = null, $calendars = null, $virtual = 1, $modifiedsince = null)
+    public function load_events($start, $end, $search = null, $calendars = null, $virtual = true, $modifiedsince = null)
     {
         if ($calendars && is_string($calendars)) {
             $calendars = explode(',', $calendars);
-        }
-        else if (!$calendars) {
+        } elseif (!$calendars) {
             $this->_read_calendars();
             $calendars = array_keys($this->calendars);
         }
@@ -506,7 +506,7 @@
         $newcats = array_udiff(
             array_keys($categories),
             array_keys($old_categories),
-            function($a, $b) { return strcasecmp($a, $b); }
+            function ($a, $b) { return strcasecmp($a, $b); }
         );
 
         if (!empty($newcats)) {
@@ -524,9 +524,9 @@
     /**
      * Create instances of a recurring event
      *
-     * @param array    Hash array with event properties
-     * @param DateTime Start date of the recurrence window
-     * @param DateTime End date of the recurrence window
+     * @param array     $event Hash array with event properties
+     * @param DateTime  $start Start date of the recurrence window
+     * @param ?DateTime $end   End date of the recurrence window
      *
      * @return array List of recurring event instances
      */
@@ -579,8 +579,7 @@
                     && in_array(strtolower($attendee'email'), $emails)
                 ) {
                     $is_organizer = true;
-                }
-                else if ($attendee'role' != 'ORGANIZER'
+                } elseif ($attendee'role' != 'ORGANIZER'
                     && $attendee'role' != 'NON-PARTICIPANT'
                     && $attendee'status' != 'DELEGATED'
                 ) {
@@ -600,9 +599,9 @@
 
     /**
      * Identify changes considered relevant for scheduling
-     * 
-     * @param array Hash array with NEW object properties
-     * @param array Hash array with OLD object properties
+     *
+     * @param array $object Hash array with NEW object properties
+     * @param array $old    Hash array with OLD object properties
      *
      * @return bool True if changes affect scheduling, False otherwise
      */
@@ -631,8 +630,7 @@
                 // advanced rrule comparison: no rescheduling if series was shortened
                 if ($a'COUNT' && $b'COUNT' && $b'COUNT' < $a'COUNT') {
                     unset($a'COUNT', $b'COUNT');
-                }
-                else if ($a'UNTIL' && $b'UNTIL' && $b'UNTIL' < $a'UNTIL') {
+                } elseif ($a'UNTIL' && $b'UNTIL' && $b'UNTIL' < $a'UNTIL') {
                     unset($a'UNTIL', $b'UNTIL');
                 }
             }
@@ -649,9 +647,9 @@
     /**
      * Callback function to produce driver-specific calendar create/edit form
      *
-     * @param string Request action 'form-edit|form-new'
-     * @param array  Calendar properties (e.g. id, color)
-     * @param array  Edit form fields
+     * @param string $action     Request action 'form-edit|form-new'
+     * @param array  $calendar   Calendar properties (e.g. id, color)
+     * @param array  $formfields Edit form fields
      *
      * @return string HTML content of the form
      */
@@ -660,7 +658,7 @@
         $special_calendars = 
             self::BIRTHDAY_CALENDAR_ID,
             self::INVITATIONS_CALENDAR_PENDING,
-            self::INVITATIONS_CALENDAR_DECLINED
+            self::INVITATIONS_CALENDAR_DECLINED,
         ;
 
         // show default dialog for birthday calendar

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/calendar_driver.php Changed

@@ -94,15 +94,15 @@
  */
 abstract class calendar_driver
 {
-    const FILTER_ALL           = 0;
-    const FILTER_WRITEABLE     = 1;
-    const FILTER_INSERTABLE    = 2;
-    const FILTER_ACTIVE        = 4;
-    const FILTER_PERSONAL      = 8;
-    const FILTER_PRIVATE       = 16;
-    const FILTER_CONFIDENTIAL  = 32;
-    const FILTER_SHARED        = 64;
-    const BIRTHDAY_CALENDAR_ID = '__bdays__';
+    public const FILTER_ALL           = 0;
+    public const FILTER_WRITEABLE     = 1;
+    public const FILTER_INSERTABLE    = 2;
+    public const FILTER_ACTIVE        = 4;
+    public const FILTER_PERSONAL      = 8;
+    public const FILTER_PRIVATE       = 16;
+    public const FILTER_CONFIDENTIAL  = 32;
+    public const FILTER_SHARED        = 64;
+    public const BIRTHDAY_CALENDAR_ID = '__bdays__';
 
     // features supported by backend
     public $alarms      = false;
@@ -131,7 +131,7 @@
      *
      * @return array List of calendars
      */
-    abstract function list_calendars($filter = 0);
+    abstract public function list_calendars($filter = 0);
 
     /**
      * Create a new calendar assigned to the current user
@@ -143,7 +143,7 @@
      *
      * @return mixed ID of the calendar on success, False on error
      */
-    abstract function create_calendar($prop);
+    abstract public function create_calendar($prop);
 
     /**
      * Update properties of an existing calendar
@@ -156,7 +156,7 @@
      *
      * @return bool True on success, Fales on failure
      */
-    abstract function edit_calendar($prop);
+    abstract public function edit_calendar($prop);
 
     /**
      * Set active/subscribed state of a calendar
@@ -167,7 +167,7 @@
      *
      * @return bool True on success, Fales on failure
      */
-    abstract function subscribe_calendar($prop);
+    abstract public function subscribe_calendar($prop);
 
     /**
      * Delete the given calendar with all its contents
@@ -177,7 +177,7 @@
      *
      * @return bool True on success, Fales on failure
      */
-    abstract function delete_calendar($prop);
+    abstract public function delete_calendar($prop);
 
     /**
      * Search for shared or otherwise not listed calendars the user has access
@@ -187,7 +187,7 @@
      *
      * @return array List of calendars
      */
-    abstract function search_calendars($query, $source);
+    abstract public function search_calendars($query, $source);
 
     /**
      * Add a single event to the database
@@ -196,7 +196,7 @@
      *
      * @return mixed New event ID on success, False on error
      */
-    abstract function new_event($event);
+    abstract public function new_event($event);
 
     /**
      * Update an event entry with the given data
@@ -205,7 +205,7 @@
      *
      * @return bool True on success, False on error
      */
-    abstract function edit_event($event);
+    abstract public function edit_event($event);
 
     /**
      * Extended event editing with possible changes to the argument
@@ -245,7 +245,7 @@
      *
      * @return bool True on success, False on error
      */
-    abstract function move_event($event);
+    abstract public function move_event($event);
 
     /**
      * Resize a single event
@@ -257,7 +257,7 @@
      *
      * @return bool True on success, False on error
      */
-    abstract function resize_event($event);
+    abstract public function resize_event($event);
 
     /**
      * Remove a single event from the database
@@ -269,7 +269,7 @@
      *
      * @return bool True on success, False on error
      */
-    abstract function remove_event($event, $force = true);
+    abstract public function remove_event($event, $force = true);
 
     /**
      * Restores a single deleted event (if supported)
@@ -296,9 +296,9 @@
      *                     See FILTER_* constants for possible values.
      * @param bool  $full  If true, recurrence exceptions shall be added
      *
-     * @return array Event object as hash array
+     * @return ?array Event object as hash array
      */
-    abstract function get_event($event, $scope = 0, $full = false);
+    abstract public function get_event($event, $scope = 0, $full = false);
 
     /**
      * Get events from source.
@@ -312,7 +312,7 @@
      *
      * @return array A list of event objects (see header of this file for struct of an event)
      */
-    abstract function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null);
+    abstract public function load_events($start, $end, $query = null, $calendars = null, $virtual = true, $modifiedsince = null);
 
     /**
      * Get number of events in the given calendar
@@ -323,7 +323,7 @@
      *
      * @return array   Hash array with counts grouped by calendar ID
      */
-    abstract function count_events($calendars, $start, $end = null);
+    abstract public function count_events($calendars, $start, $end = null);
 
     /**
      * Get a list of pending alarms to be displayed to the user
@@ -340,7 +340,7 @@
      *      title: Event title/summary
      *   location: Location string
      */
-    abstract function pending_alarms($time, $calendars = null);
+    abstract public function pending_alarms($time, $calendars = null);
 
     /**
      * (User) feedback after showing an alarm notification
@@ -349,7 +349,7 @@
      * @param string $event_id Event identifier
      * @param int    $snooze   Suspend the alarm for this number of seconds
      */
-    abstract function dismiss_alarm($event_id, $snooze = 0);
+    abstract public function dismiss_alarm($event_id, $snooze = 0);
 
     /**
      * Check the given event object for validity
@@ -388,7 +388,10 @@
      *   mimetype: MIME content type of the attachment
      *       size: Attachment size
      */
-    public function list_attachments($event) { }
+    public function list_attachments($event)
+    {
+        return ;
+    }
 
     /**
      * Get attachment properties
@@ -398,13 +401,16 @@
      *         id: Event identifier
      *   calendar: Calendar identifier
      *
-     * @return array Hash array with attachment properties:
+     * @return array|false Hash array with attachment properties:
      *         id: Attachment identifier
      *       name: Attachment name
      *   mimetype: MIME content type of the attachment
      *       size: Attachment size
      */
-    public function get_attachment($id, $event) { }
+    public function get_attachment($id, $event)
+    {
+        return false;
+    }
 
     /**
      * Get attachment body
@@ -414,18 +420,21 @@
      *         id: Event identifier
      *   calendar: Calendar identifier
      *
-     * @return string Attachment body
+     * @return string|false Attachment body
      */
-    public function get_attachment_body($id, $event) { }
+    public function get_attachment_body($id, $event)
+    {
+        return false;
+    }
 
     /**
      * Build a struct representing the given message reference
      *
-     * @param object|string $uri_or_headers rcube_message_header instance holding the message headers
-     *                         or an URI from a stored link referencing a mail message.
-     * @param string $folder  IMAP folder the message resides in
+     * @param rcube_message_header|string $uri_or_headers An object holding the message headers
+     *                                                    or an URI from a stored link referencing a mail message.
+     * @param string                      $folder         IMAP folder the message resides in
      *
-     * @return array An struct referencing the given IMAP message
+     * @return array|false An struct referencing the given IMAP message
      */
     public function get_message_reference($uri_or_headers, $folder = null)
     {
@@ -446,17 +455,23 @@
     /**
      * Create a new category
      */
-    public function add_category($name, $color) { }
+    public function add_category($name, $color)
+    {
+    }
 
     /**
      * Remove the given category
      */
-    public function remove_category($name) { }
+    public function remove_category($name)
+    {
+    }
 
     /**
      * Update/replace a category
      */
-    public function replace_category($oldname, $name, $color) { }
+    public function replace_category($oldname, $name, $color)
+    {
+    }
 
     /**
      * Fetch free/busy information from a person within the given range
@@ -465,7 +480,7 @@
      * @param int    $start Requested period start date/time as unix timestamp
      * @param int    $end   Requested period end date/time as unix timestamp
      *
-     * @return array List of busy timeslots within the requested range
+     * @return array|false List of busy timeslots within the requested range
      */
     public function get_freebusy_list($email, $start, $end)
     {
@@ -486,16 +501,21 @@
         $events = ;
 
         if (!empty($event'recurrence')) {
-            $rcmail     = rcmail::get_instance();
-            $recurrence = new libcalendaring_recurrence($rcmail->plugins->get_plugin('calendar')->lib, $event);
+            $rcmail = rcmail::get_instance();
+            /** @var calendar $plugin */
+            $plugin = $rcmail->plugins->get_plugin('calendar');
+            $recurrence = new libcalendaring_recurrence($plugin->lib, $event);
             $recurrence_id_format = libcalendaring::recurrence_id_format($event);
 
             // determine a reasonable end date if none given
             if (!$end) {
                 switch ($event'recurrence''FREQ') {
-                case 'YEARLY':  $intvl = 'P100Y'; break;
-                case 'MONTHLY': $intvl = 'P20Y';  break;
-                default:        $intvl = 'P10Y';  break;
+                    case 'YEARLY':  $intvl = 'P100Y';
+                        break;
+                    case 'MONTHLY': $intvl = 'P20Y';
+                        break;
+                    default:        $intvl = 'P10Y';
+                        break;
                 }
 
                 $end = clone $event'start';
@@ -510,8 +530,7 @@
                     $next_event'id' = $next_event'uid' . '-' . $next_event'_instance';
                     $next_event'recurrence_id' = $event'uid';
                     $events = $next_event;
-                }
-                else if ($next_event'start' > $end) {  // stop loop if out of range
+                } elseif ($next_event'start' > $end) {  // stop loop if out of range
                     break;
                 }
 
@@ -532,7 +551,7 @@
      *         id: Event identifier
      *   calendar: Calendar identifier
      *
-     * @return array List of changes, each as a hash array:
+     * @return array|false List of changes, each as a hash array:
      *         rev: Revision number
      *        type: Type of the change (create, update, move, delete)
      *        date: Change date
@@ -554,7 +573,7 @@
      * @param mixed $rev1 Old Revision
      * @param mixed $rev2 New Revision
      *
-     * @return array List of property changes, each as a hash array:
+     * @return array|false List of property changes, each as a hash array:
      *    property: Revision number
      *         old: Old property value
      *         new: Updated property value
@@ -572,7 +591,7 @@
      *  calendar: Calendar identifier
      * @param mixed  $rev Revision number
      *
-     * @return array Event object as hash array
+     * @return array|false Event object as hash array
      * @see self::get_event()
      */
     public function get_event_revison($event, $rev)
@@ -589,7 +608,7 @@
      *  calendar: Calendar identifier
      * @param mixed  $rev Revision number
      *
-     * @return boolean True on success, False on failure
+     * @return bool True on success, False on failure
      */
     public function restore_event_revision($event, $rev)
     {
@@ -607,10 +626,11 @@
      */
     public function calendar_form($action, $calendar, $formfields)
     {
+        $rcmail = rcmail::get_instance();
         $table = new html_table('cols' => 2, 'class' => 'propform');
 
         foreach ($formfields as $col => $colprop) {
-            $label = !empty($colprop'label') ? $colprop'label' : $rcmail->gettext("$domain.$col");
+            $label = !empty($colprop'label') ? $colprop'label' : $rcmail->gettext("calendar.$col");
 
             $table->add('title', html::label($colprop'id', rcube::Q($label)));
             $table->add(null, $colprop'value');
@@ -640,8 +660,8 @@
         }
 
         // convert to DateTime for comparisons
-        $start  = new DateTime('@'.$start);
-        $end    = new DateTime('@'.$end);
+        $start  = new DateTime('@' . $start);
+        $end    = new DateTime('@' . $end);
         // extract the current year
         $year   = $start->format('Y');
         $year2  = $end->format('Y');
@@ -752,7 +772,7 @@
     public function get_birthday_event($id)
     {
         // decode $id
-        list(, $source, $contact_id, $year) = explode(':', rcube_ldap::dn_decode($id));
+        , $source, $contact_id, $year = explode(':', rcube_ldap::dn_decode($id));
 
         $rcmail = rcmail::get_instance();
 
@@ -774,7 +794,7 @@
     public static function parse_contact($contact, $source)
     {
         if (!is_array($contact)) {
-            return;
+            return null;
         }
 
         if (!empty($contact'birthday') && is_array($contact'birthday')) {
@@ -782,22 +802,23 @@
         }
 
         if (empty($contact'birthday')) {
-            return;
+            return null;
         }
 
         try {
             $bday = libcalendaring_datetime::createFromAny($contact'birthday', true);
-        }
-        catch (Exception $e) {
-            rcube::raise_error(
+        } catch (Exception $e) {
+            rcube::raise_error(
+                
                     'code' => 600,
                     'file' => __FILE__,
                     'line' => __LINE__,
-                    'message' => 'Failed to parse contact birthday: ' . $e->getMessage()
+                    'message' => 'Failed to parse contact birthday: ' . $e->getMessage(),
                 ,
-                true, false
+                true,
+                false
             );
-            return;
+            return null;
         }
 
         $rcmail       = rcmail::get_instance();

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/database/database_driver.php Changed

@@ -26,24 +26,24 @@
 
 class database_driver extends calendar_driver
 {
-    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+    public const DB_DATE_FORMAT = 'Y-m-d H:i:s';
 
-    public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'cancelled');
+    public static $scheduling_properties = 'start', 'end', 'allday', 'recurrence', 'location', 'cancelled';
 
     // features this backend supports
     public $alarms      = true;
     public $attendees   = true;
     public $freebusy    = false;
     public $attachments = true;
-    public $alarm_types = array('DISPLAY');
+    public $alarm_types = 'DISPLAY';
 
     private $rc;
     private $cal;
-    private $cache           = array();
-    private $calendars       = array();
+    private $cache           = ;
+    private $calendars       = ;
     private $calendar_ids    = '';
-    private $free_busy_map   = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);
-    private $sensitivity_map = array('public' => 0, 'private' => 1, 'confidential' => 2);
+    private $free_busy_map   = 'free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3;
+    private $sensitivity_map = 'public' => 0, 'private' => 1, 'confidential' => 2;
     private $server_timezone;
 
     private $db_events      = 'events';
@@ -75,17 +75,18 @@
     private function _read_calendars()
     {
         $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
+        $db = $this->rc->get_dbh();
 
         if (!empty($this->rc->user->ID)) {
-            $calendar_ids = array();
-            $result = $this->rc->db->query(
+            $calendar_ids = ;
+            $result = $db->query(
                 "SELECT *, `calendar_id` AS id FROM `{$this->db_calendars}`"
                 . " WHERE `user_id` = ?"
                 . " ORDER BY `name`",
                 $this->rc->user->ID
             );
 
-            while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
+            while ($result && ($arr = $db->fetch_assoc($result))) {
                 $arr'showalarms' = intval($arr'showalarms');
                 $arr'active'     = !in_array($arr'id', $hidden);
                 $arr'name'       = html::quote($arr'name');
@@ -94,17 +95,17 @@
                 $arr'editable'  = true;
 
                 $this->calendars$arr'calendar_id' = $arr;
-                $calendar_ids = $this->rc->db->quote($arr'calendar_id');
+                $calendar_ids = $db->quote($arr'calendar_id');
             }
 
-            $this->calendar_ids = join(',', $calendar_ids);
+            $this->calendar_ids = implode(',', $calendar_ids);
         }
     }
 
     /**
      * Get a list of available calendars from this source
      *
-     * @param integer Bitmask defining filter criterias
+     * @param int $filter Bitmask defining filter criterias
      *
      * @return array List of calendars
      */
@@ -112,7 +113,7 @@
     {
         // attempt to create a default calendar for this user
         if (empty($this->calendars)) {
-            if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true))) {
+            if ($this->create_calendar('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true)) {
                 $this->_read_calendars();
             }
         }
@@ -132,12 +133,12 @@
 
         // append the virtual birthdays calendar
         if ($this->rc->config->get('calendar_contact_birthdays', false)) {
-            $prefs  = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
+            $prefs  = $this->rc->config->get('birthday_calendar', 'color' => '87CEFA');
             $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
             $id     = self::BIRTHDAY_CALENDAR_ID;
 
-            if (empty($active) || !in_array($id, $hidden)) {
-                $calendars$id = array(
+            if (!in_array($id, $hidden)) {
+                $calendars$id = 
                     'id'         => $id,
                     'name'       => $this->cal->gettext('birthdays'),
                     'listname'   => $this->cal->gettext('birthdays'),
@@ -148,7 +149,7 @@
                     'editable'  => false,
                     'default'    => false,
                     'children'   => false,
-                );
+                ;
             }
         }
 
@@ -158,9 +159,10 @@
     /**
      * Create a new calendar assigned to the current user
      *
-     * @param array Hash array with calendar properties
+     * @param array $prop Hash array with calendar properties
      *    name: Calendar name
      *   color: The color of the calendar
+     *
      * @return mixed ID of the calendar on success, False on error
      */
     public function create_calendar($prop)
@@ -191,7 +193,7 @@
     {
         // birthday calendar properties are saved in user prefs
         if ($prop'id' == self::BIRTHDAY_CALENDAR_ID) {
-            $prefs'birthday_calendar' = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
+            $prefs'birthday_calendar' = $this->rc->config->get('birthday_calendar', 'color' => '87CEFA');
             if (isset($prop'color')) {
                 $prefs'birthday_calendar''color' = $prop'color';
             }
@@ -229,12 +231,11 @@
 
         if ($prop'active') {
             unset($hidden$prop'id');
-        }
-        else {
+        } else {
             $hidden$prop'id' = 1;
         }
 
-        return $this->rc->user->save_prefs(array('hidden_calendars' => join(',', array_keys($hidden))));
+        return $this->rc->user->save_prefs('hidden_calendars' => implode(',', array_keys($hidden)));
     }
 
     /**
@@ -262,21 +263,21 @@
     /**
      * Search for shared or otherwise not listed calendars the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
      *
      * @return array List of calendars
      */
     public function search_calendars($query, $source)
     {
         // not implemented
-        return array();
+        return ;
     }
 
     /**
      * Add a single event to the database
      *
-     * @param array Hash array with event properties
+     * @param array $event Hash array with event properties
      * @see calendar_driver::new_event()
      */
     public function new_event($event)
@@ -331,14 +332,14 @@
             strval($event'title'),
             isset($event'description') ? strval($event'description') : '',
             isset($event'location') ? strval($event'location') : '',
-            isset($event'categories') ? join(',', (array) $event'categories') : '',
+            isset($event'categories') ? implode(',', (array) $event'categories') : '',
             isset($event'url') ? strval($event'url') : '',
             intval($event'free_busy'),
             intval($event'priority'),
             intval($event'sensitivity'),
             isset($event'status') ? strval($event'status') : '',
             $event'attendees',
-            isset($event'alarms') ? $event'alarms' : null,
+            $event'alarms' ?? null,
             $event'notifyat'
         );
 
@@ -364,7 +365,7 @@
     /**
      * Update an event entry with the given data
      *
-     * @param array Hash array with event properties
+     * @param array $event Hash array with event properties
      * @see calendar_driver::edit_event()
      */
     public function edit_event($event)
@@ -386,123 +387,124 @@
 
             // modify a recurring event, check submitted savemode to do the right things
             if ($old'recurrence' || $old'recurrence_id') {
-                $master = $old'recurrence_id' ? $this->get_event(array('id' => $old'recurrence_id')) : $old;
+                $master = $old'recurrence_id' ? $this->get_event('id' => $old'recurrence_id') : $old;
 
                 // keep saved exceptions (not submitted by the client)
                 if (!empty($old'recurrence''EXDATE')) {
                     $event'recurrence''EXDATE' = $old'recurrence''EXDATE';
                 }
 
-                $savemode = isset($event'_savemode') ? $event'_savemode' : null;
+                $savemode = $event'_savemode' ?? null;
                 switch ($savemode) {
-                case 'new':
-                    $event'uid' = $this->cal->generate_uid();
-                    return $this->new_event($event);
-
-                case 'current':
-                    // save as exception
-                    $event'isexception' = 1;
-                    $update_recurring     = false;
-
-                    // set exception to first instance (= master)
-                    if ($event'id' == $master'id') {
-                        $event += $old;
-                        $event'recurrence_id' = $master'id';
-                        $event'_instance'     = libcalendaring::recurrence_instance_identifier($old, $master'allday');
-                        $event'isexception'   = 1;
-                        $event_id = $this->_insert_event($event);
-
-                        return $event_id;
-                    }
-                    break;
-
-                case 'future':
-                    if ($master'id' != $event'id') {
-                        // set until-date on master event, then save this instance as new recurring event
-                        $master'recurrence''UNTIL' = clone $event'start';
-                        $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
-                        unset($master'recurrence''COUNT');
-                        $update_master = true;
+                    case 'new':
+                        $event'uid' = $this->cal->generate_uid();
+                        return $this->new_event($event);
+
+                    case 'current':
+                        // save as exception
+                        $event'isexception' = 1;
+                        $update_recurring     = false;
+
+                        // set exception to first instance (= master)
+                        if ($event'id' == $master'id') {
+                            $event += $old;
+                            $event'recurrence_id' = $master'id';
+                            $event'_instance'     = libcalendaring::recurrence_instance_identifier($old, $master'allday');
+                            $event'isexception'   = 1;
+                            $event_id = $this->_insert_event($event);
+
+                            return $event_id;
+                        }
+                        break;
 
-                        // if recurrence COUNT, update value to the correct number of future occurences
-                        if ($event'recurrence''COUNT') {
-                            $fromdate = clone $event'start';
-                            $fromdate->setTimezone($this->server_timezone);
-
-                            $query = $this->rc->db->query(
-                                "SELECT `event_id` FROM `{$this->db_events}`"
-                                . " WHERE `calendar_id` IN ({$this->calendar_ids})"
-                                    . " AND `start` >= ? AND `recurrence_id` = ?",
-                                $fromdate->format(self::DB_DATE_FORMAT),
-                                $master'id'
-                            );
-
-                            if ($count = $this->rc->db->num_rows($query)) {
-                                $event'recurrence''COUNT' = $count;
+                    case 'future':
+                        if ($master'id' != $event'id') {
+                            // set until-date on master event, then save this instance as new recurring event
+                            $master'recurrence''UNTIL' = clone $event'start';
+                            $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
+                            unset($master'recurrence''COUNT');
+                            $update_master = true;
+
+                            // if recurrence COUNT, update value to the correct number of future occurences
+                            if ($event'recurrence''COUNT') {
+                                $fromdate = clone $event'start';
+                                $fromdate->setTimezone($this->server_timezone);
+
+                                $query = $this->rc->db->query(
+                                    "SELECT `event_id` FROM `{$this->db_events}`"
+                                    . " WHERE `calendar_id` IN ({$this->calendar_ids})"
+                                        . " AND `start` >= ? AND `recurrence_id` = ?",
+                                    $fromdate->format(self::DB_DATE_FORMAT),
+                                    $master'id'
+                                );
+
+                                if ($count = $this->rc->db->num_rows($query)) {
+                                    $event'recurrence''COUNT' = $count;
+                                }
                             }
+
+                            $update_recurring       = true;
+                            $event'recurrence_id' = 0;
+                            $event'isexception'   = 0;
+                            $event'_instance'     = '';
+                            break;
                         }
+                        // else: 'future' == 'all' if modifying the master event
 
-                        $update_recurring       = true;
+                        // no break
+                    default:  // 'all' is default
+                        $event'id'            = $master'id';
                         $event'recurrence_id' = 0;
-                        $event'isexception'   = 0;
-                        $event'_instance'     = '';
-                        break;
-                    }
-                    // else: 'future' == 'all' if modifying the master event
 
-                default:  // 'all' is default
-                    $event'id'            = $master'id';
-                    $event'recurrence_id' = 0;
-
-                    // use start date from master but try to be smart on time or duration changes
-                    $old_start_date = $old'start'->format('Y-m-d');
-                    $old_start_time = $old'allday' ? '' : $old'start'->format('H:i');
-                    $old_duration   = $old'end'->format('U') - $old'start'->format('U');
-
-                    $new_start_date = $event'start'->format('Y-m-d');
-                    $new_start_time = $event'allday' ? '' : $event'start'->format('H:i');
-                    $new_duration   = $event'end'->format('U') - $event'start'->format('U');
-
-                    $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
-                    $date_shift = $old'start'->diff($event'start');
-
-                    // shifted or resized
-                    if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
-                        $event'start' = $master'start'->add($old'start'->diff($event'start'));
-                        $event'end'   = clone $event'start';
-                        $event'end'->add(new DateInterval('PT'.$new_duration.'S'));
-                    }
-                    // dates did not change, use the ones from master
-                    else if ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
-                        $event'start' = $master'start';
-                        $event'end'   = $master'end';
-                    }
+                        // use start date from master but try to be smart on time or duration changes
+                        $old_start_date = $old'start'->format('Y-m-d');
+                        $old_start_time = $old'allday' ? '' : $old'start'->format('H:i');
+                        $old_duration   = $old'end'->format('U') - $old'start'->format('U');
 
-                    // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
-                    if (is_array($event'recurrence')
-                        && ($old_start_date != $new_start_date || $old_start_time != $new_start_time)
-                        && ($exceptions = $this->_load_exceptions($old))
-                    ) {
-                        $recurrence_id_format = libcalendaring::recurrence_id_format($event);
-
-                        foreach ($exceptions as $exception) {
-                            $recurrence_id = rcube_utils::anytodatetime($exception'_instance', $old'start'->getTimezone());
-                            if (is_a($recurrence_id, 'DateTime')) {
-                                $recurrence_id->add($date_shift);
-                                $exception'_instance' = $recurrence_id->format($recurrence_id_format);
-                                $this->_update_event($exception, false);
+                        $new_start_date = $event'start'->format('Y-m-d');
+                        $new_start_time = $event'allday' ? '' : $event'start'->format('H:i');
+                        $new_duration   = $event'end'->format('U') - $event'start'->format('U');
+
+                        $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
+                        $date_shift = $old'start'->diff($event'start');
+
+                        // shifted or resized
+                        if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
+                            $event'start' = $master'start'->add($old'start'->diff($event'start'));
+                            $event'end'   = clone $event'start';
+                            $event'end'->add(new DateInterval('PT' . $new_duration . 'S'));
+                        }
+                        // dates did not change, use the ones from master
+                        elseif ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
+                            $event'start' = $master'start';
+                            $event'end'   = $master'end';
+                        }
+
+                        // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
+                        if (is_array($event'recurrence')
+                            && ($old_start_date != $new_start_date || $old_start_time != $new_start_time)
+                            && ($exceptions = $this->_load_exceptions($old))
+                        ) {
+                            $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+
+                            foreach ($exceptions as $exception) {
+                                $recurrence_id = rcube_utils::anytodatetime($exception'_instance', $old'start'->getTimezone());
+                                if (is_a($recurrence_id, 'DateTime')) {
+                                    $recurrence_id->add($date_shift);
+                                    $exception'_instance' = $recurrence_id->format($recurrence_id_format);
+                                    $this->_update_event($exception, false);
+                                }
                             }
                         }
-                    }
 
-                    $ret = $event'id';  // return master ID
-                    break;
+                        $ret = $event'id';  // return master ID
+                        break;
                 }
             }
 
             $success = $this->_update_event($event, $update_recurring);
 
-            if ($success && $update_master) {
+            if ($success && $update_master && !empty($master)) {
                 $this->_update_event($master, true);
             }
 
@@ -515,11 +517,11 @@
     /**
      * Extended event editing with possible changes to the argument
      *
-     * @param array  Hash array with event properties
-     * @param string New participant status
-     * @param array  List of hash arrays with updated attendees
+     * @param array  $event     Hash array with event properties
+     * @param string $status    New participant status
+     * @param array  $attendees List of hash arrays with updated attendees
      *
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      */
     public function edit_rsvp(&$event, $status, $attendees)
     {
@@ -527,17 +529,16 @@
 
         // apply changes to master (and all exceptions)
         if ($event'_savemode' == 'all' && $event'recurrence_id') {
-            $update_event = $this->get_event(array('id' => $event'recurrence_id'));
+            $update_event = $this->get_event('id' => $event'recurrence_id');
             $update_event'_savemode' = $event'_savemode';
             calendar::merge_attendee_data($update_event, $attendees);
         }
 
         if ($ret = $this->update_attendees($update_event, $attendees)) {
             // replace $event with effectively updated event (for iTip reply)
-            if ($ret !== true && $ret != $update_event'id' && ($new_event = $this->get_event(array('id' => $ret)))) {
+            if ($ret !== true && $ret != $update_event'id' && ($new_event = $this->get_event('id' => $ret))) {
                 $event = $new_event;
-            }
-            else {
+            } else {
                 $event = $update_event;
             }
         }
@@ -552,7 +553,7 @@
      */
     public function update_attendees(&$event, $attendees)
     {
-        $success = $this->edit_event($event, true);
+        $success = $this->edit_event($event);
 
         // apply attendee updates to recurrence exceptions too
         if ($success && $event'_savemode' == 'all'
@@ -583,8 +584,8 @@
 
         // iterate through the list of properties considered 'significant' for scheduling
         foreach (self::$scheduling_properties as $prop) {
-            $a = isset($old$prop) ? $old$prop : null;
-            $b = isset($event$prop) ? $event$prop : null;
+            $a = $old$prop ?? null;
+            $b = $event$prop ?? null;
 
             if (!empty($event'allday') && ($prop == 'start' || $prop == 'end')
                 && $a instanceof DateTimeInterface
@@ -602,8 +603,7 @@
                 // advanced rrule comparison: no rescheduling if series was shortened
                 if (!empty($a'COUNT') && !empty($b'COUNT') && $b'COUNT' < $a'COUNT') {
                     unset($a'COUNT', $b'COUNT');
-                }
-                else if (!empty($a'UNTIL') && !empty($b'UNTIL') && $b'UNTIL' < $a'UNTIL') {
+                } elseif (!empty($a'UNTIL') && !empty($b'UNTIL') && $b'UNTIL' < $a'UNTIL') {
                     unset($a'UNTIL', $b'UNTIL');
                 }
             }
@@ -623,8 +623,7 @@
             foreach ($attendees as $i => $attendee) {
                 if ($attendee'role' == 'ORGANIZER' && $attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
                     $is_organizer = true;
-                }
-                else if ($attendee'role' != 'ORGANIZER'
+                } elseif ($attendee'role' != 'ORGANIZER'
                     && $attendee'role' != 'NON-PARTICIPANT'
                     && $attendee'status' != 'DELEGATED'
                 ) {
@@ -662,8 +661,8 @@
         $free_busy   = isset($event'free_busy') ? strtolower($event'free_busy') : '';
 
         $event'_recurrence' = rtrim($rrule, ';');
-        $event'free_busy'   = isset($this->free_busy_map$free_busy) ? $this->free_busy_map$free_busy : null;
-        $event'sensitivity' = isset($this->sensitivity_map$sensitivity) ? $this->sensitivity_map$sensitivity : 0;
+        $event'free_busy'   = $this->free_busy_map$free_busy ?? null;
+        $event'sensitivity' = $this->sensitivity_map$sensitivity ?? 0;
         $event'all_day'     = !empty($event'allday') ? 1 : 0;
 
         if ($event'free_busy' == 'tentative') {
@@ -680,8 +679,7 @@
         // process event attendees
         if (!empty($event'attendees')) {
             $event'attendees' = json_encode((array)$event'attendees');
-        }
-        else {
+        } else {
             $event'attendees' = '';
         }
 
@@ -705,24 +703,23 @@
     /**
      * Save the given event record to database
      *
-     * @param array Event data
-     * @param boolean True if recurring events instances should be updated, too
+     * @param array $event            Event data
+     * @param bool  $update_recurring True if recurring events instances should be updated, too
      */
     private function _update_event($event, $update_recurring = true)
     {
         $event    = $this->_save_preprocess($event);
-        $sql_args = array();
-        $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'isexception', 'sequence',
+        $sql_args = ;
+        $set_cols = 'start', 'end', 'all_day', 'recurrence_id', 'isexception', 'sequence',
             'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority',
-            'sensitivity', 'status', 'attendees', 'alarms', 'notifyat'
-        );
+            'sensitivity', 'status', 'attendees', 'alarms', 'notifyat',
+        ;
 
         foreach ($set_cols as $col) {
             if (!empty($event$col) && is_a($event$col, 'DateTime')) {
                 $sql_args$col = $event$col->format(self::DB_DATE_FORMAT);
-            }
-            else if (array_key_exists($col, $event)) {
-                $sql_args$col = is_array($event$col) ? join(',', $event$col) : $event$col;
+            } elseif (array_key_exists($col, $event)) {
+                $sql_args$col = is_array($event$col) ? implode(',', $event$col) : $event$col;
             }
         }
 
@@ -790,7 +787,7 @@
         }
 
         if (!empty($event'recurrence')) {
-            $exdata     = array();
+            $exdata     = ;
             $exceptions = $this->_load_exceptions($event);
 
             foreach ($exceptions as $exception) {
@@ -828,12 +825,12 @@
                 $next_end = clone $next_start;
                 $next_end->add($duration);
 
-                $notify_at = $this->_get_notification(array(
+                $notify_at = $this->_get_notification(
                         'alarms' => !empty($event'alarms') ? $event'alarms' : null,
                         'start'  => $next_start,
                         'end'    => $next_end,
-                        'status' => $event'status'
-                ));
+                        'status' => $event'status',
+                );
 
                 $now   = $this->rc->db->now();
                 $query = $this->rc->db->query(
@@ -895,7 +892,7 @@
             $instance_id
         );
 
-        $exceptions = array();
+        $exceptions = ;
         while (($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr'event_id') {
             $exception = $this->_read_postprocess($sql_arr);
             $instance  = $exception'_instance' ?: $exception'start'->format($exception'allday' ? 'Ymd' : 'Ymd\THis');
@@ -908,7 +905,7 @@
     /**
      * Move a single event
      *
-     * @param array Hash array with event properties
+     * @param array $event Hash array with event properties
      * @see calendar_driver::move_event()
      */
     public function move_event($event)
@@ -920,7 +917,7 @@
     /**
      * Resize a single event
      *
-     * @param array Hash array with event properties
+     * @param array $event Hash array with event properties
      * @see calendar_driver::resize_event()
      */
     public function resize_event($event)
@@ -932,8 +929,8 @@
     /**
      * Remove a single event from the database
      *
-     * @param array   Hash array with event properties
-     * @param boolean Remove record irreversible (@TODO)
+     * @param array $event Hash array with event properties
+     * @param bool  $force Remove record irreversible (@TODO)
      *
      * @see calendar_driver::remove_event()
      */
@@ -948,56 +945,57 @@
 
             // read master if deleting a recurring event
             if ($event'recurrence' || $event'recurrence_id') {
-                $master   = $event'recurrence_id' ? $this->get_event(array('id' => $event'recurrence_id')) : $event;
+                $master   = $event'recurrence_id' ? $this->get_event('id' => $event'recurrence_id') : $event;
                 $savemode = $event'_savemode';
             }
 
             switch ($savemode) {
-            case 'current':
-                // add exception to master event
-                $master'recurrence''EXDATE' = $event'start';
-                $update_master = true;
+                case 'current':
+                    // add exception to master event
+                    $master'recurrence''EXDATE' = $event'start';
+                    $update_master = true;
 
-                // just delete this single occurence
-                $query = $this->rc->db->query(
-                    "DELETE FROM `{$this->db_events}`"
-                    . " WHERE `calendar_id` IN ({$this->calendar_ids}) AND `event_id` = ?",
-                    $event'id'
-                );
-                break;
+                    // just delete this single occurence
+                    $query = $this->rc->db->query(
+                        "DELETE FROM `{$this->db_events}`"
+                        . " WHERE `calendar_id` IN ({$this->calendar_ids}) AND `event_id` = ?",
+                        $event'id'
+                    );
+                    break;
 
-            case 'future':
-                if ($master'id' != $event'id') {
-                    // set until-date on master event
-                    $master'recurrence''UNTIL' = clone $event'start';
-                    $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
-                    unset($master'recurrence''COUNT');
-                    $update_master = true;
+                case 'future':
+                    if ($master'id' != $event'id') {
+                        // set until-date on master event
+                        $master'recurrence''UNTIL' = clone $event'start';
+                        $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
+                        unset($master'recurrence''COUNT');
+                        $update_master = true;
+
+                        // delete this and all future instances
+                        $fromdate = clone $event'start';
+                        $fromdate->setTimezone($this->server_timezone);
 
-                    // delete this and all future instances
-                    $fromdate = clone $event'start';
-                    $fromdate->setTimezone($this->server_timezone);
+                        $query = $this->rc->db->query(
+                            "DELETE FROM `{$this->db_events}`"
+                            . " WHERE `calendar_id` IN ({$this->calendar_ids}) AND `start` >= ? AND `recurrence_id` = ?",
+                            $fromdate->format(self::DB_DATE_FORMAT),
+                            $master'id'
+                        );
 
+                        $ret = $master'id';
+                        break;
+                    }
+                    // else: future == all if modifying the master event
+
+                    // no break
+                default:  // 'all' is default
                     $query = $this->rc->db->query(
                         "DELETE FROM `{$this->db_events}`"
-                        . " WHERE `calendar_id` IN ({$this->calendar_ids}) AND `start` >= ? AND `recurrence_id` = ?",
-                        $fromdate->format(self::DB_DATE_FORMAT),
+                        . " WHERE (`event_id` = ? OR `recurrence_id` = ?) AND `calendar_id` IN ({$this->calendar_ids})",
+                        $master'id',
                         $master'id'
                     );
-
-                    $ret = $master'id';
                     break;
-                }
-                // else: future == all if modifying the master event
-
-            default:  // 'all' is default
-                $query = $this->rc->db->query(
-                    "DELETE FROM `{$this->db_events}`"
-                    . " WHERE (`event_id` = ? OR `recurrence_id` = ?) AND `calendar_id` IN ({$this->calendar_ids})",
-                    $master'id',
-                    $master'id'
-                );
-                break;
             }
 
             $success = $this->rc->db->affected_rows($query);
@@ -1015,11 +1013,11 @@
     /**
      * Return data of a specific event
      *
-     * @param mixed   Hash array with event properties or event UID
-     * @param integer Bitmask defining the scope to search events in
-     * @param boolean If true, recurrence exceptions shall be added
+     * @param mixed $event Hash array with event properties or event UID
+     * @param int   $scope Bitmask defining the scope to search events in
+     * @param bool  $full  If true, recurrence exceptions shall be added
      *
-     * @return array Hash array with event properties
+     * @return ?array Hash array with event properties
      */
     public function get_event($event, $scope = 0, $full = false)
     {
@@ -1048,9 +1046,8 @@
                     $calendars = $idx;
                 }
             }
-            $cals = join(',', $calendars);
-        }
-        else {
+            $cals = implode(',', $calendars);
+        } else {
             $cals = $this->calendar_ids;
         }
 
@@ -1075,7 +1072,7 @@
             return $this->cache$id;
         }
 
-        return false;
+        return null;
     }
 
     /**
@@ -1083,26 +1080,25 @@
      *
      * @see calendar_driver::load_events()
      */
-    public function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null)
+    public function load_events($start, $end, $query = null, $calendars = null, $virtual = true, $modifiedsince = null)
     {
         if (empty($calendars)) {
             $calendars = array_keys($this->calendars);
-        }
-        else if (!is_array($calendars)) {
+        } elseif (!is_array($calendars)) {
             $calendars = explode(',', strval($calendars));
         }
 
         // only allow to select from calendars of this use
-        $calendar_ids = array_map(array($this->rc->db, 'quote'), array_intersect($calendars, array_keys($this->calendars)));
+        $calendar_ids = array_map($this->rc->db, 'quote', array_intersect($calendars, array_keys($this->calendars)));
 
         // compose (slow) SQL query for searching
         // FIXME: improve searching using a dedicated col and normalized values
         $sql_add = '';
         if ($query) {
-            foreach (array('title','location','description','categories','attendees') as $col) {
-                $sql_query = $this->rc->db->ilike($col, '%'.$query.'%');
+            foreach ('title','location','description','categories','attendees' as $col) {
+                $sql_query = $this->rc->db->ilike($col, '%' . $query . '%');
             }
-            $sql_add .= " AND (" . join(' OR ', $sql_query) . ")";
+            $sql_add .= " AND (" . implode(' OR ', $sql_query) . ")";
         }
 
         if (!$virtual) {
@@ -1113,13 +1109,13 @@
             $sql_add .= " AND e.changed >= " . $this->rc->db->quote(date('Y-m-d H:i:s', $modifiedsince));
         }
 
-        $events = array();
+        $events = ;
         if (!empty($calendar_ids)) {
             $result = $this->rc->db->query(
                 "SELECT e.*, (SELECT COUNT(`attachment_id`) FROM `{$this->db_attachments}`"
                     . " WHERE `event_id` = e.event_id OR `event_id` = e.recurrence_id) AS _attachments"
                 . " FROM `{$this->db_events}` e"
-                . " WHERE e.calendar_id IN (" . join(',', $calendar_ids) . ")"
+                . " WHERE e.calendar_id IN (" . implode(',', $calendar_ids) . ")"
                     . " AND e.start <= " . $this->rc->db->fromunixtime($end)
                     . " AND e.end >= " . $this->rc->db->fromunixtime($start)
                     . $sql_add
@@ -1163,16 +1159,16 @@
     /**
      * Get number of events in the given calendar
      *
-     * @param  mixed   List of calendar IDs to count events (either as array or comma-separated string)
-     * @param  integer Date range start (unix timestamp)
-     * @param  integer Date range end (unix timestamp)
+     * @param mixed $calendars List of calendar IDs to count events (either as array or comma-separated string)
+     * @param int   $start     Date range start (unix timestamp)
+     * @param ?int  $end       Date range end (unix timestamp)
      *
-     * @return array   Hash array with counts grouped by calendar ID
+     * @return array Hash array with counts grouped by calendar ID
      */
     public function count_events($calendars, $start, $end = null)
     {
         // not implemented
-        return array();
+        return ;
     }
 
     /**
@@ -1197,18 +1193,15 @@
 
         // parse recurrence rule
         if ($event'recurrence' && preg_match_all('/(A-Z+)=(^;+);?/', $event'recurrence', $m, PREG_SET_ORDER)) {
-            $event'recurrence' = array();
+            $event'recurrence' = ;
             foreach ($m as $rr) {
                 if (is_numeric($rr2)) {
                     $rr2 = intval($rr2);
-                }
-                else if ($rr1 == 'UNTIL') {
+                } elseif ($rr1 == 'UNTIL') {
                     $rr2 = date_create($rr2);
-                }
-                else if ($rr1 == 'RDATE') {
+                } elseif ($rr1 == 'RDATE') {
                     $rr2 = array_map('date_create', explode(',', $rr2));
-                }
-                else if ($rr1 == 'EXDATE') {
+                } elseif ($rr1 == 'EXDATE') {
                     $rr2 = array_map('date_create', explode(',', $rr2));
                 }
 
@@ -1235,9 +1228,8 @@
         // decode serialized event attendees
         if (strlen($event'attendees')) {
             $event'attendees' = $this->unserialize_attendees($event'attendees');
-        }
-        else {
-            $event'attendees' = array();
+        } else {
+            $event'attendees' = ;
         }
 
         // decode serialized alarms
@@ -1259,27 +1251,26 @@
     {
         if (empty($calendars)) {
             $calendars = array_keys($this->calendars);
-        }
-        else if (!is_array($calendars)) {
+        } elseif (!is_array($calendars)) {
             $calendars = explode(',', (array) $calendars);
         }
 
         // only allow to select from calendars with activated alarms
-        $calendar_ids = array();
+        $calendar_ids = ;
         foreach ($calendars as $cid) {
             if ($this->calendars$cid && $this->calendars$cid'showalarms') {
                 $calendar_ids = $cid;
             }
         }
 
-        $calendar_ids = array_map(array($this->rc->db, 'quote'), $calendar_ids);
-        $alarms       = array();
+        $calendar_ids = array_map($this->rc->db, 'quote', $calendar_ids);
+        $alarms       = ;
 
         if (!empty($calendar_ids)) {
             $stime  = $this->rc->db->fromunixtime($time);
             $result = $this->rc->db->query(
                 "SELECT * FROM `{$this->db_events}`"
-                . " WHERE `calendar_id` IN (" . join(',', $calendar_ids) . ")"
+                . " WHERE `calendar_id` IN (" . implode(',', $calendar_ids) . ")"
                 . " AND `notifyat` <= $stime AND `end` > $stime"
             );
 
@@ -1319,11 +1310,9 @@
     {
         if (isset($attachment'data')) {
             $data = $attachment'data';
-        }
-        else if (!empty($attachment'path')) {
+        } elseif (!empty($attachment'path')) {
             $data = file_get_contents($attachment'path');
-        }
-        else {
+        } else {
             return false;
         }
 
@@ -1363,7 +1352,7 @@
      */
     public function list_attachments($event)
     {
-        $attachments = array();
+        $attachments = ;
 
         if (!empty($this->calendar_ids)) {
             $result = $this->rc->db->query(
@@ -1404,6 +1393,8 @@
                 return $arr;
             }
         }
+
+        return false;
     }
 
     /**
@@ -1425,6 +1416,8 @@
                 return base64_decode($arr'data');
             }
         }
+
+        return '';
     }
 
     /**
@@ -1482,22 +1475,21 @@
                 if ($alarm'trigger'0 == '@') {
                     try {
                         $valarms$i'trigger' = new DateTime(substr($alarm'trigger', 1));
-                    }
-                    catch (Exception $e) {
+                    } catch (Exception $e) {
                         unset($valarms$i);
                     }
                 }
             }
         }
         // convert legacy alarms data
-        else if (strlen($alarms)) {
-            list($trigger, $action) = explode(':', $alarms, 2);
+        elseif (strlen($alarms)) {
+            $trigger, $action = explode(':', $alarms, 2);
             if ($trigger = libcalendaring::parse_alarm_value($trigger)) {
-                $valarms = array(array('action' => $action, 'trigger' => $trigger3 ?: $trigger0));
+                $valarms = 'action' => $action, 'trigger' => $trigger3 ?: $trigger0;
             }
         }
 
-        return $valarms;
+        return $valarms ?? ;
     }
 
     /**
@@ -1505,7 +1497,7 @@
      */
     private function unserialize_attendees($s_attendees)
     {
-        $attendees = array();
+        $attendees = ;
 
         // decode json serialized string
         if ($s_attendees0 == '') {
@@ -1514,9 +1506,9 @@
         // decode the old serialization format
         else {
             foreach (explode("\n", $s_attendees) as $line) {
-                $att = array();
+                $att = ;
                 foreach (rcube_utils::explode_quoted_string(';', $line) as $prop) {
-                    list($key, $value) = explode("=", $prop);
+                    $key, $value = explode("=", $prop);
                     $attstrtolower($key) = stripslashes(trim($value, '""'));
                 }
                 $attendees = $att;

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

@@ -45,8 +45,8 @@
     /**
      * Factory method to instantiate a kolab_calendar object
      *
-     * @param string  Calendar ID (encoded IMAP folder name)
-     * @param object  Calendar plugin object
+     * @param string   $id       Calendar ID (encoded IMAP folder name)
+     * @param calendar $calendar Calendar plugin object
      *
      * @return kolab_calendar Self instance
      */
@@ -54,7 +54,7 @@
     {
         $imap = $calendar->rc->get_storage();
         $imap_folder = kolab_storage::id_decode($id);
-        $info = $imap->folder_info($imap_folder, true);
+        $info = $imap->folder_info($imap_folder);
 
         if (
             empty($info)
@@ -90,13 +90,13 @@
                 $this->editable = true;
                 $this->rights = 'lrswikxteav';
                 $this->alarms = true;
-            }
-            else {
+            } else {
                 $rights = $this->storage->get_myrights();
                 if ($rights && !PEAR::isError($rights)) {
                     $this->rights = $rights;
                     if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
-                        $this->editable = strpos($rights, 'i');;
+                        $this->editable = strpos($rights, 'i');
+                        ;
                     }
                 }
             }
@@ -105,8 +105,7 @@
             $prefs = $this->cal->rc->config->get('kolab_calendars', );
             if (isset($prefs$this->id'showalarms')) {
                 $this->alarms = $prefs$this->id'showalarms';
-            }
-            else if (isset($prefs$old_id'showalarms')) {
+            } elseif (isset($prefs$old_id'showalarms')) {
                 $this->alarms = $prefs$old_id'showalarms';
             }
         }
@@ -210,16 +209,15 @@
                 $master = $this->_to_driver_event($record);
             }
 
-            if ($master) {
+            if (!empty($master)) {
                 // check for match in top-level exceptions (aka loose single occurrences)
                 if (!empty($master'_formatobj') && ($instance = $master'_formatobj'->get_instance($instance_id))) {
                     $this->events$id = $this->_to_driver_event($instance, false, true, $master);
                 }
                 // check for match on the first instance already
-                else if (!empty($master'_instance') && $master'_instance' == $instance_id) {
+                elseif (!empty($master'_instance') && $master'_instance' == $instance_id) {
                     $this->events$id = $master;
-                }
-                else if (!empty($master'recurrence')) {
+                } elseif (!empty($master'recurrence')) {
                     $start_date = $master'start';
                     // For performance reasons we'll get only the specific instance
                     if (($date = substr($id, strlen($master_id) + 1, 8)) && strlen($date) == 8 && is_numeric($date)) {
@@ -258,30 +256,28 @@
     }
 
     /**
-     * @param  int    Event's new start (unix timestamp)
-     * @param  int    Event's new end (unix timestamp)
-     * @param  string Search query (optional)
-     * @param  bool   Include virtual events (optional)
-     * @param  array  Additional parameters to query storage
-     * @param  array  Additional query to filter events
+     * @param int    $start        Event's new start (unix timestamp)
+     * @param int    $end          Event's new end (unix timestamp)
+     * @param string $search       Search query (optional)
+     * @param bool   $virtual      Include virtual events (optional)
+     * @param array  $query        Additional parameters to query storage
+     * @param array  $filter_query Additional query to filter events
      *
      * @return array A list of event records
      */
-    public function list_events($start, $end, $search = null, $virtual = 1, $query = , $filter_query = null)
+    public function list_events($start, $end, $search = null, $virtual = true, $query = , $filter_query = null)
     {
         // convert to DateTime for comparisons
         // #5190: make the range a little bit wider
         // to workaround possible timezone differences
         try {
             $start = new DateTime('@' . ($start - 12 * 3600));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $start = new DateTime('@0');
         }
         try {
             $end = new DateTime('@' . ($end + 12 * 3600));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $end = new DateTime('today +10 years');
         }
 
@@ -373,7 +369,7 @@
                 $events = array_merge($events, $this->get_recurring_events($record, $start, $end));
             }
             // add top-level exceptions (aka loose single occurrences)
-            else if (!empty($record'exceptions')) {
+            elseif (!empty($record'exceptions')) {
                 foreach ($record'exceptions' as $ex) {
                     $component = $this->_to_driver_event($ex, false, false, $record);
                     if ($component'start' <= $end && $component'end' >= $start) {
@@ -385,7 +381,7 @@
 
         // post-filter all events by fulltext search and partstat values
         $me = $this;
-        $events = array_filter($events, function($event) use ($words, $partstat_exclude, $user_emails, $me) {
+        $events = array_filter($events, function ($event) use ($words, $partstat_exclude, $user_emails, $me) {
             // fulltext search
             if (count($words)) {
                 $hits = 0;
@@ -425,9 +421,9 @@
     /**
      * Get number of events in the given calendar
      *
-     * @param int   Date range start (unix timestamp)
-     * @param int   Date range end (unix timestamp)
-     * @param array Additional query to filter events
+     * @param int   $start        Date range start (unix timestamp)
+     * @param int   $end          Date range end (unix timestamp)
+     * @param array $filter_query Additional query to filter events
      *
      * @return int Count
      */
@@ -435,16 +431,14 @@
     {
         // convert to DateTime for comparisons
         try {
-            $start = new DateTime('@'.$start);
-        }
-        catch (Exception $e) {
+            $start = new DateTime('@' . $start);
+        } catch (Exception $e) {
             $start = new DateTime('@0');
         }
         if ($end) {
             try {
-                $end = new DateTime('@'.$end);
-            }
-            catch (Exception $e) {
+                $end = new DateTime('@' . $end);
+            } catch (Exception $e) {
                 $end = null;
             }
         }
@@ -462,8 +456,7 @@
                 $query = 'tags', '!=', 'x-partstat:' . $email . ':needs-action';
                 $query = 'tags', '!=', 'x-partstat:' . $email . ':declined';
             }
-        }
-        else if (is_array($filter_query)) {
+        } elseif (is_array($filter_query)) {
             $query = array_merge($query, $filter_query);
         }
 
@@ -493,15 +486,16 @@
         $saved  = $this->storage->save($object, 'event');
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving event object to Kolab server"
+                    'message' => "Error saving event object to Kolab server",
                 ,
-                true, false
+                true,
+                false
             );
             $saved = false;
-        }
-        else {
+        } else {
             // save links in configuration.relation object
             if ($this->save_links($event'uid', $links)) {
                 $object'links' = $links;
@@ -542,14 +536,15 @@
         $saved  = $this->storage->save($object, 'event', $old'uid');
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving event object to Kolab server"
+                    'message' => "Error saving event object to Kolab server",
                 ,
-                true, false
+                true,
+                false
             );
-        }
-        else {
+        } else {
             // save links in configuration.relation object
             if ($this->save_links($event'uid', $links)) {
                 $object'links' = $links;
@@ -579,11 +574,13 @@
         $deleted = $this->storage->delete(!empty($event'uid') ? $event'uid' : $event'id', $force);
 
         if (!$deleted) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => sprintf("Error deleting event object '%s' from Kolab server", $event'id')
+                    'message' => sprintf("Error deleting event object '%s' from Kolab server", $event'id'),
                 ,
-                true, false
+                true,
+                false
             );
         }
 
@@ -606,11 +603,13 @@
             return true;
         }
 
-        rcube::raise_error(
+        rcube::raise_error(
+            
                 'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                'message' => sprintf("Error undeleting the event object '%s' from the Kolab server", $event'id')
+                'message' => sprintf("Error undeleting the event object '%s' from the Kolab server", $event'id'),
             ,
-            true, false
+            true,
+            false
         );
 
         return false;
@@ -650,8 +649,7 @@
         if (empty($event'_formatobj')) {
             $rec    = $this->storage->get_object(!empty($event'uid') ? $event'uid' : $event'id');
             $object = $rec'_formatobj';
-        }
-        else {
+        } else {
             $object = $event'_formatobj';
         }
 
@@ -670,6 +668,7 @@
         $exdata = ;
         $futuredata = ;
         $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+        $recurrence_rule = null;
 
         if (!empty($event'recurrence')) {
             // copy the recurrence rule from the master event (to be used in the UI)
@@ -777,8 +776,7 @@
                 if ($limit && count($events) >= $limit) {
                     return $events;
                 }
-            }
-            else if ($next_event'start' > $end) {
+            } elseif ($next_event'start' > $end) {
                 // stop loop if out of range
                 break;
             }
@@ -824,14 +822,13 @@
         $recurrence_id_format = libcalendaring::recurrence_id_format($master_event ? $master_event : $record);
         if (!$noinst && !empty($record'recurrence') && empty($record'recurrence_id') && empty($record'_instance')) {
             $record'_instance' = $record'start'->format($recurrence_id_format);
-        }
-        else if (isset($record'recurrence_date') && $record'recurrence_date' instanceof DateTimeInterface) {
+        } elseif (isset($record'recurrence_date') && $record'recurrence_date' instanceof DateTimeInterface) {
             $record'_instance' = $record'recurrence_date'->format($recurrence_id_format);
         }
 
         // clean up exception data
         if (!empty($record'recurrence') && !empty($record'recurrence''EXCEPTIONS')) {
-            array_walk($record'recurrence''EXCEPTIONS', function(&$exception) {
+            array_walk($record'recurrence''EXCEPTIONS', function (&$exception) {
                 unset($exception'_mailbox', $exception'_msguid', $exception'_formatobj', $exception'_attachments');
             });
         }
@@ -882,7 +879,7 @@
         }
 
         // remove some internal properties which should not be cached
-        $cleanup_fn = function(&$event) {
+        $cleanup_fn = function (&$event) {
             unset($event'_savemode', $event'_fromcalendar', $event'_identity', $event'_folder_id',
                 $event'calendar', $event'className', $event'recurrence_id',
                 $event'attachments', $event'deleted_attachments');
@@ -892,7 +889,7 @@
 
         // clean up exception data
         if (!empty($event'exceptions')) {
-            array_walk($event'exceptions', function(&$exception) use ($cleanup_fn) {
+            array_walk($event'exceptions', function (&$exception) use ($cleanup_fn) {
                 unset($exception'_mailbox', $exception'_msguid', $exception'_formatobj');
                 $cleanup_fn($exception);
             });
@@ -945,15 +942,13 @@
         $out = '';
         if (is_array($prop)) {
             foreach ($prop as $key => $val) {
-                if (is_numeric($key)) {
+                if (is_numeric($key) || is_array($val)) {
                     $out .= self::_complex2string($val);
-                }
-                else if (!in_array($key, $ignorekeys)) {
+                } elseif (!in_array($key, $ignorekeys)) {
                     $out .= $val . ' ';
                 }
             }
-        }
-        else if (is_string($prop) || is_numeric($prop)) {
+        } elseif (is_string($prop) || is_numeric($prop)) {
             $out .= $prop . ' ';
         }

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -25,8 +25,8 @@
 
 class kolab_driver extends calendar_driver
 {
-    const INVITATIONS_CALENDAR_PENDING  = '--invitation--pending';
-    const INVITATIONS_CALENDAR_DECLINED = '--invitation--declined';
+    public const INVITATIONS_CALENDAR_PENDING  = '--invitation--pending';
+    public const INVITATIONS_CALENDAR_DECLINED = '--invitation--declined';
 
     // features this backend supports
     public $alarms              = true;
@@ -44,6 +44,7 @@
     protected $has_writeable    = false;
     protected $freebusy_trigger = false;
     protected $bonnie_api       = false;
+    protected $search_more_results = false;
 
     /**
      * Default constructor
@@ -114,6 +115,8 @@
 
     /**
      * Convert kolab_storage_folder into kolab_calendar
+     *
+     * @return kolab_calendar
      */
     protected function _to_calendar($folder)
     {
@@ -124,8 +127,7 @@
         if ($folder instanceof kolab_storage_folder_user) {
             $calendar = new kolab_user_calendar($folder, $this->cal);
             $calendar->subscriptions = count($folder->children) > 0;
-        }
-        else {
+        } else {
             $calendar = new kolab_calendar($folder->name, $this->cal);
         }
 
@@ -135,8 +137,8 @@
     /**
      * Get a list of available calendars from this source
      *
-     * @param int    $filter Bitmask defining filter criterias
-     * @param object $tree   Reference to hierarchical folder tree object
+     * @param int                           $filter Bitmask defining filter criterias
+     * @param ?kolab_storage_folder_virtual $tree   Reference to hierarchical folder tree object
      *
      * @return array List of calendars
      */
@@ -169,9 +171,8 @@
             // find parent
             do {
                 array_pop($imap_path);
-                $parent_id = $this->storage->folder_id(join($delim, $imap_path));
-            }
-            while (count($imap_path) > 1 && !in_array($parent_id, $parents));
+                $parent_id = $this->storage->folder_id(implode($delim, $imap_path));
+            } while (count($imap_path) > 1 && !in_array($parent_id, $parents));
 
             // restore "real" parent ID
             if ($parent_id && !in_array($parent_id, $parents)) {
@@ -180,7 +181,7 @@
 
             $parents = $cal->id;
 
-            if (!empty($cal->virtual)) {
+            if ($cal instanceof kolab_storage_folder_virtual) {
                 $calendars$cal->id = 
                     'id'       => $cal->id,
                     'name'     => $cal->get_name(),
@@ -190,8 +191,7 @@
                     'editable' => false,
                     'group'    => $cal->get_namespace(),
                 ;
-            }
-            else {
+            } else {
                 // additional folders may come from kolab_storage::folder_hierarchy() above
                 // make sure we deal with kolab_calendar instances
                 $cal = $this->_to_calendar($cal);
@@ -227,7 +227,7 @@
                 }
             }
 
-            if ($cal->subscriptions) {
+            if (!empty($cal->subscriptions)) {
                 $calendars$cal->id'subscribed' = $cal->is_subscribed();
             }
         }
@@ -292,9 +292,9 @@
     /**
      * Get list of calendars according to specified filters
      *
-     * @param int Bitmask defining restrictions. See FILTER_* constants for possible values.
+     * @param int $filter Bitmask defining restrictions. See FILTER_* constants for possible values.
      *
-     * @return array List of calendars
+     * @return array<kolab_calendar> List of calendars
      */
     protected function filter_calendars($filter)
     {
@@ -350,9 +350,9 @@
     /**
      * Get the kolab_calendar instance for the given calendar ID
      *
-     * @param string Calendar identifier (encoded imap folder name)
+     * @param string $id Calendar identifier (encoded imap folder name)
      *
-     * @return kolab_calendar Object nor null if calendar doesn't exist
+     * @return kolab_calendar|kolab_invitation_calendar|null Object nor null if calendar doesn't exist
      */
     public function get_calendar($id)
     {
@@ -379,7 +379,7 @@
     /**
      * Create a new calendar assigned to the current user
      *
-     * @param array Hash array with calendar properties
+     * @param array $prop Hash array with calendar properties
      *    name: Calendar name
      *   color: The color of the calendar
      *
@@ -428,8 +428,7 @@
     {
         if (!empty($prop'id') && ($cal = $this->get_calendar($prop'id'))) {
             $id = $cal->update($prop);
-        }
-        else {
+        } else {
             $id = $prop'id';
         }
 
@@ -443,8 +442,7 @@
 
         if (isset($prop'showalarms') && $id == self::BIRTHDAY_CALENDAR_ID) {
             $prefs'calendar_birthdays_alarm_type' = $prop'showalarms' ? $this->alarm_types0 : '';
-        }
-        else if (isset($prop'showalarms')) {
+        } elseif (isset($prop'showalarms')) {
             $prefs'kolab_calendars'$id'showalarms' = !empty($prop'showalarms');
         }
 
@@ -477,8 +475,7 @@
                     if (isset($prop'permanent')) {
                         if ($prop'permanent') {
                             $this->storage->folder_subscribe($subfolder);
-                        }
-                        else {
+                        } else {
                             $this->storage->folder_unsubscribe($subfolder);
                         }
                     }
@@ -486,24 +483,21 @@
                     if (isset($prop'active')) {
                         if ($prop'active') {
                             $this->storage->folder_activate($subfolder);
-                        }
-                        else {
+                        } else {
                             $this->storage->folder_deactivate($subfolder);
                         }
                     }
                 }
             }
+
             return $ret;
         }
-        else {
-            // save state in local prefs
-            $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
-            $prefs'kolab_calendars'$prop'id''active' = !empty($prop'active');
-            $this->rc->user->save_prefs($prefs);
-            return true;
-        }
 
-        return false;
+        // save state in local prefs
+        $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+        $prefs'kolab_calendars'$prop'id''active' = !empty($prop'active');
+        $this->rc->user->save_prefs($prefs);
+        return true;
     }
 
     /**
@@ -524,8 +518,7 @@
 
                 $this->rc->user->save_prefs($prefs);
                 return true;
-            }
-            else {
+            } else {
                 $this->last_error = $this->storage->last_error;
             }
         }
@@ -536,8 +529,8 @@
     /**
      * Search for shared or otherwise not listed calendars the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
      *
      * @return array List of calendars
      */
@@ -558,9 +551,10 @@
             }
         }
         // find other user's virtual calendars
-        else if ($source == 'users') {
+        elseif ($source == 'users') {
             // we have slightly more space, so display twice the number
             $limit = $this->rc->config->get('autocomplete_max', 15) * 2;
+            $count = 0;
 
             foreach ($this->storage->search_users($query, 0, , $limit, $count) as $user) {
                 $calendar = new kolab_user_calendar($user, $this->cal);
@@ -590,7 +584,7 @@
      * Fetch a single event
      *
      * @see calendar_driver::get_event()
-     * @return array Hash array with event properties, false if not found
+     * @return ?array Hash array with event properties, false if not found
      */
     public function get_event($event, $scope = 0, $full = false)
     {
@@ -602,8 +596,7 @@
             if (empty($event'id') && !empty($event'_instance')) {
                 $id .= '-' . $event'_instance';
             }
-        }
-        else {
+        } else {
             $id = $event;
         }
 
@@ -627,7 +620,7 @@
             }
         }
 
-        return false;
+        return null;
     }
 
     /**
@@ -654,8 +647,7 @@
             if (!empty($event'recurrence_date') && ($master = $storage->get_event($event'uid'))) {
                 self::add_exception($master, $event);
                 $success = $storage->update_event($master);
-            }
-            else {
+            } else {
                 $success = $storage->insert_event($event);
             }
 
@@ -688,9 +680,9 @@
     /**
      * Extended event editing with possible changes to the argument
      *
-     * @param array  Hash array with event properties
-     * @param string New participant status
-     * @param array  List of hash arrays with updated attendees
+     * @param array  $event     Hash array with event properties
+     * @param string $status    New participant status
+     * @param array  $attendees List of hash arrays with updated attendees
      *
      * @return bool True on success, False on error
      */
@@ -717,11 +709,9 @@
             if ($this->rc->config->get('kolab_invitation_calendars')) {
                 if (strtoupper($status) == 'DECLINED') {
                     $event'calendar' = self::INVITATIONS_CALENDAR_DECLINED;
-                }
-                else if (strtoupper($status) == 'NEEDS-ACTION') {
+                } elseif (strtoupper($status) == 'NEEDS-ACTION') {
                     $event'calendar' = self::INVITATIONS_CALENDAR_PENDING;
-                }
-                else if (!empty($event'_folder_id')) {
+                } elseif (!empty($event'_folder_id')) {
                     $event'calendar' = $event'_folder_id';
                 }
             }
@@ -784,7 +774,7 @@
      * Move a single event
      *
      * @see calendar_driver::move_event()
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      */
     public function move_event($event)
     {
@@ -802,7 +792,7 @@
      * Resize a single event
      *
      * @see calendar_driver::resize_event()
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      */
     public function resize_event($event)
     {
@@ -819,9 +809,9 @@
     /**
      * Remove a single event
      *
-     * @param array Hash array with event properties:
-     *      id: Event identifier
-     * @param bool  Remove record(s) irreversible (mark as deleted otherwise)
+     * @param array $event Hash array with event properties:
+     *                     - id: Event identifier
+     * @param bool  $force Remove record(s) irreversible (mark as deleted otherwise)
      *
      * @return bool True on success, False on error
      */
@@ -850,8 +840,7 @@
 
                 if (!empty($event'_savemode')) {
                     $savemode = $event'_savemode';
-                }
-                else if (!empty($event'_instance') || !empty($event'isexception')) {
+                } elseif (!empty($event'_instance') || !empty($event'isexception')) {
                     $savemode = 'current';
                 }
 
@@ -879,77 +868,77 @@
             }
 
             switch ($savemode) {
-            case 'current':
-                $_SESSION'calendar_restore_event_data' = serialize(array_diff_key($master, '_formatobj' => 1));
-
-                // remove the matching RDATE entry
-                if (!empty($master'recurrence''RDATE')) {
-                    foreach ($master'recurrence''RDATE' as $j => $rdate) {
-                        if ($rdate->format('Ymd') == $event'start'->format('Ymd')) {
-                            unset($master'recurrence''RDATE'$j);
-                            break;
-                        }
-                    }
-                }
-
-                // add exception to master event
-                $master'recurrence''EXDATE' = $event'start';
-
-                $success = $storage->update_event($master);
-                break;
-
-            case 'future':
-                $master'_instance' = libcalendaring::recurrence_instance_identifier($master);
-                if ($master'_instance' != $event'_instance') {
+                case 'current':
                     $_SESSION'calendar_restore_event_data' = serialize(array_diff_key($master, '_formatobj' => 1));
 
-                    // set until-date on master event
-                    $master'recurrence''UNTIL' = clone $event'start';
-                    $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
-                    unset($master'recurrence''COUNT');
-
-                    // if all future instances are deleted, remove recurrence rule entirely (bug #1677)
-                    if ($master'recurrence''UNTIL'->format('Ymd') == $master'start'->format('Ymd')) {
-                        $master'recurrence' = ;
-                    }
-                    // remove matching RDATE entries
-                    else if (!empty($master'recurrence''RDATE')) {
+                    // remove the matching RDATE entry
+                    if (!empty($master'recurrence''RDATE')) {
                         foreach ($master'recurrence''RDATE' as $j => $rdate) {
                             if ($rdate->format('Ymd') == $event'start'->format('Ymd')) {
-                                $master'recurrence''RDATE' = array_slice($master'recurrence''RDATE', 0, $j);
+                                unset($master'recurrence''RDATE'$j);
                                 break;
                             }
                         }
                     }
 
+                    // add exception to master event
+                    $master'recurrence''EXDATE' = $event'start';
+
                     $success = $storage->update_event($master);
-                    $ret = $master'uid';
                     break;
-                }
 
-            default:  // 'all' is default
-                // removing the master event with loose exceptions (not recurring though)
-                if (!empty($event'recurrence_date') && empty($master'recurrence') && !empty($master'exceptions')) {
-                    // make the first exception the new master
-                    $newmaster = array_shift($master'exceptions');
-                    $newmaster'exceptions'   = $master'exceptions';
-                    $newmaster'_attachments' = $master'_attachments';
-                    $newmaster'_mailbox'     = $master'_mailbox';
-                    $newmaster'_msguid'      = $master'_msguid';
-
-                    $success = $storage->update_event($newmaster);
-                }
-                else if ($decline && $this->rc->config->get('kolab_invitation_calendars')) {
-                    // don't delete but set PARTSTAT=DECLINED
-                    if ($this->cal->lib->set_partstat($master, 'DECLINED')) {
+                case 'future':
+                    $master'_instance' = libcalendaring::recurrence_instance_identifier($master);
+                    if ($master'_instance' != $event'_instance') {
+                        $_SESSION'calendar_restore_event_data' = serialize(array_diff_key($master, '_formatobj' => 1));
+
+                        // set until-date on master event
+                        $master'recurrence''UNTIL' = clone $event'start';
+                        $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
+                        unset($master'recurrence''COUNT');
+
+                        // if all future instances are deleted, remove recurrence rule entirely (bug #1677)
+                        if ($master'recurrence''UNTIL'->format('Ymd') == $master'start'->format('Ymd')) {
+                            $master'recurrence' = ;
+                        }
+                        // remove matching RDATE entries
+                        elseif (!empty($master'recurrence''RDATE')) {
+                            foreach ($master'recurrence''RDATE' as $j => $rdate) {
+                                if ($rdate->format('Ymd') == $event'start'->format('Ymd')) {
+                                    $master'recurrence''RDATE' = array_slice($master'recurrence''RDATE', 0, $j);
+                                    break;
+                                }
+                            }
+                        }
+
                         $success = $storage->update_event($master);
+                        $ret = $master'uid';
+                        break;
                     }
-                }
 
-                if (!$success) {
-                    $success = $storage->delete_event($master, $force);
-                }
-                break;
+                    // no break
+                default:  // 'all' is default
+                    // removing the master event with loose exceptions (not recurring though)
+                    if (!empty($event'recurrence_date') && empty($master'recurrence') && !empty($master'exceptions')) {
+                        // make the first exception the new master
+                        $newmaster = array_shift($master'exceptions');
+                        $newmaster'exceptions'   = $master'exceptions';
+                        $newmaster'_attachments' = $master'_attachments';
+                        $newmaster'_mailbox'     = $master'_mailbox';
+                        $newmaster'_msguid'      = $master'_msguid';
+
+                        $success = $storage->update_event($newmaster);
+                    } elseif ($decline && $this->rc->config->get('kolab_invitation_calendars')) {
+                        // don't delete but set PARTSTAT=DECLINED
+                        if ($this->cal->lib->set_partstat($master, 'DECLINED')) {
+                            $success = $storage->update_event($master);
+                        }
+                    }
+
+                    if (!$success) {
+                        $success = $storage->delete_event($master, $force);
+                    }
+                    break;
             }
         }
 
@@ -974,9 +963,9 @@
     /**
      * Restore a single deleted event
      *
-     * @param array Hash array with event properties:
-     *                    id: Event identifier
-     *              calendar: Event calendar
+     * @param array $event Hash array with event properties:
+     *                     - id: Event identifier
+     *                     - calendar: Event calendar
      *
      * @return bool True on success, False on error
      */
@@ -985,8 +974,7 @@
         if ($storage = $this->get_calendar($event'calendar')) {
             if (!empty($_SESSION'calendar_restore_event_data')) {
                 $success = $storage->update_event($event = unserialize($_SESSION'calendar_restore_event_data'));
-            }
-            else {
+            } else {
                 $success = $storage->restore_event($event);
             }
 
@@ -1034,11 +1022,13 @@
         $old = $master = $storage->get_event($event'id');
 
         if (!$old || empty($old'start')) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Failed to load event object to update: id=" . $event'id'
+                    'message' => "Failed to load event object to update: id=" . $event'id',
                 ,
-                true, false
+                true,
+                false
             );
             return false;
         }
@@ -1049,8 +1039,7 @@
 
             if (!empty($event'_savemode')) {
                 $savemode = $event'_savemode';
-            }
-            else {
+            } else {
                 $savemode = (!empty($old'recurrence_id') || !empty($old'isexception')) ? 'current' : 'all';
             }
 
@@ -1061,7 +1050,7 @@
                 $savemode = 'all';
             }
             // force 'current' mode for single occurrences stored as exception
-            else if (empty($old'recurrence') && empty($old'recurrence_id') && !empty($old'isexception')) {
+            elseif (empty($old'recurrence') && empty($old'recurrence_id') && !empty($old'isexception')) {
                 $savemode = 'current';
             }
 
@@ -1088,11 +1077,9 @@
         if (isset($event'recurrence''EXCEPTIONS')) {
             // exceptions already provided (e.g. from iCal import)
             $with_exceptions = true;
-        }
-        else if (!empty($old'recurrence''EXCEPTIONS')) {
+        } elseif (!empty($old'recurrence''EXCEPTIONS')) {
             $event'recurrence''EXCEPTIONS' = $old'recurrence''EXCEPTIONS';
-        }
-        else if (!empty($old'exceptions')) {
+        } elseif (!empty($old'exceptions')) {
             $event'exceptions' = $old'exceptions';
         }
 
@@ -1102,271 +1089,269 @@
         );
 
         switch ($savemode) {
-        case 'new':
-            // save submitted data as new (non-recurring) event
-            $event'recurrence' = ;
-            $event'_copyfrom'  = $master'_msguid';
-            $event'_mailbox'   = $master'_mailbox';
-            $event'uid'        = $this->cal->generate_uid();
-
-            unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
-
-            // copy attachment metadata to new event
-            $event = self::from_rcube_event($event, $master);
-
-            self::clear_attandee_noreply($event);
-            if ($success = $storage->insert_event($event)) {
-                $success = $event'uid';
-            }
-            break;
-
-        case 'future':
-            // create a new recurring event
-            $event'_copyfrom' = $master'_msguid';
-            $event'_mailbox'  = $master'_mailbox';
-            $event'uid'       = $this->cal->generate_uid();
-
-            unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
-
-            // copy attachment metadata to new event
-            $event = self::from_rcube_event($event, $master);
-
-            // remove recurrence exceptions on re-scheduling
-            if ($reschedule) {
-                unset($event'recurrence''EXCEPTIONS', $event'exceptions', $master'recurrence''EXDATE');
-            }
-            else {
-                if (isset($event'recurrence''EXCEPTIONS') && is_array($event'recurrence''EXCEPTIONS')) {
-                    // only keep relevant exceptions
-                    $event'recurrence''EXCEPTIONS' = array_filter(
-                        $event'recurrence''EXCEPTIONS',
-                        function($exception) use ($event) {
-                            return $exception'start' > $event'start';
-                        }
-                    );
-
-                    // set link to top-level exceptions
-                    $event'exceptions' = &$event'recurrence''EXCEPTIONS';
-                }
-
-                if (isset($event'recurrence''EXDATE') && is_array($event'recurrence''EXDATE')) {
-                    $event'recurrence''EXDATE' = array_filter(
-                        $event'recurrence''EXDATE',
-                        function($exdate) use ($event) {
-                            return $exdate > $event'start';
-                        }
-                    );
+            case 'new':
+                // save submitted data as new (non-recurring) event
+                $event'recurrence' = ;
+                $event'_copyfrom'  = $master'_msguid';
+                $event'_mailbox'   = $master'_mailbox';
+                $event'uid'        = $this->cal->generate_uid();
+
+                unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
+
+                // copy attachment metadata to new event
+                $event = self::from_rcube_event($event, $master);
+
+                self::clear_attandee_noreply($event);
+                if ($success = $storage->insert_event($event)) {
+                    $success = $event'uid';
                 }
-            }
-
-            // compute remaining occurrences
-            if ($event'recurrence''COUNT') {
-                if (empty($old'_count')) {
-                    $old'_count' = $this->get_recurrence_count($master, $old'start');
-                }
-                $event'recurrence''COUNT' -= intval($old'_count');
-            }
-
-            // remove fixed weekday when date changed
-            if ($old'start'->format('Y-m-d') != $event'start'->format('Y-m-d')) {
-                if (!empty($event'recurrence''BYDAY') && strlen($event'recurrence''BYDAY') == 2) {
-                    unset($event'recurrence''BYDAY');
-                }
-                if (!empty($old'recurrence''BYMONTH') && $old'recurrence''BYMONTH' == $old'start'->format('n')) {
-                    unset($event'recurrence''BYMONTH');
-                }
-            }
+                break;
 
-            // set until-date on master event
-            $master'recurrence''UNTIL' = clone $old'start';
-            $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
-            unset($master'recurrence''COUNT');
+            case 'future':
+                // create a new recurring event
+                $event'_copyfrom' = $master'_msguid';
+                $event'_mailbox'  = $master'_mailbox';
+                $event'uid'       = $this->cal->generate_uid();
+
+                unset($event'recurrence_id', $event'recurrence_date', $event'_instance', $event'id');
+
+                // copy attachment metadata to new event
+                $event = self::from_rcube_event($event, $master);
+
+                // remove recurrence exceptions on re-scheduling
+                if ($reschedule) {
+                    unset($event'recurrence''EXCEPTIONS', $event'exceptions', $master'recurrence''EXDATE');
+                } else {
+                    if (isset($event'recurrence''EXCEPTIONS') && is_array($event'recurrence''EXCEPTIONS')) {
+                        // only keep relevant exceptions
+                        $event'recurrence''EXCEPTIONS' = array_filter(
+                            $event'recurrence''EXCEPTIONS',
+                            function ($exception) use ($event) {
+                                return $exception'start' > $event'start';
+                            }
+                        );
 
-            // remove all exceptions after $event'start'
-            if (isset($master'recurrence''EXCEPTIONS') && is_array($master'recurrence''EXCEPTIONS')) {
-                $master'recurrence''EXCEPTIONS' = array_filter(
-                    $master'recurrence''EXCEPTIONS',
-                    function($exception) use ($event) {
-                        return $exception'start' < $event'start';
+                        // set link to top-level exceptions
+                        $event'exceptions' = &$event'recurrence''EXCEPTIONS';
                     }
-                );
-                // set link to top-level exceptions
-                $master'exceptions' = &$master'recurrence''EXCEPTIONS';
-            }
 
-            if (isset($master'recurrence''EXDATE') && is_array($master'recurrence''EXDATE')) {
-                $master'recurrence''EXDATE' = array_filter(
-                    $master'recurrence''EXDATE',
-                    function($exdate) use ($event) {
-                        return $exdate < $event'start';
+                    if (isset($event'recurrence''EXDATE') && is_array($event'recurrence''EXDATE')) {
+                        $event'recurrence''EXDATE' = array_filter(
+                            $event'recurrence''EXDATE',
+                            function ($exdate) use ($event) {
+                                return $exdate > $event'start';
+                            }
+                        );
                     }
-                );
-            }
-
-            // save new event
-            if ($success = $storage->insert_event($event)) {
-                $success = $event'uid';
-
-                // update master event (no rescheduling!)
-                self::clear_attandee_noreply($master);
-                $storage->update_event($master);
-            }
-            break;
-
-        case 'current':
-            // recurring instances shall not store recurrence rules and attachments
-            $event'recurrence'    = ;
-            $event'thisandfuture' = $savemode == 'future';
-            unset($event'attachments', $event'id');
-
-            // increment sequence of this instance if scheduling is affected
-            if ($reschedule) {
-                $event'sequence' = max($old'sequence' ?? 0, $master'sequence' ?? 0) + 1;
-            }
-            else if (!isset($event'sequence')) {
-                $event'sequence' = !empty($old'sequence') ? $old'sequence' : $master'sequence' ?? 1;
-            }
-
-            // save properties to a recurrence exception instance
-            if (!empty($old'_instance') && isset($master'recurrence''EXCEPTIONS')) {
-                if ($this->update_recurrence_exceptions($master, $event, $old, $savemode)) {
-                    $success = $storage->update_event($master, $old'id');
-                    break;
                 }
-            }
 
-            $add_exception = true;
-
-            // adjust matching RDATE entry if dates changed
-            if (
-                !empty($master'recurrence''RDATE')
-                && ($old_date = $old'start'->format('Ymd')) != $event'start'->format('Ymd')
-            ) {
-                foreach ($master'recurrence''RDATE' as $j => $rdate) {
-                    if ($rdate->format('Ymd') == $old_date) {
-                        $master'recurrence''RDATE'$j = $event'start';
-                        sort($master'recurrence''RDATE');
-                        $add_exception = false;
-                        break;
+                // compute remaining occurrences
+                if ($event'recurrence''COUNT') {
+                    if (empty($old'_count')) {
+                        $old'_count' = $this->get_recurrence_count($master, $old'start');
                     }
+                    $event'recurrence''COUNT' -= intval($old'_count');
                 }
-            }
 
-            // save as new exception to master event
-            if ($add_exception) {
-                self::add_exception($master, $event, $old);
-            }
-
-            $success = $storage->update_event($master);
-            break;
-
-        default:  // 'all' is the default
-            $event'id'  = $master'uid';
-            $event'uid' = $master'uid';
-
-            // use start date from master but try to be smart on time or duration changes
-            $old_start_date = $old'start'->format('Y-m-d');
-            $old_start_time = !empty($old'allday') ? '' : $old'start'->format('H:i');
-            $old_duration   = self::event_duration($old'start', $old'end', !empty($old'allday'));
-
-            $new_start_date = $event'start'->format('Y-m-d');
-            $new_start_time = !empty($event'allday') ? '' : $event'start'->format('H:i');
-            $new_duration   = self::event_duration($event'start', $event'end', !empty($event'allday'));
-
-            $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
-            $date_shift = $old'start'->diff($event'start');
-
-            // shifted or resized
-            if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
-                $event'start' = $master'start'->add($date_shift);
-                $event'end' = clone $event'start';
-                $event'end'->add(new DateInterval($new_duration));
-
-                // remove fixed weekday, will be re-set to the new weekday in kolab_calendar::update_event()
-                if ($old_start_date != $new_start_date && !empty($event'recurrence')) {
-                    if (!empty($event'recurrence''BYDAY') && strlen($event'recurrence''BYDAY') == 2)
+                // remove fixed weekday when date changed
+                if ($old'start'->format('Y-m-d') != $event'start'->format('Y-m-d')) {
+                    if (!empty($event'recurrence''BYDAY') && strlen($event'recurrence''BYDAY') == 2) {
                         unset($event'recurrence''BYDAY');
-                    if (!empty($old'recurrence''BYMONTH') && $old'recurrence''BYMONTH' == $old'start'->format('n'))
+                    }
+                    if (!empty($old'recurrence''BYMONTH') && $old'recurrence''BYMONTH' == $old'start'->format('n')) {
                         unset($event'recurrence''BYMONTH');
+                    }
                 }
-            }
-            // dates did not change, use the ones from master
-            else if ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
-                $event'start' = $master'start';
-                $event'end' = $master'end';
-            }
 
-            // when saving an instance in 'all' mode, copy recurrence exceptions over
-            if (!empty($old'recurrence_id')) {
-                $event'recurrence''EXCEPTIONS' = $master'recurrence''EXCEPTIONS' ?? ;
-                $event'recurrence''EXDATE'     = $master'recurrence''EXDATE' ?? ;
-            }
-            else if (!empty($master'_instance')) {
-                $event'_instance'       = $master'_instance';
-                $event'recurrence_date' = $master'recurrence_date';
-            }
+                // set until-date on master event
+                $master'recurrence''UNTIL' = clone $old'start';
+                $master'recurrence''UNTIL'->sub(new DateInterval('P1D'));
+                unset($master'recurrence''COUNT');
+
+                // remove all exceptions after $event'start'
+                if (isset($master'recurrence''EXCEPTIONS') && is_array($master'recurrence''EXCEPTIONS')) {
+                    $master'recurrence''EXCEPTIONS' = array_filter(
+                        $master'recurrence''EXCEPTIONS',
+                        function ($exception) use ($event) {
+                            return $exception'start' < $event'start';
+                        }
+                    );
+                    // set link to top-level exceptions
+                    $master'exceptions' = &$master'recurrence''EXCEPTIONS';
+                }
 
-            // TODO: forward changes to exceptions (which do not yet have differing values stored)
-            if (!empty($event'recurrence') && !empty($event'recurrence''EXCEPTIONS') && empty($with_exceptions)) {
-                // determine added and removed attendees
-                $old_attendees = $current_attendees = $added_attendees = ;
+                if (isset($master'recurrence''EXDATE') && is_array($master'recurrence''EXDATE')) {
+                    $master'recurrence''EXDATE' = array_filter(
+                        $master'recurrence''EXDATE',
+                        function ($exdate) use ($event) {
+                            return $exdate < $event'start';
+                        }
+                    );
+                }
+
+                // save new event
+                if ($success = $storage->insert_event($event)) {
+                    $success = $event'uid';
+
+                    // update master event (no rescheduling!)
+                    self::clear_attandee_noreply($master);
+                    $storage->update_event($master);
+                }
+                break;
 
-                if (!empty($old'attendees')) {
-                    foreach ((array) $old'attendees' as $attendee) {
-                        $old_attendees = $attendee'email';
+            case 'current':
+                // recurring instances shall not store recurrence rules and attachments
+                $event'recurrence'    = ;
+                $event'thisandfuture' = $savemode == 'future';
+                unset($event'attachments', $event'id');
+
+                // increment sequence of this instance if scheduling is affected
+                if ($reschedule) {
+                    $event'sequence' = max($old'sequence' ?? 0, $master'sequence' ?? 0) + 1;
+                } elseif (!isset($event'sequence')) {
+                    $event'sequence' = !empty($old'sequence') ? $old'sequence' : $master'sequence' ?? 1;
+                }
+
+                // save properties to a recurrence exception instance
+                if (!empty($old'_instance') && isset($master'recurrence''EXCEPTIONS')) {
+                    if ($this->update_recurrence_exceptions($master, $event, $old, $savemode)) {
+                        $success = $storage->update_event($master, $old'id' ?? null);
+                        break;
                     }
                 }
 
-                if (!empty($event'attendees')) {
-                    foreach ((array) $event'attendees' as $attendee) {
-                        $current_attendees = $attendee'email';
-                        if (!in_array($attendee'email', $old_attendees)) {
-                            $added_attendees = $attendee;
+                $add_exception = true;
+
+                // adjust matching RDATE entry if dates changed
+                if (
+                    !empty($master'recurrence''RDATE')
+                    && ($old_date = $old'start'->format('Ymd')) != $event'start'->format('Ymd')
+                ) {
+                    foreach ($master'recurrence''RDATE' as $j => $rdate) {
+                        if ($rdate->format('Ymd') == $old_date) {
+                            $master'recurrence''RDATE'$j = $event'start';
+                            sort($master'recurrence''RDATE');
+                            $add_exception = false;
+                            break;
                         }
                     }
                 }
 
-                $removed_attendees = array_diff($old_attendees, $current_attendees);
-
-                foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
-                    calendar::merge_attendee_data($event'recurrence''EXCEPTIONS'$i, $added_attendees, $removed_attendees);
+                // save as new exception to master event
+                if ($add_exception) {
+                    self::add_exception($master, $event, $old);
                 }
 
-                // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
-                if ($old_start_date != $new_start_date || $old_start_time != $new_start_time) {
-                    $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+                $success = $storage->update_event($master);
+                break;
 
-                    foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
-                        if (isset($exception'recurrence_date') && $exception'recurrence_date' instanceof DateTimeInterface) {
-                            $recurrence_id = $exception'recurrence_date';
+            default:  // 'all' is the default
+                $event'id'  = $master'uid';
+                $event'uid' = $master'uid';
+
+                // use start date from master but try to be smart on time or duration changes
+                $old_start_date = $old'start'->format('Y-m-d');
+                $old_start_time = !empty($old'allday') ? '' : $old'start'->format('H:i');
+                $old_duration   = self::event_duration($old'start', $old'end', !empty($old'allday'));
+
+                $new_start_date = $event'start'->format('Y-m-d');
+                $new_start_time = !empty($event'allday') ? '' : $event'start'->format('H:i');
+                $new_duration   = self::event_duration($event'start', $event'end', !empty($event'allday'));
+
+                $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
+                $date_shift = $old'start'->diff($event'start');
+
+                // shifted or resized
+                if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
+                    $event'start' = $master'start'->add($date_shift);
+                    $event'end' = clone $event'start';
+                    $event'end'->add(new DateInterval($new_duration));
+
+                    // remove fixed weekday, will be re-set to the new weekday in kolab_calendar::update_event()
+                    if ($old_start_date != $new_start_date && !empty($event'recurrence')) {
+                        if (!empty($event'recurrence''BYDAY') && strlen($event'recurrence''BYDAY') == 2) {
+                            unset($event'recurrence''BYDAY');
+                        }
+                        if (!empty($old'recurrence''BYMONTH') && $old'recurrence''BYMONTH' == $old'start'->format('n')) {
+                            unset($event'recurrence''BYMONTH');
                         }
-                        else {
-                            $recurrence_id = rcube_utils::anytodatetime($exception'_instance', $old'start'->getTimezone());
+                    }
+                }
+                // dates did not change, use the ones from master
+                elseif ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
+                    $event'start' = $master'start';
+                    $event'end' = $master'end';
+                }
+
+                // when saving an instance in 'all' mode, copy recurrence exceptions over
+                if (!empty($old'recurrence_id')) {
+                    $event'recurrence''EXCEPTIONS' = $master'recurrence''EXCEPTIONS' ?? ;
+                    $event'recurrence''EXDATE'     = $master'recurrence''EXDATE' ?? ;
+                } elseif (!empty($master'_instance')) {
+                    $event'_instance'       = $master'_instance';
+                    $event'recurrence_date' = $master'recurrence_date';
+                }
+
+                // TODO: forward changes to exceptions (which do not yet have differing values stored)
+                if (!empty($event'recurrence') && !empty($event'recurrence''EXCEPTIONS') && empty($with_exceptions)) {
+                    // determine added and removed attendees
+                    $old_attendees = $current_attendees = $added_attendees = ;
+
+                    if (!empty($old'attendees')) {
+                        foreach ((array) $old'attendees' as $attendee) {
+                            $old_attendees = $attendee'email';
                         }
+                    }
 
-                        if ($recurrence_id instanceof DateTimeInterface) {
-                            $recurrence_id->add($date_shift);
-                            $event'recurrence''EXCEPTIONS'$i'recurrence_date' = $recurrence_id;
-                            $event'recurrence''EXCEPTIONS'$i'_instance' = $recurrence_id->format($recurrence_id_format);
+                    if (!empty($event'attendees')) {
+                        foreach ((array) $event'attendees' as $attendee) {
+                            $current_attendees = $attendee'email';
+                            if (!in_array($attendee'email', $old_attendees)) {
+                                $added_attendees = $attendee;
+                            }
                         }
                     }
-                }
 
-                // set link to top-level exceptions
-                $event'exceptions' = &$event'recurrence''EXCEPTIONS';
-            }
+                    $removed_attendees = array_diff($old_attendees, $current_attendees);
 
-            // unset _dateonly flags in (cached) date objects
-            unset($event'start'->_dateonly, $event'end'->_dateonly);
+                    foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
+                        calendar::merge_attendee_data($event'recurrence''EXCEPTIONS'$i, $added_attendees, $removed_attendees);
+                    }
+
+                    // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
+                    if ($old_start_date != $new_start_date || $old_start_time != $new_start_time) {
+                        $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+
+                        foreach ($event'recurrence''EXCEPTIONS' as $i => $exception) {
+                            if (isset($exception'recurrence_date') && $exception'recurrence_date' instanceof DateTimeInterface) {
+                                $recurrence_id = $exception'recurrence_date';
+                            } else {
+                                $recurrence_id = rcube_utils::anytodatetime($exception'_instance', $old'start'->getTimezone());
+                            }
 
-            $success = $storage->update_event($event) ? $event'id' : false;  // return master UID
-            break;
+                            if ($recurrence_id instanceof DateTime || $recurrence_id instanceof DateTimeImmutable) {
+                                $recurrence_id->add($date_shift);
+                                $event'recurrence''EXCEPTIONS'$i'recurrence_date' = $recurrence_id;
+                                $event'recurrence''EXCEPTIONS'$i'_instance' = $recurrence_id->format($recurrence_id_format);
+                            }
+                        }
+                    }
+
+                    // set link to top-level exceptions
+                    $event'exceptions' = &$event'recurrence''EXCEPTIONS';
+                }
+
+                // unset _dateonly flags in (cached) date objects
+                unset($event'start'->_dateonly, $event'end'->_dateonly);
+
+                $success = $storage->update_event($event) ? $event'id' : false;  // return master UID
+                break;
         }
 
         if ($success && $this->freebusy_trigger) {
             $this->rc->output->command('plugin.ping_url', 
                     'action' => 'calendar/push-freebusy',
-                    'source' => $storage->id
+                    'source' => $storage->id,
             );
         }
 
@@ -1412,8 +1397,7 @@
                     && in_array(strtolower($attendee'email'), $emails)
                 ) {
                     $is_organizer = true;
-                }
-                else if ($attendee'role' != 'ORGANIZER'
+                } elseif ($attendee'role' != 'ORGANIZER'
                     && $attendee'role' != 'NON-PARTICIPANT'
                     && $attendee'status' != 'DELEGATED'
                 ) {
@@ -1495,28 +1479,28 @@
                 }
             }
         }
-/*
-        // we could not update the existing exception due to savemode mismatch...
-        if (!$saved && isset($existing) && !empty($master'recurrence''EXCEPTIONS'$existing'thisandfuture')) {
-            // ... try to move the existing this-and-future exception to the next occurrence
-            foreach ($this->get_recurring_events($master, $existing'start') as $candidate) {
-                // our old this-and-future exception is obsolete
-                if (!empty($candidate'thisandfuture')) {
-                    unset($master'recurrence''EXCEPTIONS'$existing);
-                    $saved = true;
-                    break;
-                }
-                // this occurrence doesn't yet have an exception
-                else if (empty($candidate'isexception')) {
-                    $event'_instance' = $candidate'_instance';
-                    $event'recurrence_date' = $candidate'recurrence_date';
-                    $master'recurrence''EXCEPTIONS'$i = $event;
-                    $saved = true;
-                    break;
+        /*
+                // we could not update the existing exception due to savemode mismatch...
+                if (!$saved && isset($existing) && !empty($master'recurrence''EXCEPTIONS'$existing'thisandfuture')) {
+                    // ... try to move the existing this-and-future exception to the next occurrence
+                    foreach ($this->get_recurring_events($master, $existing'start') as $candidate) {
+                        // our old this-and-future exception is obsolete
+                        if (!empty($candidate'thisandfuture')) {
+                            unset($master'recurrence''EXCEPTIONS'$existing);
+                            $saved = true;
+                            break;
+                        }
+                        // this occurrence doesn't yet have an exception
+                        else if (empty($candidate'isexception')) {
+                            $event'_instance' = $candidate'_instance';
+                            $event'recurrence_date' = $candidate'recurrence_date';
+                            $master'recurrence''EXCEPTIONS'$i = $event;
+                            $saved = true;
+                            break;
+                        }
+                    }
                 }
-            }
-        }
-*/
+        */
 
         // set link to top-level exceptions
         $master'exceptions' = &$master'recurrence''EXCEPTIONS';
@@ -1535,16 +1519,14 @@
             if (empty($event'recurrence_date')) {
                 $event'recurrence_date' = !empty($old'recurrence_date') ? $old'recurrence_date' : $old'start';
             }
-        }
-        else if (empty($event'recurrence_date')) {
+        } elseif (empty($event'recurrence_date')) {
             $event'recurrence_date' = $event'start';
         }
 
         if (!isset($master'exceptions')) {
             if (isset($master'recurrence''EXCEPTIONS')) {
                 $master'exceptions' = &$master'recurrence''EXCEPTIONS';
-            }
-            else {
+            } else {
                 $master'exceptions' = ;
             }
         }
@@ -1579,9 +1561,9 @@
     /**
      * Merge certain properties from the overlay event to the base event object
      *
-     * @param array The event object to be altered
-     * @param array The overlay event object to be merged over $event
-     * @param array List of properties not allowed to be overwritten
+     * @param array  $event     The event object to be altered
+     * @param array  $overlay   The overlay event object to be merged over $event
+     * @param ?array $blacklist List of properties not allowed to be overwritten
      */
     public static function merge_exception_data(&$event, $overlay, $blacklist = null)
     {
@@ -1594,11 +1576,9 @@
         foreach ($overlay as $prop => $value) {
             if ($prop == 'start' || $prop == 'end') {
                 // handled by merge_exception_dates() below
-            }
-            else if ($prop == 'thisandfuture' && $overlay'_instance' == $event'_instance') {
+            } elseif ($prop == 'thisandfuture' && $overlay'_instance' == $event'_instance') {
                 $event$prop = $value;
-            }
-            else if ($prop0 != '_' && !in_array($prop, $forbidden)) {
+            } elseif ($prop0 != '_' && !in_array($prop, $forbidden)) {
                 $event$prop = $value;
             }
         }
@@ -1609,8 +1589,8 @@
     /**
      * Merge start/end date from the overlay event to the base event object
      *
-     * @param array The event object to be altered
-     * @param array The overlay event object to be merged over $event
+     * @param array $event   The event object to be altered
+     * @param array $overlay The overlay event object to be merged over $event
      */
     public static function merge_exception_dates(&$event, $overlay)
     {
@@ -1621,13 +1601,13 @@
 
         foreach ('start', 'end' as $prop) {
             $value = $overlay$prop;
-            if (isset($event$prop) && $event$prop instanceof DateTimeInterface) {
+            if (isset($event$prop) && ($event$prop instanceof DateTime || $event$prop instanceof DateTimeImmutable)) {
                 // set date value if overlay is an exception of the current instance
                 if (substr($overlay'_instance', 0, 8) == substr($event'_instance', 0, 8)) {
                     $event$prop->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
                 }
                 // apply date offset
-                else if (!empty($date_offset)) {
+                elseif (!empty($date_offset)) {
                     $event$prop->add($date_offset);
                 }
                 // adjust time of the recurring event instance
@@ -1639,21 +1619,20 @@
     /**
      * Get events from source.
      *
-     * @param int    Event's new start (unix timestamp)
-     * @param int    Event's new end (unix timestamp)
-     * @param string Search query (optional)
-     * @param mixed  List of calendar IDs to load events from (either as array or comma-separated string)
-     * @param bool   Include virtual events (optional)
-     * @param int    Only list events modified since this time (unix timestamp)
+     * @param int    $start         Event's new start (unix timestamp)
+     * @param int    $end           Event's new end (unix timestamp)
+     * @param string $search        Search query (optional)
+     * @param mixed  $calendars     List of calendar IDs to load events from (either as array or comma-separated string)
+     * @param bool   $virtual       Include virtual events (optional)
+     * @param int    $modifiedsince Only list events modified since this time (unix timestamp)
      *
      * @return array A list of event records
      */
-    public function load_events($start, $end, $search = null, $calendars = null, $virtual = 1, $modifiedsince = null)
+    public function load_events($start, $end, $search = null, $calendars = null, $virtual = true, $modifiedsince = null)
     {
         if ($calendars && is_string($calendars)) {
             $calendars = explode(',', $calendars);
-        }
-        else if (!$calendars) {
+        } elseif (!$calendars) {
             $this->_read_calendars();
             $calendars = array_keys($this->calendars);
         }
@@ -1683,7 +1662,7 @@
         $newcats = array_udiff(
             array_keys($categories),
             array_keys($old_categories),
-            function($a, $b) { return strcasecmp($a, $b); }
+            function ($a, $b) { return strcasecmp($a, $b); }
         );
 
         if (!empty($newcats)) {
@@ -1701,9 +1680,9 @@
     /**
      * Get number of events in the given calendar
      *
-     * @param mixed List of calendar IDs to count events (either as array or comma-separated string)
-     * @param int   Date range start (unix timestamp)
-     * @param int   Date range end (unix timestamp)
+     * @param mixed $calendars List of calendar IDs to count events (either as array or comma-separated string)
+     * @param int   $start     Date range start (unix timestamp)
+     * @param ?int  $end       Date range end (unix timestamp)
      *
      * @return array Hash array with counts grouped by calendar ID
      */
@@ -1713,8 +1692,7 @@
 
         if ($calendars && is_string($calendars)) {
             $calendars = explode(',', $calendars);
-        }
-        else if (!$calendars) {
+        } elseif (!$calendars) {
             $this->_read_calendars();
             $calendars = array_keys($this->calendars);
         }
@@ -1725,7 +1703,7 @@
             }
         }
 
-         return $counts;
+        return $counts;
     }
 
     /**
@@ -1792,9 +1770,10 @@
             $dbdata = ;
             $alarm_ids = array_map($this->rc->db, 'quote', array_keys($candidates));
 
-            $result = $this->rc->db->query("SELECT *"
+            $result = $this->rc->db->query(
+                "SELECT *"
                 . " FROM " . $this->rc->db->table_name('kolab_alarms', true)
-                . " WHERE `alarm_id` IN (" . join(',', $alarm_ids) . ")"
+                . " WHERE `alarm_id` IN (" . implode(',', $alarm_ids) . ")"
                     . " AND `user_id` = ?",
                 $this->rc->user->ID
             );
@@ -1834,7 +1813,8 @@
         $alarms_table = $this->rc->db->table_name('kolab_alarms', true);
 
         // delete old alarm entry
-        $this->rc->db->query("DELETE FROM $alarms_table"
+        $this->rc->db->query(
+            "DELETE FROM $alarms_table"
             . " WHERE `alarm_id` = ? AND `user_id` = ?",
             $alarm_id,
             $this->rc->user->ID
@@ -1843,7 +1823,8 @@
         // set new notifyat time or unset if not snoozed
         $notifyat = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
 
-        $query = $this->rc->db->query("INSERT INTO $alarms_table"
+        $query = $this->rc->db->query(
+            "INSERT INTO $alarms_table"
             . " (`alarm_id`, `user_id`, `dismissed`, `notifyat`)"
             . " VALUES (?, ?, ?, ?)",
             $alarm_id,
@@ -1861,7 +1842,7 @@
     public function list_attachments($event)
     {
         if (!($storage = $this->get_calendar($event'calendar'))) {
-            return false;
+            return ;
         }
 
         $event = $storage->get_event($event'id');
@@ -1881,19 +1862,20 @@
         // get old revision of event
         if (!empty($event'rev')) {
             $event = $this->get_event_revison($event, $event'rev', true);
-        }
-        else {
+        } else {
             $event = $storage->get_event($event'id');
         }
 
         if ($event) {
-            $attachments = isset($event'_attachments') ? $event'_attachments' : $event'attachments';
+            $attachments = $event'_attachments' ?? $event'attachments';
             foreach ((array) $attachments as $idx => $att) {
                 if ((isset($att'id') && $att'id' == $id) || (!isset($att'id') && $idx == $id)) {
                     return $att;
                 }
             }
         }
+
+        return false;
     }
 
     /**
@@ -1915,7 +1897,7 @@
             $cid = substr($id, 4);
 
             // call Bonnie API and get the raw mime message
-            list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+            $uid, $mailbox, $msguid = $this->_resolve_event_identity($event);
             if ($msg_raw = $this->bonnie_api->rawdata('event', $uid, $event'rev', $mailbox, $msguid)) {
                 // parse the message and find the part with the matching content-id
                 $message = rcube_mime::parse_message($msg_raw);
@@ -1963,9 +1945,9 @@
     /**
      * Create instances of a recurring event
      *
-     * @param array    Hash array with event properties
-     * @param DateTime Start date of the recurrence window
-     * @param DateTime End date of the recurrence window
+     * @param array    $event Hash array with event properties
+     * @param DateTime $start Start date of the recurrence window
+     * @param DateTime $end   End date of the recurrence window
      *
      * @return array List of recurring event instances
      */
@@ -2027,7 +2009,7 @@
             'FREE'            => calendar::FREEBUSY_FREE,
             'BUSY-TENTATIVE'  => calendar::FREEBUSY_TENTATIVE,
             'X-OUT-OF-OFFICE' => calendar::FREEBUSY_OOF,
-            'OOF'             => calendar::FREEBUSY_OOF
+            'OOF'             => calendar::FREEBUSY_OOF,
         ;
 
         // ask kolab server first
@@ -2051,9 +2033,9 @@
             }
 
             unset($request, $response);
-        }
-        catch (Exception $e) {
-            PEAR::raiseError("Error fetching free/busy information: " . $e->getMessage());
+        } catch (Exception $e) {
+            rcube::raise_error($e);
+            return false;
         }
 
         // get free-busy url from contacts
@@ -2084,11 +2066,11 @@
             if ($fb = $ical->freebusy) {
                 $result = ;
                 foreach ($fb'periods' as $tuple) {
-                    list($from, $to, $type) = $tuple;
+                    $from, $to, $type = $tuple;
                     $result = 
                         $from->format('U'),
                         $to->format('U'),
-                        isset($fbtypemap$type) ? $fbtypemap$type : calendar::FREEBUSY_BUSY
+                        $fbtypemap$type ?? calendar::FREEBUSY_BUSY,
                     ;
                 }
 
@@ -2131,11 +2113,13 @@
         // trigger updates on folder
         $trigger = $cal->storage->trigger();
         if (is_object($trigger) && is_a($trigger, 'PEAR_Error')) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 900, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Failed triggering folder. Error was " . $trigger->getMessage()
+                    'message' => "Failed triggering folder. Error was " . $trigger->getMessage(),
                 ,
-                true, false
+                true,
+                false
             );
         }
 
@@ -2162,7 +2146,9 @@
         }
 
         // all-day events go from 12:00 - 13:00
-        if ($record'start' instanceof DateTimeInterface && $record'end' <= $record'start' && !empty($record'allday')) {
+        if (($record'start' instanceof DateTime || $record'start' instanceof DateTimeImmutable)
+            && $record'end' <= $record'start' && !empty($record'allday')
+        ) {
             $record'end' = clone $record'start';
             $record'end'->add(new DateInterval('PT1H'));
         }
@@ -2188,10 +2174,10 @@
         if (!empty($record'attendees')) {
             foreach ((array) $record'attendees' as $i => $attendee) {
                 if (isset($attendee'delegated-from') && is_array($attendee'delegated-from')) {
-                    $record'attendees'$i'delegated-from' = join(', ', $attendee'delegated-from');
+                    $record'attendees'$i'delegated-from' = implode(', ', $attendee'delegated-from');
                 }
                 if (isset($attendee'delegated-to') && is_array($attendee'delegated-to')) {
-                    $record'attendees'$i'delegated-to' = join(', ', $attendee'delegated-to');
+                    $record'attendees'$i'delegated-to' = implode(', ', $attendee'delegated-to');
                 }
             }
         }
@@ -2216,8 +2202,8 @@
             unset($record'recurrence');
         }
         // clean up exception data
-        else if (!empty($record'recurrence''EXCEPTIONS')) {
-            array_walk($record'recurrence''EXCEPTIONS', function(&$exception) {
+        elseif (!empty($record'recurrence''EXCEPTIONS')) {
+            array_walk($record'recurrence''EXCEPTIONS', function (&$exception) {
                 unset($exception'_mailbox', $exception'_msguid',
                     $exception'_formatobj', $exception'_attachments'
                 );
@@ -2274,7 +2260,7 @@
      *
      * @param array $event Hash array with event properties
      *
-     * @return array List of changes, each as a hash array
+     * @return array|false List of changes, each as a hash array
      * @see calendar_driver::get_event_changelog()
      */
     public function get_event_changelog($event)
@@ -2283,7 +2269,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+        $uid, $mailbox, $msguid = $this->_resolve_event_identity($event);
 
         $result = $this->bonnie_api->changelog('event', $uid, $mailbox, $msguid);
         if (is_array($result) && $result'uid' == $uid) {
@@ -2300,7 +2286,7 @@
      * @param mixed $rev1  Old Revision
      * @param mixed $rev2  New Revision
      *
-     * @return array List of property changes, each as a hash array
+     * @return array|false List of property changes, each as a hash array
      * @see calendar_driver::get_event_diff()
      */
     public function get_event_diff($event, $rev1, $rev2)
@@ -2309,7 +2295,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+        $uid, $mailbox, $msguid = $this->_resolve_event_identity($event);
 
         // get diff for the requested recurrence instance
         $instance_id = $event'id' != $uid ? substr($event'id', strlen($uid) + 1) : null;
@@ -2342,14 +2328,14 @@
             $special_changes = ;
 
             // map kolab event properties to keys the client expects
-            array_walk($result'changes', function(&$change, $i) use ($keymap, $prop_keymaps, $special_changes) {
+            array_walk($result'changes', function (&$change, $i) use ($keymap, $prop_keymaps, &$special_changes) {
                 if (array_key_exists($change'property', $keymap)) {
                     $change'property' = $keymap$change'property';
                 }
                 // translate free_busy values
                 if ($change'property' == 'free_busy') {
-                    $change'old' = !empty($old'old') ? 'free' : 'busy';
-                    $change'new' = !empty($old'new') ? 'free' : 'busy';
+                    $change'old' = !empty($change'old') ? 'free' : 'busy';
+                    $change'new' = !empty($change'new') ? 'free' : 'busy';
                 }
 
                 // map alarms trigger value
@@ -2392,8 +2378,7 @@
 
                 if ($change'property' == 'exdate') {
                     $special_changes'exdate' = $i;
-                }
-                else if ($change'property' == 'rdate') {
+                } elseif ($change'property' == 'rdate') {
                     $special_changes'rdate' = $i;
                 }
             });
@@ -2404,8 +2389,7 @@
                     $exdate = $result'changes'$special_changes$prop;
                     if (array_key_exists('recurrence', $special_changes)) {
                         $recurrence = &$result'changes'$special_changes'recurrence';
-                    }
-                    else {
+                    } else {
                         $i = count($result'changes');
                         $result'changes'$i = 'property' => 'recurrence', 'old' => , 'new' => ;
                         $recurrence = &$result'changes'$i'recurrence';
@@ -2426,10 +2410,10 @@
     /**
      * Return full data of a specific revision of an event
      *
-     * @param array Hash array with event properties
-     * @param mixed $rev Revision number
+     * @param array $event Hash array with event properties
+     * @param mixed $rev   Revision number
      *
-     * @return array Event object as hash array
+     * @return array|false Event object as hash array
      * @see calendar_driver::get_event_revison()
      */
     public function get_event_revison($event, $rev, $internal = false)
@@ -2441,11 +2425,12 @@
         $eventid = $event'id';
         $calid   = $event'calendar';
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+        $uid, $mailbox, $msguid = $this->_resolve_event_identity($event);
 
         // call Bonnie API
         $result = $this->bonnie_api->get('event', $uid, $rev, $mailbox, $msguid);
         if (is_array($result) && $result'uid' == $uid && !empty($result'xml')) {
+            /** @var kolab_format_event $format */
             $format = kolab_format::factory('event');
             $format->load($result'xml');
             $event = $format->to_array();
@@ -2458,8 +2443,7 @@
                 // check for recurrence exception first
                 if ($instance = $format->get_instance($instance_id)) {
                     $event = $instance;
-                }
-                else {
+                } else {
                     // not a exception, compute recurrence...
                     $event'_formatobj' = $format;
                     $recurrence_date = rcube_utils::anytodatetime($instance_id, $event'start'->getTimezone());
@@ -2500,7 +2484,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_event_identity($event);
+        $uid, $mailbox, $msguid = $this->_resolve_event_identity($event);
 
         $calendar = $this->get_calendar($event'calendar');
         $success  = false;
@@ -2544,8 +2528,7 @@
                     $uid = $ev'uid';
                 }
             }
-        }
-        else {
+        } else {
             $uid = $event;
 
             // get event object from storage in order to get the real object uid an msguid
@@ -2556,15 +2539,15 @@
             }
         }
 
-        return array($uid, $mailbox, $msguid);
+        return $uid, $mailbox, $msguid;
     }
 
     /**
      * Callback function to produce driver-specific calendar create/edit form
      *
-     * @param string Request action 'form-edit|form-new'
-     * @param array  Calendar properties (e.g. id, color)
-     * @param array  Edit form fields
+     * @param string $action     Request action 'form-edit|form-new'
+     * @param array  $calendar   Calendar properties (e.g. id, color)
+     * @param array  $formfields Edit form fields
      *
      * @return string HTML content of the form
      */
@@ -2573,7 +2556,7 @@
         $special_calendars = 
             self::BIRTHDAY_CALENDAR_ID,
             self::INVITATIONS_CALENDAR_PENDING,
-            self::INVITATIONS_CALENDAR_DECLINED
+            self::INVITATIONS_CALENDAR_DECLINED,
         ;
 
         // show default dialog for birthday calendar
@@ -2596,8 +2579,7 @@
         if (!empty($calendar'id') && ($cal = $this->calendars$calendar'id')) {
             $folder = $cal->get_realname(); // UTF7
             $color  = $cal->get_color();
-        }
-        else {
+        } else {
             $folder = '';
             $color  = '';
         }
@@ -2614,8 +2596,7 @@
             $path_imap = implode($delim, $path_imap);
 
             $options = $storage->folder_info($folder);
-        }
-        else {
+        } else {
             $path_imap = '';
         }
 
@@ -2628,9 +2609,9 @@
         $protected = !empty($options) && (!empty($options'norename') || !empty($options'protected'));
         // Disable folder name input
         if ($protected) {
-            $input_name = new html_hiddenfield('name' => 'name', 'id' => 'calendar-name');
+            $input_name = new html_hiddenfield('name' => 'name', 'id' => 'calendar-name', 'value' => $folder);
             $formfields'name''value' = $this->storage->object_name($folder)
-                . $input_name->show($folder);
+                . $input_name->show();
         }
 
         // calendar name (default field)
@@ -2639,8 +2620,7 @@
         if ($protected) {
             // prevent user from moving folder
             $hidden_fields = 'name' => 'parent', 'value' => $path_imap;
-        }
-        else {
+        } else {
             $select = $this->storage->folder_selector('event', 'name' => 'parent', 'id' => 'calendar-parent', $folder);
 
             $form'props''fields''path' = 
@@ -2667,5 +2647,7 @@
             $db->query("DELETE FROM " . $this->rc->db->table_name($table, true)
                 . " WHERE `user_id` = ?", $args'user'->ID);
         }
+
+        return $args;
     }
 }

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

@@ -34,6 +34,7 @@
     public $categories    = ;
     public $name          = 'Invitations';
 
+    protected $cal;
 
     /**
      * Default constructor
@@ -44,19 +45,19 @@
         $this->id  = $id;
 
         switch ($this->id) {
-        case kolab_driver::INVITATIONS_CALENDAR_PENDING:
-            $this->partstats = 'NEEDS-ACTION';
-            $this->name      = $this->cal->gettext('invitationspending');
+            case kolab_driver::INVITATIONS_CALENDAR_PENDING:
+                $this->partstats = 'NEEDS-ACTION';
+                $this->name      = $this->cal->gettext('invitationspending');
 
-            if (!empty($_REQUEST'_quickview')) {
-                $this->partstats = 'TENTATIVE';
-            }
-            break;
+                if (!empty($_REQUEST'_quickview')) {
+                    $this->partstats = 'TENTATIVE';
+                }
+                break;
 
-        case kolab_driver::INVITATIONS_CALENDAR_DECLINED:
-            $this->partstats = 'DECLINED';
-            $this->name      = $this->cal->gettext('invitationsdeclined');
-            break;
+            case kolab_driver::INVITATIONS_CALENDAR_DECLINED:
+                $this->partstats = 'DECLINED';
+                $this->name      = $this->cal->gettext('invitationsdeclined');
+                break;
         }
 
         // user-specific alarms settings win
@@ -117,7 +118,7 @@
     /**
      * Getter for the Cyrus mailbox identifier corresponding to this folder
      *
-     * @return string Mailbox ID
+     * @return ?string Mailbox ID
      */
     public function get_mailbox_id()
     {
@@ -212,8 +213,7 @@
         // find the actual folder this event resides in
         if (!empty($event'_folder_id')) {
             $cal = $this->cal->driver->get_calendar($event'_folder_id');
-        }
-        else {
+        } else {
             $cal = null;
             foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
                 $cal = $this->_get_calendar($foldername);
@@ -231,15 +231,15 @@
     }
 
     /**
-     * @param int    Event's new start (unix timestamp)
-     * @param int    Event's new end (unix timestamp)
-     * @param string Search query (optional)
-     * @param bool   Include virtual events (optional)
-     * @param array  Additional parameters to query storage
+     * @param int    $start   Event's new start (unix timestamp)
+     * @param int    $end     Event's new end (unix timestamp)
+     * @param string $search  Search query (optional)
+     * @param bool   $virtual Include virtual events (optional)
+     * @param array  $query   Additional parameters to query storage
      *
      * @return array A list of event records
      */
-    public function list_events($start, $end, $search = null, $virtual = 1, $query = )
+    public function list_events($start, $end, $search = null, $virtual = true, $query = )
     {
         // get email addresses of the current user
         $user_emails = $this->cal->get_user_emails();
@@ -292,9 +292,9 @@
     /**
      * Get number of events in the given calendar
      *
-     * @param int   Date range start (unix timestamp)
-     * @param int   Date range end (unix timestamp)
-     * @param array Additional query to filter events
+     * @param int   $start  Date range start (unix timestamp)
+     * @param int   $end    Date range end (unix timestamp)
+     * @param array $filter Additional query to filter events
      *
      * @return int Count
      */
@@ -312,7 +312,7 @@
 
         $filter = 
             'tags', '!=', 'x-status:cancelled',
-            $subquery, 'OR'
+            $subquery, 'OR',
         ;
 
         // aggregate counts from all calendar folders

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_user_calendar.php Changed

@@ -45,12 +45,10 @@
         if (is_array($user_or_folder)) {
             $this->userdata = $user_or_folder;
             $this->storage = new kolab_storage_folder_user($this->userdata'kolabtargetfolder', '', $this->userdata);
-        }
-        else if ($user_or_folder instanceof kolab_storage_folder_user) {
+        } elseif ($user_or_folder instanceof kolab_storage_folder_user) {
             $this->storage  = $user_or_folder;
             $this->userdata = $this->storage->ldaprec;
-        }
-        else {
+        } else {
             // get user record from LDAP
             $this->storage  = new kolab_storage_folder_user($user_or_folder);
             $this->userdata = $this->storage->ldaprec;
@@ -62,9 +60,9 @@
         if ($this->ready) {
             // ID is derrived from the user's kolabtargetfolder attribute
             $this->id          = kolab_storage::folder_id($this->userdata'kolabtargetfolder', true);
-            $this->imap_folder = $this->userdata'kolabtargetfolder';
             $this->name        = $this->storage->name;
             $this->parent      = '';  // user calendars are top level
+            // $this->imap_folder = $this->userdata'kolabtargetfolder';
 
             // user-specific alarms settings win
             $prefs = $this->cal->rc->config->get('kolab_calendars', );
@@ -91,7 +89,7 @@
     /**
      * Getter for the IMAP folder owner
      *
-     * @param bool Return a fully qualified owner name (unused)
+     * @param bool $fully_qualified Return a fully qualified owner name (unused)
      *
      * @return string Name of the folder owner
      */
@@ -187,7 +185,7 @@
     public function get_event($id)
     {
         // TODO: implement this
-        return isset($this->events$id) ? $this->events$id : null;
+        return $this->events$id ?? null;
     }
 
     /**
@@ -208,28 +206,26 @@
     }
 
     /**
-     * @param int    Event's new start (unix timestamp)
-     * @param int    Event's new end (unix timestamp)
-     * @param string Search query (optional)
-     * @param bool   Include virtual events (optional)
-     * @param array  Additional parameters to query storage
-     * @param array  Additional query to filter events
+     * @param int    $start        Event's new start (unix timestamp)
+     * @param int    $end          Event's new end (unix timestamp)
+     * @param string $search       Search query (optional)
+     * @param bool   $virtual      Include virtual events (optional)
+     * @param array  $query        Additional parameters to query storage
+     * @param array  $filter_query Additional query to filter events
      *
      * @return array A list of event records
      */
-    public function list_events($start, $end, $search = null, $virtual = 1, $query = , $filter_query = null)
+    public function list_events($start, $end, $search = null, $virtual = true, $query = , $filter_query = null)
     {
         // convert to DateTime for comparisons
         try {
-            $start_dt = new DateTime('@'.$start);
-        }
-        catch (Exception $e) {
+            $start_dt = new DateTime('@' . $start);
+        } catch (Exception $e) {
             $start_dt = new DateTime('@0');
         }
         try {
-            $end_dt = new DateTime('@'.$end);
-        }
-        catch (Exception $e) {
+            $end_dt = new DateTime('@' . $end);
+        } catch (Exception $e) {
             $end_dt = new DateTime('today +10 years');
         }
 
@@ -238,8 +234,10 @@
         if (!empty($query)) {
             foreach ($query as $q) {
                 if ($q0 == 'changed' && $q1 == '>=') {
-                    try { $limit_changed = new DateTime('@'.$q2); }
-                    catch (Exception $e) { /* ignore */ }
+                    try {
+                        $limit_changed = new DateTime('@' . $q2);
+                    } catch (Exception $e) { /* ignore */
+                    }
                 }
             }
         }
@@ -281,11 +279,11 @@
     /**
      * Get number of events in the given calendar
      *
-     * @param int   Date range start (unix timestamp)
-     * @param int   Date range end (unix timestamp)
-     * @param array Additional query to filter events
+     * @param int   $start        Date range start (unix timestamp)
+     * @param int   $end          Date range end (unix timestamp)
+     * @param array $filter_query Additional query to filter events
      *
-     * @return integer Count
+     * @return int Count
      */
     public function count_events($start, $end = null, $filter_query = null)
     {
@@ -318,13 +316,14 @@
             }
 
             unset($request, $response);
-        }
-        catch (Exception $e) {
-            rcube::raise_error(
+        } catch (Exception $e) {
+            rcube::raise_error(
+                
                     'code' => 900, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error fetching free/busy information: " . $e->getMessage()
+                    'message' => "Error fetching free/busy information: " . $e->getMessage(),
                 ,
-                true, false
+                true,
+                false
             );
 
             return false;
@@ -360,7 +359,7 @@
                 }
 
                 foreach ($fb'periods' as $tuple) {
-                    list($from, $to, $type) = $tuple;
+                    $from, $to, $type = $tuple;
                     $event = 
                         'uid'       => md5($this->id . $from->format('U') . '/' . $to->format('U')),
                         'calendar'  => $this->id,
@@ -372,7 +371,7 @@
                         'className' => 'fc-type-freebusy',
                         'organizer' => 
                             'email' => $this->userdata'mail',
-                            'name'  => isset($this->userdata'displayname') ? $this->userdata'displayname' : null,
+                            'name'  => $this->userdata'displayname' ?? null,
                         ,
                     ;

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/ldap/resources_driver_ldap.php Changed

@@ -32,7 +32,7 @@
     /**
      * Default constructor
      */
-    function __construct($cal)
+    public function __construct($cal)
     {
         $this->cal = $cal;
         $this->rc = $cal->rc;
@@ -59,12 +59,11 @@
         if (isset($query)) {
             $mode = $searchField == 'owner' ? rcube_addressbook::SEARCH_STRICT : 0;
             $results = $ldap->search($searchField, $query, $mode, true, true);
-        }
-        else {
+        } else {
             $results = $ldap->list_records();
         }
 
-        if ($results instanceof ArrayAccess) {
+        if ($results instanceof Iterator) {
             foreach ($results as $i => $rec) {
                 $results$i = $this->decode_resource($rec);
             }
@@ -76,7 +75,7 @@
     /**
      * Return properties of a single resource
      *
-     * @param string $id Unique resource identifier
+     * @param string $dn Unique resource identifier
      *
      * @return array Resource object as hash array
      */
@@ -130,8 +129,7 @@
                 if (!empty($sattr) && $sattr0 === '{') {
                     $attr = @json_decode($sattr, true);
                     $attributes += $attr;
-                }
-                else if (!empty($sattr) && empty($rec'description')) {
+                } elseif (!empty($sattr) && empty($rec'description')) {
                     $rec'description' = $sattr;
                 }
             }

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/resources_driver.php Changed

roundcubemail-1.5.tar.gz/plugins/calendar/lib/calendar_itip.php Changed

@@ -31,7 +31,7 @@
     /**
      * Constructor to set text domain to calendar
      */
-    function __construct($plugin, $domain = 'calendar')
+    public function __construct($plugin, $domain = 'calendar')
     {
         parent::__construct($plugin, $domain);
 
@@ -93,8 +93,7 @@
             foreach ($invitation'event''attendees' as $i => $attendee) {
                 if ($attendee'role' == 'ORGANIZER') {
                     $organizer = $attendee;
-                }
-                else if ($attendee'email' == $email) {
+                } elseif ($attendee'email' == $email) {
                     // nothing to be done here
                     if ($attendee'status' == $newstatus) {
                         return true;
@@ -114,11 +113,10 @@
                     $mailto = !empty($organizer'name') ? $organizer'name' : $organizer'email';
                     $message = $this->plugin->gettext(
                             'name' => 'sentresponseto',
-                            'vars' => 'mailto' => $mailto
+                            'vars' => 'mailto' => $mailto,
                     );
                     $this->rc->output->command('display_message', $message, 'confirmation');
-                }
-                else {
+                } else {
                     $this->rc->output->command('display_message', $this->plugin->gettext('itipresponseerror'), 'error');
                 }
             }
@@ -144,7 +142,7 @@
      * @param array  $event    Hash array with event properties
      * @param string $attendee Attendee email address
      *
-     * @return string Invitation token
+     * @return string|false Invitation token
      */
     public function store_invitation($event, $attendee)
     {
@@ -200,8 +198,8 @@
         $this->rc->db->query(
             "UPDATE $this->db_itipinvitations SET `cancelled` = 1"
             . " WHERE `event_uid` = ? AND `user_id` = ?",
-           $event_uid,
-           $this->rc->user->ID
+            $event_uid,
+            $this->rc->user->ID
         );
     }
 
@@ -230,7 +228,7 @@
      */
     public function decode_token($token)
     {
-        list($base, $mail, $hash) = explode('.', $token);
+        $base, $mail, $hash = explode('.', $token);
 
         // validate and return parts
         if ($mail && $hash && $hash == substr(md5($base . $mail . $this->rc->config->get('des_key')), 0, 6)) {

roundcubemail-1.5.tar.gz/plugins/calendar/lib/calendar_nextcloud_api.php Changed

@@ -22,13 +22,12 @@
  */
 class calendar_nextcloud_api
 {
-
-    const PARTICIPANT_OWNER             = 1;
-    const PARTICIPANT_MODERATOR         = 2;
-    const PARTICIPANT_USER              = 3;
-    const PARTICIPANT_GUEST             = 4;
-    const PARTICIPANT_PUBLIC            = 5;
-    const PARTICIPANT_GUEST_MODERATOR   = 6;
+    public const PARTICIPANT_OWNER             = 1;
+    public const PARTICIPANT_MODERATOR         = 2;
+    public const PARTICIPANT_USER              = 3;
+    public const PARTICIPANT_GUEST             = 4;
+    public const PARTICIPANT_PUBLIC            = 5;
+    public const PARTICIPANT_GUEST_MODERATOR   = 6;
 
 
     /**
@@ -66,8 +65,7 @@
             if (!empty($params)) {
                 if ($method == 'POST') {
                     $request->addPostParameter($params);
-                }
-                else {
+                } else {
                     $request->setUrl($url . '?' . http_build_query($params));
                 }
             }
@@ -91,14 +89,12 @@
                 $doc->loadXML($body);
                 $code = $doc->getElementsByTagName('statuscode')->item(0)->textContent;
                 $msg = $doc->getElementsByTagName('message')->item(0)->textContent;
-            }
-            else {
+            } else {
                 $msg = 'Unknown error';
             }
 
             throw new Exception("Nextcloud API Error: $code $msg");
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, false);
         }

roundcubemail-1.5.tar.gz/plugins/calendar/lib/calendar_ui.php Changed

@@ -25,16 +25,27 @@
 
 class calendar_ui
 {
+    public $screen;
+    public $action;
+    public $calendar;
+
+    /** @var rcmail */
     private $rc;
+
+    /** @var calendar Calendar plugin */
     private $cal;
+
+    /** @var bool */
     private $ready = false;
 
-    public $screen;
-    public $action;
-    public $calendar;
 
 
-    function __construct($cal)
+    /**
+     * Object constructor
+     *
+     * @param calendar $cal Calendar plugin
+     */
+    public function __construct($cal)
     {
         $this->cal    = $cal;
         $this->rc     = $cal->rc;
@@ -52,13 +63,14 @@
         }
 
         // add taskbar button
-        $this->cal->add_button(
+        $this->cal->add_button(
+            
                 'command'    => 'calendar',
                 'class'      => 'button-calendar',
                 'classsel'   => 'button-calendar button-selected',
                 'innerclass' => 'button-inner',
                 'label'      => 'calendar.calendar',
-                'type'       => 'link'
+                'type'       => 'link',
             ,
             'taskbar'
         );
@@ -115,7 +127,7 @@
     public function addCSS()
     {
         $skin_path = $this->cal->local_skin_path();
- 
+
         if (
             $this->rc->task == 'calendar'
             && (!$this->rc->action || in_array($this->rc->action, 'index', 'print'))
@@ -141,8 +153,7 @@
 
         if ($this->rc->task == 'calendar' && $this->rc->action == 'print') {
             $this->cal->include_script('print.js');
-        }
-        else {
+        } else {
             $this->rc->output->include_script('treelist.js');
             $this->cal->api->include_script('libkolab/libkolab.js');
             $this->cal->include_script('calendar_ui.js');
@@ -153,7 +164,7 @@
     /**
      * Add custom style for the calendar UI
      */
-    function calendar_css($attrib = )
+    public function calendar_css($attrib = )
     {
         $categories    = $this->cal->driver->list_categories();
         $calendars     = $this->cal->driver->list_calendars();
@@ -208,7 +219,7 @@
     /**
      * Generate HTML content of the calendars list (or metadata only)
      */
-    function calendar_list($attrib = , $js_only = false)
+    public function calendar_list($attrib = , $js_only = false)
     {
         $html      = '';
         $jsenv     = ;
@@ -216,6 +227,7 @@
         $calendars = $this->cal->driver->list_calendars(0, $tree);
 
         // walk folder tree
+        // @phpstan-ignore-next-line
         if (is_object($tree)) {
             $html = $this->list_tree_html($tree, $calendars, $jsenv, $attrib);
 
@@ -223,12 +235,10 @@
             if (!empty($calendarscalendar_driver::BIRTHDAY_CALENDAR_ID)) {
                 $bdaycal = $calendarscalendar_driver::BIRTHDAY_CALENDAR_ID;
                 $calendars = calendar_driver::BIRTHDAY_CALENDAR_ID => $bdaycal;
-            }
-            else {
+            } else {
                 $calendars = ;  // clear array for flat listing
             }
-        }
-        else if (isset($attrib'class')) {
+        } elseif (isset($attrib'class')) {
             // fall-back to flat folder listing
             $attrib'class' .= ' flat';
         }
@@ -241,7 +251,7 @@
             $li_content = $this->calendar_list_item($id, $prop, $jsenv, !empty($attrib'activeonly'));
             $li_attr = 
                 'id'    => 'rcmlical' . $id,
-                'class' => isset($prop'group') ? $prop'group' : null,
+                'class' => $prop'group' ?? null,
             ;
 
             $html .= html::tag('li', $li_attr, $li_content);
@@ -273,7 +283,9 @@
             $content = $this->calendar_list_item($id, $prop, $jsenv, !empty($attrib'activeonly'));
 
             if (!empty($folder->children)) {
-                $content .= html::tag('ul', 'style' => $is_collapsed ? "display:none;" : null,
+                $content .= html::tag(
+                    'ul',
+                    'style' => $is_collapsed ? "display:none;" : null, // @phpstan-ignore-line
                     $this->list_tree_html($folder, $data, $jsenv, $attrib)
                 );
             }
@@ -304,9 +316,10 @@
             $prop'freebusy'    = $this->cal->driver->freebusy;
             $prop'attachments' = $this->cal->driver->attachments;
             $prop'undelete'    = $this->cal->driver->undelete;
-            $prop'feedurl'     = $this->cal->get_url(
+            $prop'feedurl'     = $this->cal->get_url(
+                
                     '_cal'   => $this->cal->ical_feed_hash($id) . '.ics',
-                    'action' => 'feed'
+                    'action' => 'feed',
                 
             );
 
@@ -315,20 +328,17 @@
 
         if (!empty($prop'title')) {
             $title = $prop'title';
-        }
-        else if ($prop'name' != $prop'listname' || strlen($prop'name') > 25) {
+        } elseif ($prop'name' != $prop'listname' || strlen($prop'name') > 25) {
             $title = html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET);
-        }
-        else {
+        } else {
             $title = '';
         }
 
-        $classes = 'calendar', 'cal-'  . asciiwords($id, true);
+        $classes = 'calendar', 'cal-' . asciiwords($id, true);
 
         if (!empty($prop'virtual')) {
             $classes = 'virtual';
-        }
-        else if (empty($prop'editable')) {
+        } elseif (empty($prop'editable')) {
             $classes = 'readonly';
         }
         if (!empty($prop'subscribed')) {
@@ -356,32 +366,38 @@
                 $actions = '';
 
                 if (!empty($prop'removable')) {
-                    $actions .= html::a(
+                    $actions .= html::a(
+                        
                             'href'  => '#',
                             'class' => 'remove',
-                            'title' => $this->cal->gettext('removelist')
-                        , ' '
+                            'title' => $this->cal->gettext('removelist'),
+                        ,
+                        ' '
                     );
                 }
 
-                $actions .= html::a(
+                $actions .= html::a(
+                    
                         'href'  => '#',
                         'class' => 'quickview',
                         'title' => $this->cal->gettext('quickview'),
                         'role'  => 'checkbox',
-                        'aria-checked' => 'false'
-                    , ''
+                        'aria-checked' => 'false',
+                    ,
+                    ''
                 );
 
                 if (!isset($prop'subscriptions') || $prop'subscriptions' !== false) {
                     if (!empty($prop'subscribed')) {
-                        $actions .= html::a(
+                        $actions .= html::a(
+                            
                                 'href'  => '#',
                                 'class' => 'subscribed',
                                 'title' => $this->cal->gettext('calendarsubscribe'),
                                 'role'  => 'checkbox',
-                                'aria-checked' => !empty($prop'subscribed') ? 'true' : 'false'
-                            , ' '
+                                'aria-checked' => !empty($prop'subscribed') ? 'true' : 'false',
+                            ,
+                            ' '
                         );
                     }
                 }
@@ -391,13 +407,13 @@
                         'name'    => '_cal',
                         'value'   => $id,
                         'checked' => !empty($prop'active'),
-                        'aria-labelledby' => $label_id
+                        'aria-labelledby' => $label_id,
                     )
                     . html::span('actions', $actions)
                     . html::span('class' => 'handle', 'style' => "background-color: #$color", '&nbsp;');
             }
 
-            $content = html::div(join(' ', $classes), $content);
+            $content = html::div(implode(' ', $classes), $content);
         }
 
         return $content;
@@ -406,7 +422,7 @@
     /**
      * Render a HTML for agenda options form
      */
-    function agenda_options($attrib = )
+    public function agenda_options($attrib = )
     {
         $attrib += 'id' => 'agendaoptions';
         $attrib'style' = 'display:none';
@@ -418,8 +434,10 @@
             $select_range->add($days . ' ' . preg_replace('/$|$/', '', $this->cal->lib->gettext('days')), $days);
         }
 
-        $html = html::span('input-group',
-            html::label('for' => 'agenda-listrange', 'class' => 'input-group-prepend',
+        $html = html::span(
+            'input-group',
+            html::label(
+                'for' => 'agenda-listrange', 'class' => 'input-group-prepend',
                 html::span('input-group-text', $this->cal->gettext('listrange'))
             )
             . $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults'calendar_agenda_range'))
@@ -431,7 +449,7 @@
     /**
      * Render a HTML select box for calendar selection
      */
-    function calendar_select($attrib = )
+    public function calendar_select($attrib = )
     {
         $attrib'name'       = 'calendar';
         $attrib'is_escaped' = true;
@@ -453,7 +471,7 @@
     /**
      * Render a HTML select box for user identity selection
      */
-    function identity_select($attrib = )
+    public function identity_select($attrib = )
     {
         $attrib'name' = 'identity';
 
@@ -470,14 +488,14 @@
     /**
      * Render a HTML select box to select an event category
      */
-    function category_select($attrib = )
+    public function category_select($attrib = )
     {
         $attrib'name' = 'categories';
 
         $select = new html_select($attrib);
         $select->add('---', '');
         foreach (array_keys((array) $this->cal->driver->list_categories()) as $cat) {
-              $select->add($cat, $cat);
+            $select->add($cat, $cat);
         }
 
         return $select->show(null);
@@ -486,7 +504,7 @@
     /**
      * Render a HTML select box for status property
      */
-    function status_select($attrib = )
+    public function status_select($attrib = )
     {
         $attrib'name' = 'status';
 
@@ -502,7 +520,7 @@
     /**
      * Render a HTML select box for free/busy/out-of-office property
      */
-    function freebusy_select($attrib = )
+    public function freebusy_select($attrib = )
     {
         $attrib'name' = 'freebusy';
 
@@ -519,7 +537,7 @@
     /**
      * Render a HTML select for event priorities
      */
-    function priority_select($attrib = )
+    public function priority_select($attrib = )
     {
         $attrib'name' = 'priority';
 
@@ -533,7 +551,7 @@
         $select->add('6 ', '6');
         $select->add('7 ', '7');
         $select->add('8 ' . $this->cal->gettext('low'), '8');
-        $select->add('9 ' . $this->cal->gettext('lowest'),  '9');
+        $select->add('9 ' . $this->cal->gettext('lowest'), '9');
 
         return $select->show(null);
     }
@@ -541,7 +559,7 @@
     /**
      * Render HTML form for alarm configuration
      */
-    function alarm_select($attrib = )
+    public function alarm_select($attrib = )
     {
         return $this->cal->lib->alarm_select($attrib, $this->cal->driver->alarm_types, $this->cal->driver->alarm_absolute);
     }
@@ -549,7 +567,7 @@
     /**
      * Render HTML for attendee notification warning
      */
-    function edit_attendees_notify($attrib = )
+    public function edit_attendees_notify($attrib = )
     {
         $checkbox = new html_checkbox('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox');
         return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('sendnotifications')));
@@ -558,7 +576,7 @@
     /**
      * Render HTML for recurrence option to align start date with the recurrence rule
      */
-    function edit_recurrence_sync($attrib = )
+    public function edit_recurrence_sync($attrib = )
     {
         $checkbox = new html_checkbox('name' => '_start_sync', 'value' => 1, 'class' => 'pretty-checkbox');
         return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('eventstartsync')));
@@ -567,7 +585,7 @@
     /**
      * Generate the form for recurrence settings
      */
-    function recurring_event_warning($attrib = )
+    public function recurring_event_warning($attrib = )
     {
         $attrib'id' = 'edit-recurring-warning';
 
@@ -578,7 +596,8 @@
             . html::label(null, $radio->show('all', 'value' => 'all') . $this->cal->gettext('allevents')) . ' '
             . html::label(null, $radio->show('', 'value' => 'new') . $this->cal->gettext('saveasnew'));
 
-        return html::div($attrib,
+        return html::div(
+            $attrib,
             html::div('message', $this->cal->gettext('changerecurringeventwarning'))
             . html::div('savemode', $form)
         );
@@ -587,7 +606,7 @@
     /**
      * Form for uploading and importing events
      */
-    function events_import_form($attrib = )
+    public function events_import_form($attrib = )
     {
         if (empty($attrib'id')) {
             $attrib'id' = 'rcmImportForm';
@@ -606,39 +625,48 @@
                 'type'   => 'file',
                 'name'   => '_data',
                 'size'   => !empty($attrib'uploadfieldsize') ? $attrib'uploadfieldsize' : null,
-                'accept' => $accept
+                'accept' => $accept,
         );
 
         $select = new html_select('name' => '_range', 'id' => 'event-import-range');
-        $select->add(
+        $select->add(
+            
                 $this->cal->gettext('onemonthback'),
-                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>2),
-                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>3),
-                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>6),
-                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr'=>12),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 2),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 3),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 6),
+                $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 12),
                 $this->cal->gettext('all'),
             ,
             '1','2','3','6','12',0
         );
 
-        $html = html::div('form-section form-group row',
-            html::label('class' => 'col-sm-4 col-form-label', 'for' => 'importfile',
+        $html = html::div(
+            'form-section form-group row',
+            html::label(
+                'class' => 'col-sm-4 col-form-label', 'for' => 'importfile',
                 rcube::Q($this->rc->gettext('importfromfile'))
             )
-            . html::div('col-sm-8', $input->show()
+            . html::div(
+                'col-sm-8',
+                $input->show()
                 . html::div('hint', $this->rc->gettext('name' => 'maxuploadsize', 'vars' => 'size' => $max_filesize))
             )
         );
 
-        $html .= html::div('form-section form-group row',
-            html::label('for' => 'event-import-calendar', 'class' => 'col-form-label col-sm-4',
+        $html .= html::div(
+            'form-section form-group row',
+            html::label(
+                'for' => 'event-import-calendar', 'class' => 'col-form-label col-sm-4',
                 $this->cal->gettext('calendar')
             )
             . html::div('col-sm-8', $this->calendar_select('name' => 'calendar', 'id' => 'event-import-calendar'))
         );
 
-        $html .= html::div('form-section form-group row',
-            html::label('for' => 'event-import-range', 'class' => 'col-form-label col-sm-4',
+        $html .= html::div(
+            'form-section form-group row',
+            html::label(
+                'for' => 'event-import-range', 'class' => 'col-form-label col-sm-4',
                 $this->cal->gettext('importrange')
             )
             . html::div('col-sm-8', $select->show(1))
@@ -648,26 +676,31 @@
         $this->rc->output->add_label('import');
 
         return html::tag('p', null, $this->cal->gettext('importtext'))
-            . html::tag('form', 
+            . html::tag(
+                'form',
+                
                     'action'  => $this->rc->url('task' => 'calendar', 'action' => 'import_events'),
                     'method'  => 'post',
                     'enctype' => 'multipart/form-data',
-                    'id'      => $attrib'id'
-                , $html
+                    'id'      => $attrib'id',
+                ,
+                $html
             );
     }
 
     /**
      * Form to select options for exporting events
      */
-    function events_export_form($attrib = )
+    public function events_export_form($attrib = )
     {
         if (empty($attrib'id')) {
             $attrib'id' = 'rcmExportForm';
         }
 
-        $html = html::div('form-section form-group row',
-            html::label('for' => 'event-export-calendar', 'class' => 'col-sm-4 col-form-label',
+        $html = html::div(
+            'form-section form-group row',
+            html::label(
+                'for' => 'event-export-calendar', 'class' => 'col-sm-4 col-form-label',
                 $this->cal->gettext('calendar')
             )
             . html::div('col-sm-8', $this->calendar_select('name' => 'calendar', 'id' => 'event-export-calendar', 'class' => 'form-control custom-select'))
@@ -676,10 +709,11 @@
         $select = new html_select(
                 'name'  => 'range',
                 'id'    => 'event-export-range',
-                'class' => 'form-control custom-select rounded-right'
+                'class' => 'form-control custom-select rounded-right',
         );
 
-        $select->add(
+        $select->add(
+            
                 $this->cal->gettext('all'),
                 $this->cal->gettext('onemonthback'),
                 $this->cal->gettext('name' => 'nmonthsback', 'vars' => 'nr' => 2),
@@ -695,11 +729,13 @@
                 'name'  => 'start',
                 'size'  => 11,
                 'id'    => 'event-export-startdate',
-                'style' => 'display:none'
+                'style' => 'display:none',
         );
 
-        $html .= html::div('form-section form-group row',
-            html::label('for' => 'event-export-range', 'class' => 'col-sm-4 col-form-label',
+        $html .= html::div(
+            'form-section form-group row',
+            html::label(
+                'for' => 'event-export-range', 'class' => 'col-sm-4 col-form-label',
                 $this->cal->gettext('exportrange')
             )
             . html::div('col-sm-8 input-group', $select->show(0) . $startdate->show())
@@ -709,11 +745,13 @@
                 'name'  => 'attachments',
                 'id'    => 'event-export-attachments',
                 'value' => 1,
-                'class' => 'form-check-input pretty-checkbox'
+                'class' => 'form-check-input pretty-checkbox',
         );
 
-        $html .= html::div('form-section form-check row',
-            html::label('for' => 'event-export-attachments', 'class' => 'col-sm-4 col-form-label',
+        $html .= html::div(
+            'form-section form-check row',
+            html::label(
+                'for' => 'event-export-attachments', 'class' => 'col-sm-4 col-form-label',
                 $this->cal->gettext('exportattachments')
             )
             . html::div('col-sm-8', $checkbox->show(1))
@@ -721,10 +759,12 @@
 
         $this->rc->output->add_gui_object('exportform', $attrib'id');
 
-        return html::tag('form', $attrib + 
+        return html::tag(
+            'form',
+            $attrib + 
                 'action' => $this->rc->url('task' => 'calendar', 'action' => 'export_events'),
                 'method' => 'post',
-                'id'     => $attrib'id'
+                'id'     => $attrib'id',
             ,
             $html
         );
@@ -734,7 +774,7 @@
      * Handler for calendar form template.
      * The form content could be overriden by the driver
      */
-    function calendar_editform($action, $calendar = )
+    public function calendar_editform($action, $calendar = )
     {
         $this->action   = $action;
         $this->calendar = $calendar;
@@ -751,7 +791,7 @@
      * Handler for calendar form template.
      * The form content could be overriden by the driver
      */
-    function calendarform($attrib)
+    public function calendarform($attrib)
     {
         // compose default calendar form fields
         $input_name  = new html_inputfield('name' => 'name', 'id' => 'calendar-name', 'size' => 20);
@@ -760,12 +800,12 @@
         $formfields = 
             'name' => 
                 'label' => $this->cal->gettext('name'),
-                'value' => $input_name->show(isset($this->calendar'name') ? $this->calendar'name' : ''),
+                'value' => $input_name->show($this->calendar'name' ?? ''),
                 'id'    => 'calendar-name',
             ,
             'color' => 
                 'label' => $this->cal->gettext('color'),
-                'value' => $input_color->show(isset($this->calendar'color') ? $this->calendar'color' : ''),
+                'value' => $input_color->show($this->calendar'color' ?? ''),
                 'id'    => 'calendar-color',
             ,
         ;
@@ -781,7 +821,9 @@
         }
 
         // allow driver to extend or replace the form content
-        return html::tag('form', $attrib + 'action' => '#', 'method' => 'get', 'id' => 'calendarpropform',
+        return html::tag(
+            'form',
+            $attrib + 'action' => '#', 'method' => 'get', 'id' => 'calendarpropform',
             $this->cal->driver->calendar_form($this->action, $this->calendar, $formfields)
         );
     }
@@ -789,7 +831,7 @@
     /**
      * Render HTML for attendees table
      */
-    function attendees_list($attrib = )
+    public function attendees_list($attrib = )
     {
         // add "noreply" checkbox to attendees table only
         $invitations = strpos($attrib'id', 'attend') !== false;
@@ -803,7 +845,8 @@
         $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
 
         if ($invitations) {
-            $table->add_header('class' => 'invite', 'title' => $this->cal->gettext('sendinvitations'),
+            $table->add_header(
+                'class' => 'invite', 'title' => $this->cal->gettext('sendinvitations'),
                 $invite->show(1)
                 . html::label('edit-attendees-invite', html::span('inner', $this->cal->gettext('sendinvitations')))
             );
@@ -824,12 +867,12 @@
     /**
      * Render HTML for attendees adding form
      */
-    function attendees_form($attrib = )
+    public function attendees_form($attrib = )
     {
         $input = new html_inputfield(
                 'name'  => 'participant',
                 'id'    => 'edit-attendee-name',
-                'class' => 'form-control'
+                'class' => 'form-control',
         );
         $textarea = new html_textarea(
                 'name'  => 'comment',
@@ -837,25 +880,27 @@
                 'class' => 'form-control',
                 'rows'  => 4,
                 'cols'  => 55,
-                'title' => $this->cal->gettext('itipcommenttitle')
+                'title' => $this->cal->gettext('itipcommenttitle'),
         );
 
-        return html::div($attrib,
-            html::div('form-searchbar',
+        return html::div(
+            $attrib,
+            html::div(
+                'form-searchbar',
                 $input->show()
                 . ' ' .
                 html::tag('input', 
                         'type'  => 'button',
                         'class' => 'button',
                         'id'    => 'edit-attendee-add',
-                        'value' => $this->cal->gettext('addattendee')
+                        'value' => $this->cal->gettext('addattendee'),
                 )
                 . ' ' .
                 html::tag('input', 
                         'type'  => 'button',
                         'class' => 'button',
                         'id'    => 'edit-attendee-schedule',
-                        'value' => $this->cal->gettext('scheduletime') . '...'
+                        'value' => $this->cal->gettext('scheduletime') . '...',
                 )
             )
             . html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->cal->gettext('itipcomment')) . $textarea->show())
@@ -865,26 +910,28 @@
     /**
      * Render HTML for resources adding form
      */
-    function resources_form($attrib = )
+    public function resources_form($attrib = )
     {
         $input = new html_inputfield('name' => 'resource', 'id' => 'edit-resource-name', 'class' => 'form-control');
 
-        return html::div($attrib,
-            html::div('form-searchbar',
+        return html::div(
+            $attrib,
+            html::div(
+                'form-searchbar',
                 $input->show()
                 . ' ' .
                 html::tag('input', 
                         'type'  => 'button',
                         'class' => 'button',
                         'id'    => 'edit-resource-add',
-                        'value' => $this->cal->gettext('addresource')
+                        'value' => $this->cal->gettext('addresource'),
                 )
                 . ' ' .
                 html::tag('input', 
                         'type'  => 'button',
                         'class' => 'button',
                         'id'    => 'edit-resource-find',
-                        'value' => $this->cal->gettext('findresources') . '...'
+                        'value' => $this->cal->gettext('findresources') . '...',
                 )
             )
         );
@@ -893,7 +940,7 @@
     /**
      * Render HTML for resources list
      */
-    function resources_list($attrib = )
+    public function resources_list($attrib = )
     {
         $attrib += 'id' => 'calendar-resources-list';
 
@@ -913,14 +960,20 @@
         $this->rc->output->add_gui_object('resourceownerinfo', $attrib'id' . '-owner');
 
         // copy address book labels for owner details to client
-        $this->rc->output->add_label('name','firstname','surname','department','jobtitle','email','phone','address');
+        $this->rc->output->add_label('name', 'firstname', 'surname', 'department', 'jobtitle', 'email', 'phone', 'address');
 
         $table_attrib = 'id','class','style','width','summary','cellpadding','cellspacing','border';
 
         return html::tag('table', $attrib, html::tag('tbody', null, ''), $table_attrib)
-            . html::tag('table', 'id' => $attrib'id' . '-owner', 'style' => 'display:none' + $attrib,
-                html::tag('thead', null,
-                    html::tag('tr', null,
+            . html::tag(
+                'table',
+                'id' => $attrib'id' . '-owner', 'style' => 'display:none' + $attrib,
+                html::tag(
+                    'thead',
+                    null,
+                    html::tag(
+                        'tr',
+                        null,
                         html::tag('td', 'colspan' => 2, rcube::Q($this->cal->gettext('resourceowner')))
                     )
                 )
@@ -948,7 +1001,7 @@
      *
      * @return string HTML code for the gui object
      */
-    function resources_search_form($attrib)
+    public function resources_search_form($attrib)
     {
         $attrib += 
             'command'       => 'search-resource',
@@ -966,17 +1019,22 @@
     /**
      *
      */
-    function attendees_freebusy_table($attrib = )
+    public function attendees_freebusy_table($attrib = )
     {
         $table = new html_table('cols' => 2, 'border' => 0, 'cellspacing' => 0);
-        $table->add('attendees',
+        $table->add(
+            'attendees',
             html::tag('h3', 'boxtitle', $this->cal->gettext('tabattendees'))
             . html::div('timesheader', '&nbsp;')
             . html::div('id' => 'schedule-attendees-list', 'class' => 'attendees-list', '')
         );
-        $table->add('times',
-            html::div('scroll',
-                html::tag('table', 'id' => 'schedule-freebusy-times', 'border' => 0, 'cellspacing' => 0,
+        $table->add(
+            'times',
+            html::div(
+                'scroll',
+                html::tag(
+                    'table',
+                    'id' => 'schedule-freebusy-times', 'border' => 0, 'cellspacing' => 0,
                     html::tag('thead') . html::tag('tbody')
                 )
                 . html::div('id' => 'schedule-event-time', 'style' => 'display:none', '&nbsp;')
@@ -989,10 +1047,11 @@
     /**
      *
      */
-    function event_invitebox($attrib = )
+    public function event_invitebox($attrib = )
     {
         if (!empty($this->cal->event)) {
-            return html::div($attrib,
+            return html::div(
+                $attrib,
                 $this->cal->itip->itip_object_details_table($this->cal->event, $this->cal->itip->gettext('itipinvitation'))
                 . $this->cal->invitestatus
             );
@@ -1001,7 +1060,7 @@
         return '';
     }
 
-    function event_rsvp_buttons($attrib = )
+    public function event_rsvp_buttons($attrib = )
     {
         $actions = 'accepted', 'tentative', 'declined';

roundcubemail-1.5.tar.gz/plugins/calendar/localization/bg_BG.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/ca_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/cs_CZ.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/da_DK.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/de.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/de_CH.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/de_DE.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/el.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/es_AR.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/es_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/et_EE.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/fi_FI.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/fr_FR.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/hr_HR.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/hu_HU.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/it_IT.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/ja_JP.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/ko_KR.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/lv.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/nl_NL.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/pl.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/pl_PL.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/pt_BR.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/pt_PT.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/ru_RU.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/sk_SK.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/sl_SI.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/sv.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/sv_SE.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/th_TH.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/uk_UA.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/localization/zh_CN.inc Changed

roundcubemail-1.5.tar.gz/plugins/calendar/tests Deleted

roundcubemail-1.5.tar.gz/plugins/calendar/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/config.inc.php Changed

@@ -20,7 +20,7 @@
  */
 
 // available methods/providers. Supported methods are: 'totp','hotp','yubikey'
-$config'kolab_2fa_drivers' = array('totp');
+$config'kolab_2fa_drivers' = 'totp';
 
 // backend for storing 2-factor-auth related per-user settings
 // available backends are: 'roundcube', 'ldap', 'sql'
@@ -28,9 +28,9 @@
 
 // additional config options for the above storage backend
 // here an example for the LDAP backend:
-$config'kolab_2fa_storage_config' = array(
+$config'kolab_2fa_storage_config' = 
     'debug'     => false,
-    'hosts'     => array('localhost'),
+    'hosts'     => 'localhost',
     'port'      => 389,
     'bind_dn'   => 'uid=kolab-auth-service,ou=Special Users,dc=example,dc=org',
     'bind_pass' => 'Welcome2KolabSystems',
@@ -39,7 +39,7 @@
     'filter'    => '(&(objectClass=ipaToken)(objectclass=ldapSubEntry)(ipatokenOwner=%fu))',
     'scope'     => 'sub',
     // translates driver properties to LDAP attributes
-    'fieldmap'  => array(
+    'fieldmap'  => 
         'label'    => 'cn',
         'id'       => 'ipatokenUniqueID',
         'active'   => 'ipatokenDisabled',
@@ -50,49 +50,49 @@
         'counter'  => 'ipatokenHOTPcounter',
         'digest'   => 'ipatokenOTPalgorithm',
         'digits'   => 'ipatokenOTPdigits',
-    ),
+    ,
     // LDAP object classes derived from factor IDs (prefix)
     // will be translated into the %c placeholder
-    'classmap' => array(
+    'classmap' => 
         'totp:' => 'ipatokenTOTP',
         'hotp:' => 'ipatokenHOTP',
         '*'     => 'ipaToken',
-    ),
+    ,
     // translates property values into LDAP attribute values and vice versa
-    'valuemap' => array(
-        'active' => array(
+    'valuemap' => 
+        'active' => 
             false   => 'TRUE',
             true    => 'FALSE',
-        ),
-    ),
+        ,
+    ,
     // specify non-string data types for properties for implicit conversion
-    'attrtypes' => array(
+    'attrtypes' => 
         'created' => 'datetime',
         'counter' => 'integer',
         'digits'  => 'integer',
-    ),
+    ,
     // apply these default values to factor records if not specified by the drivers
-    'defaults' => array(
+    'defaults' => 
         'active' => false,
         // these are required for ipatokenHOTP records and should match the kolab_2fa_hotp parameters
         'digest' => 'sha1',
         'digits' => 6,
-    ),
+    ,
     // use this LDAP attribute to compose DN values for factor entries
     'rdn'       => 'ipatokenUniqueID',
     // assign these object classes to new factor entries
-    'objectclass' => array(
+    'objectclass' => 
         'top',
         'ipaToken',
         '%c',
         'ldapSubEntry',
-    ),
+    ,
     // add these roles to the user's LDAP record if key prefix-matches a factor entry
-    'user_roles' => array(
+    'user_roles' => 
         'totp:' => 'cn=totp-user,dc=example,dc=org',
         'hotp:' => 'cn=hotp-user,dc=example,dc=org',
-    ),
-);
+    ,
+;
 
 // force a lookup for active authentication factors for this user.
 // to be set by another plugin (e.g. kolab_auth based on LDAP roles)
@@ -102,24 +102,24 @@
 $config'kolab_2fa_timeout' = 120;
 
 // configuration parameters for TOTP (uncomment to adjust)
-$config'kolab_2fa_totp' = array(
+$config'kolab_2fa_totp' = 
     // 'digits'   => 6,
     // 'interval' => 30,
     // 'digest'   => 'sha1',
     // 'issuer'   => 'Roundcube',
-);
+;
 
 // configuration parameters for HOTP (uncomment to adjust)
-$config'kolab_2fa_hotp' = array(
+$config'kolab_2fa_hotp' = 
     // 'digits' => 6,
     // 'window' => 4,
     // 'digest' => 'sha1',
-);
+;
 
 // configuration parameters for Yubikey (uncomment to adjust)
-$config'kolab_2fa_yubikey' = array(
+$config'kolab_2fa_yubikey' = 
     'clientid' => '123456',
     'apikey' => '<your-server-api-key>',
     // 'hosts'  => array('api.myhost1.com','api2.myhost.com'),
     'use_https' => true,  // connect via https if set to true
-);
\ No newline at end of file
+;

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/config.inc.php.dist Changed

@@ -20,7 +20,7 @@
  */
 
 // available methods/providers. Supported methods are: 'totp','hotp','yubikey'
-$config'kolab_2fa_drivers' = array('totp');
+$config'kolab_2fa_drivers' = 'totp';
 
 // backend for storing 2-factor-auth related per-user settings
 // available backends are: 'roundcube', 'ldap', 'sql'
@@ -28,9 +28,9 @@
 
 // additional config options for the above storage backend
 // here an example for the LDAP backend:
-$config'kolab_2fa_storage_config' = array(
+$config'kolab_2fa_storage_config' = 
     'debug'     => false,
-    'hosts'     => array('localhost'),
+    'hosts'     => 'localhost',
     'port'      => 389,
     'bind_dn'   => 'uid=kolab-auth-service,ou=Special Users,dc=example,dc=org',
     'bind_pass' => 'Welcome2KolabSystems',
@@ -39,7 +39,7 @@
     'filter'    => '(&(objectClass=ipaToken)(objectclass=ldapSubEntry)(ipatokenOwner=%fu))',
     'scope'     => 'sub',
     // translates driver properties to LDAP attributes
-    'fieldmap'  => array(
+    'fieldmap'  => 
         'label'    => 'cn',
         'id'       => 'ipatokenUniqueID',
         'active'   => 'ipatokenDisabled',
@@ -50,49 +50,49 @@
         'counter'  => 'ipatokenHOTPcounter',
         'digest'   => 'ipatokenOTPalgorithm',
         'digits'   => 'ipatokenOTPdigits',
-    ),
+    ,
     // LDAP object classes derived from factor IDs (prefix)
     // will be translated into the %c placeholder
-    'classmap' => array(
+    'classmap' => 
         'totp:' => 'ipatokenTOTP',
         'hotp:' => 'ipatokenHOTP',
         '*'     => 'ipaToken',
-    ),
+    ,
     // translates property values into LDAP attribute values and vice versa
-    'valuemap' => array(
-        'active' => array(
+    'valuemap' => 
+        'active' => 
             false   => 'TRUE',
             true    => 'FALSE',
-        ),
-    ),
+        ,
+    ,
     // specify non-string data types for properties for implicit conversion
-    'attrtypes' => array(
+    'attrtypes' => 
         'created' => 'datetime',
         'counter' => 'integer',
         'digits'  => 'integer',
-    ),
+    ,
     // apply these default values to factor records if not specified by the drivers
-    'defaults' => array(
+    'defaults' => 
         'active' => false,
         // these are required for ipatokenHOTP records and should match the kolab_2fa_hotp parameters
         'digest' => 'sha1',
         'digits' => 6,
-    ),
+    ,
     // use this LDAP attribute to compose DN values for factor entries
     'rdn'       => 'ipatokenUniqueID',
     // assign these object classes to new factor entries
-    'objectclass' => array(
+    'objectclass' => 
         'top',
         'ipaToken',
         '%c',
         'ldapSubEntry',
-    ),
+    ,
     // add these roles to the user's LDAP record if key prefix-matches a factor entry
-    'user_roles' => array(
+    'user_roles' => 
         'totp:' => 'cn=totp-user,dc=example,dc=org',
         'hotp:' => 'cn=hotp-user,dc=example,dc=org',
-    ),
-);
+    ,
+;
 
 // force a lookup for active authentication factors for this user.
 // to be set by another plugin (e.g. kolab_auth based on LDAP roles)
@@ -102,24 +102,24 @@
 $config'kolab_2fa_timeout' = 120;
 
 // configuration parameters for TOTP (uncomment to adjust)
-$config'kolab_2fa_totp' = array(
+$config'kolab_2fa_totp' = 
     // 'digits'   => 6,
     // 'interval' => 30,
     // 'digest'   => 'sha1',
     // 'issuer'   => 'Roundcube',
-);
+;
 
 // configuration parameters for HOTP (uncomment to adjust)
-$config'kolab_2fa_hotp' = array(
+$config'kolab_2fa_hotp' = 
     // 'digits' => 6,
     // 'window' => 4,
     // 'digest' => 'sha1',
-);
+;
 
 // configuration parameters for Yubikey (uncomment to adjust)
-$config'kolab_2fa_yubikey' = array(
+$config'kolab_2fa_yubikey' = 
     'clientid' => '123456',
     'apikey' => '<your-server-api-key>',
     // 'hosts'  => array('api.myhost1.com','api2.myhost.com'),
     'use_https' => true,  // connect via https if set to true
-);
\ No newline at end of file
+;

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/kolab_2fa.php Changed

@@ -26,8 +26,8 @@
     public $task = '(login|settings)';
 
     protected $login_verified = null;
-    protected $login_factors = array();
-    protected $drivers = array();
+    protected $login_factors = ;
+    protected $drivers = ;
     protected $storage;
 
     /**
@@ -36,7 +36,7 @@
     public function init()
     {
         $this->load_config();
-        $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('startup', $this, 'startup');
     }
 
     /**
@@ -48,24 +48,23 @@
 
         // register library namespace to autoloader
         $loader = include(INSTALL_PATH . 'vendor/autoload.php');
-        $loader->set('Kolab2FA', array($this->home . '/lib'));
+        $loader->set('Kolab2FA', $this->home . '/lib');
 
         if ($args'task' === 'login' && $this->api->output) {
             $this->add_texts('localization/', false);
-            $this->add_hook('authenticate', array($this, 'authenticate'));
+            $this->add_hook('authenticate', $this, 'authenticate');
 
             // process 2nd factor auth step after regular login
             if ($args'action' === 'plugin.kolab-2fa-login' /* || !empty($_SESSION'kolab_2fa_factors') */) {
                 return $this->login_verify($args);
             }
-        }
-        else if ($args'task' === 'settings') {
+        } elseif ($args'task' === 'settings') {
             $this->add_texts('localization/', !$this->api->output->ajax_call);
-            $this->add_hook('settings_actions', array($this, 'settings_actions'));
-            $this->register_action('plugin.kolab-2fa', array($this, 'settings_view'));
-            $this->register_action('plugin.kolab-2fa-data', array($this, 'settings_data'));
-            $this->register_action('plugin.kolab-2fa-save', array($this, 'settings_save'));
-            $this->register_action('plugin.kolab-2fa-verify', array($this, 'settings_verify'));
+            $this->add_hook('settings_actions', $this, 'settings_actions');
+            $this->register_action('plugin.kolab-2fa', $this, 'settings_view');
+            $this->register_action('plugin.kolab-2fa-data', $this, 'settings_data');
+            $this->register_action('plugin.kolab-2fa-save', $this, 'settings_save');
+            $this->register_action('plugin.kolab-2fa-verify', $this, 'settings_verify');
         }
 
         return $args;
@@ -98,8 +97,7 @@
                 if (!empty($username_domain$hostname)) {
                     $domain = $username_domain$hostname;
                 }
-            }
-            else {
+            } else {
                 $domain = $username_domain;
             }
 
@@ -111,7 +109,7 @@
                     $username = substr($username, 0, $pos) . '@' . $domain;
                 }
                 // just add domain if not specified
-                else if ($pos === false) {
+                elseif ($pos === false) {
                     $username .= '@' . $domain;
                 }
             }
@@ -122,27 +120,27 @@
         if ($login_lc) {
             if ($login_lc == 2 || $login_lc === true) {
                 $username = mb_strtolower($username);
-            }
-            else if (strpos($username, '@')) {
+            } elseif (strpos($username, '@')) {
                 // lowercase domain name
-                list($local, $domain) = explode('@', $username);
+                $local, $domain = explode('@', $username);
                 $username = $local . '@' . mb_strtolower($domain);
             }
         }
 
         // 2a. let plugins provide the list of active authentication factors
-        $lookup = $rcmail->plugins->exec_hook('kolab_2fa_lookup', array(
+        $lookup = $rcmail->plugins->exec_hook('kolab_2fa_lookup', 
             'user'    => $username,
             'host'    => $hostname,
             'factors' => null,
             'check'   => $rcmail->config->get('kolab_2fa_check', true),
-        ));
+        );
 
+        $factors = ;
         if (isset($lookup'factors')) {
             $factors = (array)$lookup'factors';
         }
         // 2b. check storage if this user has 2FA enabled
-        else if ($lookup'check' !== false && ($storage = $this->get_storage($username))) {
+        elseif ($lookup'check' !== false && ($storage = $this->get_storage($username))) {
             $factors = (array)$storage->enumerate();
         }
 
@@ -173,7 +171,7 @@
     {
         // replace handler for login form
         $this->login_factors = array_values($factors);
-        $this->api->output->add_handler('loginform', array($this, 'auth_form'));
+        $this->api->output->add_handler('loginform', $this, 'auth_form');
 
         // focus the code input field on load
         $this->api->output->add_script('$("input.kolab2facode").first().select();', 'docready');
@@ -192,7 +190,7 @@
 
         $time     = $_SESSION'kolab_2fa_time';
         $nonce    = $_SESSION'kolab_2fa_nonce';
-        $factors  = (array)$_SESSION'kolab_2fa_factors';
+        $factors  = (array) $_SESSION'kolab_2fa_factors';
         $expired  = $time < time() - $rcmail->config->get('kolab_2fa_timeout', 120);
         $username = !empty($_SESSION'kolab_auth_admin') ? $_SESSION'kolab_auth_admin' : $_SESSION'username';
 
@@ -201,7 +199,7 @@
 
             // try to verify each configured factor
             foreach ($factors as $factor) {
-                list($method) = explode(':', $factor, 2);
+                $method = explode(':', $factor, 2);
 
                 // verify the submitted code
                 $code = rcube_utils::get_input_value("_${nonce}_${method}", rcube_utils::INPUT_POST);
@@ -251,8 +249,7 @@
             try {
                 // verify the submitted code
                 return $driver->verify($code, $_SESSION'kolab_2fa_time');
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 rcube::raise_error($e, true, false);
             }
         }
@@ -263,26 +260,27 @@
     /**
      * Render 2nd factor authentication form in place of the regular login form
      */
-    public function auth_form($attrib = array())
+    public function auth_form($attrib = )
     {
         $form_name  = !empty($attrib'form') ? $attrib'form' : 'form';
         $nonce = $_SESSION'kolab_2fa_nonce';
 
-        $methods = array_unique(array_map(function($factor) {
-                list($method, $id) = explode(':', $factor);
+        $methods = array_unique(array_map(
+            function ($factor) {
+                $method, $id = explode(':', $factor);
                 return $method;
             },
             $this->login_factors
         ));
 
         // forward these values as the regular login screen would submit them
-        $input_task   = new html_hiddenfield(array('name' => '_task', 'value' => 'login'));
-        $input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'plugin.kolab-2fa-login'));
-        $input_tzone  = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_POST)));
-        $input_url    = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST)));
+        $input_task   = new html_hiddenfield('name' => '_task', 'value' => 'login');
+        $input_action = new html_hiddenfield('name' => '_action', 'value' => 'plugin.kolab-2fa-login');
+        $input_tzone  = new html_hiddenfield('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_POST));
+        $input_url    = new html_hiddenfield('name' => '_url', 'id' => 'rcmloginurl', 'value' => rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST));
 
         // create HTML table with two cols
-        $table = new html_table(array('cols' => 2));
+        $table = new html_table('cols' => 2);
         $required = count($methods) > 1 ? null : 'required';
         $row = 0;
 
@@ -296,14 +294,14 @@
             }
 
             $field_id = "rcmlogin2fa$method";
-            $input_code = new html_inputfield(array(
+            $input_code = new html_inputfield(
                     'name'         => "_${nonce}_${method}",
                     'class'        => 'kolab2facode',
                     'id'           => $field_id,
                     'required'     => $required,
                     'autocomplete' => 'off',
-                    'data-icon'    => 'key' // for Elastic
-                ) + $attrib);
+                    'data-icon'    => 'key', // for Elastic
+                 + $attrib);
             $table->add('title', html::label($field_id, html::quote($this->gettext($method))));
             $table->add('input', $input_code->show(''));
         }
@@ -316,17 +314,19 @@
 
         // add submit button
         if (rcube_utils::get_boolean($attrib'submit')) {
-            $out .= html::p('formbuttons', html::tag('button', array(
+            $out .= html::p(
+                'formbuttons',
+                html::tag('button', 
                     'type'  => 'submit',
                     'id'    => 'rcmloginsubmit',
                     'class' => 'button mainaction save',
-                ), $this->gettext('continue'))
+                , $this->gettext('continue'))
             );
         }
 
         // surround html output with a form tag
         if (empty($attrib'form')) {
-            $out = $this->api->output->form_tag(array('name' => $form_name, 'method' => 'post'), $out);
+            $out = $this->api->output->form_tag('name' => $form_name, 'method' => 'post', $out);
         }
 
         return $out;
@@ -336,11 +336,11 @@
      * Load driver class for the given authentication factor
      *
      * @param string $factor Factor identifier (<method>:<id>)
-     * @return Kolab2FA\Driver\Base
+     * @return Kolab2FA\Driver\Base|false
      */
     public function get_driver($factor)
     {
-        list($method) = explode(':', $factor, 2);
+        $method = explode(':', $factor, 2);
 
         $rcmail = rcmail::get_instance();
 
@@ -348,7 +348,7 @@
             return $this->drivers$factor;
         }
 
-        $config = $rcmail->config->get('kolab_2fa_' . $method, array());
+        $config = $rcmail->config->get('kolab_2fa_' . $method, );
 
         // use product name as "issuer""
         if (empty($config'issuer')) {
@@ -369,18 +369,20 @@
 
             $this->drivers$factor = $driver;
             return $driver;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $error = strval($e);
         }
 
-        rcube::raise_error(array(
+        rcube::raise_error(
+            
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__,
                 'line' => __LINE__,
-                'message' => $error),
-            true, false);
+                'message' => $error,
+            true,
+            false
+        );
 
         return false;
     }
@@ -395,7 +397,7 @@
             try {
                 $this->storage = \Kolab2FA\Storage\Base::factory(
                     $rcmail->config->get('kolab_2fa_storage', 'roundcube'),
-                    $rcmail->config->get('kolab_2fa_storage_config', array())
+                    $rcmail->config->get('kolab_2fa_storage_config', )
                 );
 
                 $this->storage->set_username($for);
@@ -405,17 +407,19 @@
                 if (!empty($_SESSION'kolab_dn')) {
                     $this->storage->userdn = $_SESSION'kolab_dn';
                 }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $this->storage = false;
 
-                rcube::raise_error(array(
+                rcube::raise_error(
+                    
                         'code' => 600,
                         'type' => 'php',
                         'file' => __FILE__,
                         'line' => __LINE__,
-                        'message' => $error),
-                    true, false);
+                        'message' => $e->getMessage(),
+                    true,
+                    false
+                );
             }
         }
 
@@ -428,13 +432,13 @@
     public function settings_actions($args)
     {
         // register as settings action
-        $args'actions' = array(
+        $args'actions' = 
             'action' => 'plugin.kolab-2fa',
             'class'  => 'twofactorauth',
             'label'  => 'settingslist',
             'title'  => 'settingstitle',
             'domain' => 'kolab_2fa',
-        );
+        ;
 
         return $args;
     }
@@ -444,16 +448,16 @@
      */
     public function settings_view()
     {
-        $this->register_handler('plugin.settingsform', array($this, 'settings_form'));
-        $this->register_handler('plugin.settingslist', array($this, 'settings_list'));
-        $this->register_handler('plugin.factoradder', array($this, 'settings_factoradder'));
-        $this->register_handler('plugin.highsecuritydialog', array($this, 'settings_highsecuritydialog'));
+        $this->register_handler('plugin.settingsform', $this, 'settings_form');
+        $this->register_handler('plugin.settingslist', $this, 'settings_list');
+        $this->register_handler('plugin.factoradder', $this, 'settings_factoradder');
+        $this->register_handler('plugin.highsecuritydialog', $this, 'settings_highsecuritydialog');
 
         $this->include_script('kolab2fa.js');
         $this->include_stylesheet($this->local_skin_path() . '/kolab2fa.css');
 
         $this->api->output->set_env('session_secured', $this->check_secure_mode());
-        $this->api->output->add_label('save','cancel');
+        $this->api->output->add_label('save', 'cancel');
         $this->api->output->set_pagetitle($this->gettext('settingstitle'));
         $this->api->output->send('kolab_2fa.config');
     }
@@ -469,7 +473,7 @@
 
         $select = new html_select($attrib);
         $select->add($this->gettext('addfactor') . '...', '');
-        foreach ((array)$rcmail->config->get('kolab_2fa_drivers', array()) as $method) {
+        foreach ((array)$rcmail->config->get('kolab_2fa_drivers', ) as $method) {
             $select->add($this->gettext($method), $method);
         }
 
@@ -479,10 +483,10 @@
     /**
      * Render a list of active factor this user has configured
      */
-    public function settings_list($attrib = array())
+    public function settings_list($attrib = )
     {
         $attrib'id' = 'kolab2fa-factors';
-        $table = new html_table(array('cols' => 3));
+        $table = new html_table('cols' => 3);
 
         $table->add_header('name', $this->gettext('factor'));
         $table->add_header('created', $this->gettext('created'));
@@ -494,28 +498,28 @@
     /**
      * Render the settings form template object
      */
-    public function settings_form($attrib = array())
+    public function settings_form($attrib = )
     {
         $rcmail = rcmail::get_instance();
         $storage = $this->get_storage($rcmail->get_user_name());
-        $factors = $storage ? (array)$storage->enumerate() : array();
-        $drivers = (array)$rcmail->config->get('kolab_2fa_drivers', array());
+        $factors = $storage ? (array)$storage->enumerate() : ;
+        $drivers = (array)$rcmail->config->get('kolab_2fa_drivers', );
         $out = '';
-        $env_methods = array();
+        $env_methods = ;
 
         foreach ($drivers as $j => $method) {
             $out .= $this->settings_factor($method, $attrib);
-            $env_methods$method = array(
+            $env_methods$method = 
                 'name'   => $this->gettext($method),
                 'active' => 0,
-            );
+            ;
         }
 
         $me = $this;
         $factors = array_combine(
             $factors,
-            array_map(function($id) use ($me, &$env_methods) {
-                $props = array('id' => $id);
+            array_map(function ($id) use ($me, &$env_methods) {
+                $props = 'id' => $id;
 
                 if ($driver = $me->get_driver($id)) {
                     $props += $this->format_props($driver->props());
@@ -531,7 +535,7 @@
         $this->api->output->set_env('kolab_2fa_methods', $env_methods);
         $this->api->output->set_env('kolab_2fa_factors', !empty($factors) ? $factors : null);
 
-        return html::div(array('id' => 'kolab2fapropform'), $out);
+        return html::div('id' => 'kolab2fapropform', $out);
     }
 
     /**
@@ -541,10 +545,10 @@
     {
         $out = '';
         $rcmail = rcmail::get_instance();
-        $attrib += array('class' => 'propform');
+        $attrib += 'class' => 'propform';
 
         if ($driver = $this->get_driver($method)) {
-            $table = new html_table(array('cols' => 2, 'class' => $attrib'class'));
+            $table = new html_table('cols' => 2, 'class' => $attrib'class');
 
             foreach ($driver->props() as $field => $prop) {
                 if (!$prop'editable') {
@@ -554,20 +558,20 @@
                 switch ($prop'type') {
                     case 'boolean':
                     case 'checkbox':
-                        $input = new html_checkbox(array('value' => '1'));
+                        $input = new html_checkbox('value' => '1');
                         break;
 
                     case 'enum':
                     case 'select':
-                        $input = new html_select(array('disabled' => !empty($prop'readonly')));
-                        $input->add(array_map(array($this, 'gettext'), $prop'options'), $prop'options');
+                        $input = new html_select('disabled' => !empty($prop'readonly'));
+                        $input->add(array_map($this, 'gettext', $prop'options'), $prop'options');
                         break;
 
                     default:
-                        $input = new html_inputfield(array(
+                        $input = new html_inputfield(
                                 'size' => !empty($prop'size') ? $prop'size' : 30,
-                                'disabled' => empty($prop'editable')
-                        ));
+                                'disabled' => empty($prop'editable'),
+                        );
                 }
 
                 $explain_label = $field . 'explain' . $method;
@@ -575,38 +579,44 @@
 
                 $field_id = 'rcmk2fa' . $method . $field;
                 $table->add('title', html::label($field_id, $this->gettext($field)));
-                $table->add(null, $input->show('', array('id' => $field_id, 'name' => "_prop$field")) . $explain_html);
+                $table->add(null, $input->show('', 'id' => $field_id, 'name' => "_prop$field") . $explain_html);
             }
 
             // add row for displaying the QR code
             if (method_exists($driver, 'get_provisioning_uri')) {
                 $gif = 'data:image/gif;base64,R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7';
                 $table->add('title', $this->gettext('qrcode'));
-                $table->add('pl-3 pr-3',
+                $table->add(
+                    'pl-3 pr-3',
                     html::div('explain form-text', $this->gettext("qrcodeexplain$method"))
-                    . html::tag('img', array('src' => $gif, 'class' => 'qrcode mt-2', 'rel' => $method))
+                    . html::tag('img', 'src' => $gif, 'class' => 'qrcode mt-2', 'rel' => $method)
                 );
 
                 // add row for testing the factor
                 $field_id = 'rcmk2faverify' . $method;
                 $table->add('title', html::label($field_id, $this->gettext('verifycode')));
-                $table->add(null,
-                    html::tag('input', array('type' => 'text', 'name' => '_verify_code', 'id' => $field_id, 'class' => 'k2fa-verify', 'size' => 20, 'required' => true)) .
+                $table->add(
+                    null,
+                    html::tag('input', 'type' => 'text', 'name' => '_verify_code', 'id' => $field_id, 'class' => 'k2fa-verify', 'size' => 20, 'required' => true) .
                     html::div('explain form-text', $this->gettext("verifycodeexplain$method"))
                 );
             }
 
-            $input_id = new html_hiddenfield(array('name' => '_propid', 'value' => ''));
+            $input_id = new html_hiddenfield('name' => '_propid', 'value' => '');
 
-            $out .= html::tag('form', array(
+            $out .= html::tag(
+                'form',
+                
                     'method' => 'post',
                     'action' => '#',
                     'id'     => 'kolab2fa-prop-' . $method,
                     'style'  => 'display:none',
                     'class'  => 'propform',
-                ),
-                html::tag('fieldset', array(),
-                    html::tag('legend', array(), $this->gettext($method)) .
+                ,
+                html::tag(
+                    'fieldset',
+                    ,
+                    html::tag('legend', , $this->gettext($method)) .
                     html::div('factorprop', $table->show()) .
                     $input_id->show()
                 )
@@ -619,15 +629,16 @@
     /**
      * Render the high-security-dialog content
      */
-    public function settings_highsecuritydialog($attrib = array())
+    public function settings_highsecuritydialog($attrib = )
     {
-        $attrib += array('id' => 'kolab2fa-highsecuritydialog');
+        $attrib += 'id' => 'kolab2fa-highsecuritydialog';
 
         $field_id = 'rcmk2facode';
-        $input = new html_inputfield(array('name' => '_code', 'id' => $field_id, 'class' => 'verifycode', 'size' => 20));
-        $label = html::label(array('for' => $field_id, 'class' => 'col-form-label col-sm-4'), '$name');
+        $input = new html_inputfield('name' => '_code', 'id' => $field_id, 'class' => 'verifycode', 'size' => 20);
+        $label = html::label('for' => $field_id, 'class' => 'col-form-label col-sm-4', '$name');
 
-        return html::div($attrib,
+        return html::div(
+            $attrib,
             html::div('explain form-text', $this->gettext('highsecuritydialog'))
             . html::div('propform row form-group', $label . html::div('col-sm-8', $input->show('')))
         );
@@ -645,30 +656,28 @@
         $storage = $this->get_storage($rcmail->get_user_name());
         $success = false;
         $errors = 0;
-        $save_data = array();
+        $save_data = ;
 
         if ($driver = $this->get_driver($method)) {
             if ($data === false) {
                 if ($this->check_secure_mode()) {
                     // remove method from active factors and clear stored settings
                     $success = $driver->clear();
-                }
-                else {
+                } else {
                     $errors++;
                 }
-            }
-            else {
+            } else {
                 // verify the submitted code before saving
                 $verify_code = rcube_utils::get_input_value('_verify_code', rcube_utils::INPUT_POST);
                 $timestamp = intval(rcube_utils::get_input_value('_timestamp', rcube_utils::INPUT_POST));
                 if (!empty($verify_code)) {
                     if (!$driver->verify($verify_code, $timestamp)) {
-                        $this->api->output->command('plugin.verify_response', array(
+                        $this->api->output->command('plugin.verify_response', 
                             'id'      => $driver->id,
                             'method'  => $driver->method,
                             'success' => false,
-                            'message' => str_replace('$method', $this->gettext($driver->method), $this->gettext('codeverificationfailed'))
-                        ));
+                            'message' => str_replace('$method', $this->gettext($driver->method), $this->gettext('codeverificationfailed')),
+                        );
                         $this->api->output->send();
                     }
                 }
@@ -685,9 +694,8 @@
             // commit changes to the user properties
             if (!$errors) {
                 if ($success = $driver->commit()) {
-                    $save_data = $data !== false ? $this->format_props($driver->props()) : array();
-                }
-                else {
+                    $save_data = $data !== false ? $this->format_props($driver->props()) : ;
+                } else {
                     $errors++;
                 }
             }
@@ -695,12 +703,11 @@
 
         if ($success) {
             $this->api->output->show_message($data === false ? $this->gettext('factorremovesuccess') : $this->gettext('factorsavesuccess'), 'confirmation');
-            $this->api->output->command('plugin.save_success', array(
+            $this->api->output->command('plugin.save_success', 
                     'method' => $method,
                     'active' => $data !== false,
-                    'id'     => $driver->id) + $save_data);
-        }
-        else if ($errors) {
+                    'id'     => $driver->id + $save_data);
+        } elseif ($errors) {
             $this->api->output->show_message($this->gettext('factorsaveerror'), 'error');
             $this->api->output->command('plugin.reset_form', $data !== false ? $method : null);
         }
@@ -716,7 +723,7 @@
         $method = rcube_utils::get_input_value('_method', rcube_utils::INPUT_POST);
 
         if ($driver = $this->get_driver($method)) {
-            $data = array('method' => $method, 'id' => $driver->id);
+            $data = 'method' => $method, 'id' => $driver->id;
 
             foreach ($driver->props(true) as $field => $prop) {
                 $data$field = $prop'text' ?: $prop'value';
@@ -732,11 +739,10 @@
                        ->setSize(240)
                        ->setPadding(10)
                        ->setErrorCorrection('high')
-                       ->setForegroundColor(array('r' => 0, 'g' => 0, 'b' => 0, 'a' => 0))
-                       ->setBackgroundColor(array('r' => 255, 'g' => 255, 'b' => 255, 'a' => 0));
+                       ->setForegroundColor('r' => 0, 'g' => 0, 'b' => 0, 'a' => 0)
+                       ->setBackgroundColor('r' => 255, 'g' => 255, 'b' => 255, 'a' => 0);
                     $data'qrcode' = base64_encode($qr->get());
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     rcube::raise_error($e, true, false);
                 }
             }
@@ -775,12 +781,15 @@
             $_SESSION'kolab_2fa_secure_mode' = time();
         }
 
-        $this->api->output->command('plugin.verify_response', array(
+        $this->api->output->command('plugin.verify_response', 
             'method' => $method,
             'success' => $success,
-            'message' => str_replace('$method', $this->gettext($method),
-                $this->gettext($success ? 'codeverificationpassed' : 'codeverificationfailed'))
-        ));
+            'message' => str_replace(
+                '$method',
+                $this->gettext($method),
+                $this->gettext($success ? 'codeverificationpassed' : 'codeverificationfailed')
+            ),
+        );
 
         $this->api->output->send();
     }
@@ -791,7 +800,7 @@
     protected function format_props($props)
     {
         $rcmail = rcmail::get_instance();
-        $values = array();
+        $values = ;
 
         foreach ($props as $key => $prop) {
             switch ($prop'type') {

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Base.php Changed

@@ -29,47 +29,47 @@
     public $id;
     public $storage;
 
-    protected $config          = array();
-    protected $props           = array();
-    protected $user_props      = array();
+    protected $config          = ;
+    protected $props           = ;
+    protected $user_props      = ;
     protected $pending_changes = false;
     protected $temporary       = false;
-    protected $allowed_props   = array('username');
+    protected $allowed_props   = 'username';
 
-    public $user_settings = array(
-        'active' => array(
+    public $user_settings = 
+        'active' => 
             'type'     => 'boolean',
             'editable' => false,
             'hidden'   => false,
             'default'  => false,
-        ),
-        'label' => array(
+        ,
+        'label' => 
             'type'      => 'text',
             'editable'  => true,
             'label'     => 'label',
             'generator' => 'default_label',
-        ),
-        'created' => array(
+        ,
+        'created' => 
             'type'      => 'datetime',
             'editable'  => false,
             'hidden'    => false,
             'label'     => 'created',
             'generator' => 'time',
-        ),
-    );
+        ,
+    ;
 
     /**
      * Static factory method
      */
     public static function factory($id, $config)
     {
-        list($method) = explode(':', $id);
+        $method = explode(':', $id);
 
-        $classmap = array(
+        $classmap = 
             'totp'    => '\\Kolab2FA\\Driver\\TOTP',
             'hotp'    => '\\Kolab2FA\\Driver\\HOTP',
             'yubikey' => '\\Kolab2FA\\Driver\\Yubikey',
-        );
+        ;
 
         $cls = $classmapstrtolower($method);
         if ($cls && class_exists($cls)) {
@@ -88,8 +88,7 @@
 
         if (!empty($id) && $id != $this->method) {
             $this->id = $id;
-        }
-        else { // generate random ID
+        } else { // generate random ID
             $this->id = $this->method . ':' . bin2hex(openssl_random_pseudo_bytes(12));
             $this->temporary = true;
         }
@@ -117,27 +116,27 @@
      *
      * @return bool True if valid, false otherwise
      */
-    abstract function verify($code, $timestamp = null);
+    abstract public function verify($code, $timestamp = null);
 
     /**
      * Getter for user-visible properties
      */
     public function props($force = false)
     {
-        $data = array();
+        $data = ;
 
         foreach ($this->user_settings as $key => $p) {
             if (!empty($p'private')) {
                 continue;
             }
 
-            $data$key = array(
+            $data$key = 
                 'type'     => $p'type',
                 'editable' => $p'editable' ?? false,
                 'hidden'   => $p'hidden' ?? false,
                 'label'    => $p'label' ?? '',
                 'value'    => $this->get($key, $force),
-            );
+            ;
 
             // format value into text
             switch ($p'type') {
@@ -152,6 +151,7 @@
                         break;
                     }
 
+                    // no break
                 default:
                     $data$key'text' = $data$key'value';
             }
@@ -171,12 +171,12 @@
     public function generate_secret($length = 16)
     {
         // Base32 characters
-        $chars = array(
+        $chars = 
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', //  7
             'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', // 15
             'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', // 23
             'Y', 'Z', '2', '3', '4', '5', '6', '7', // 31
-        );
+        ;
 
         $secret = '';
         for ($i = 0; $i < $length; $i++) {
@@ -211,7 +211,7 @@
             if (!isset($value) && $force && !empty($this->user_settings$key'generator')) {
                 $func = $this->user_settings$key'generator';
                 if (is_string($func) && !is_callable($func)) {
-                    $func = array($this, $func);
+                    $func = $this, $func;
                 }
                 if (is_callable($func)) {
                     $value = call_user_func($func);
@@ -220,8 +220,7 @@
                     $this->set_user_prop($key, $value);
                 }
             }
-        }
-        else {
+        } else {
             $value = $this->props$key ?? null;
         }
 
@@ -243,9 +242,8 @@
 
         $setter = 'set_' . $key;
         if (method_exists($this, $setter)) {
-            call_user_func(array($this, $setter), $value);
-        }
-        else if (in_array($key, $this->allowed_props)) {
+            call_user_func($this, $setter, $value);
+        } elseif (in_array($key, $this->allowed_props)) {
             $this->props$key = $value;
         }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Exception.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/HOTP.php Changed

@@ -27,11 +27,11 @@
 {
     public $method = 'hotp';
 
-    protected $config = array(
+    protected $config = 
         'digits'   => 6,
         'window'   => 4,
         'digest'   => 'sha1',
-    );
+    ;
 
     protected $backend;
 
@@ -42,22 +42,22 @@
     {
         parent::init($config);
 
-        $this->user_settings += array(
-            'secret' => array(
+        $this->user_settings += 
+            'secret' => 
                 'type'      => 'text',
                 'private'   => true,
                 'label'     => 'secret',
                 'generator' => 'generate_secret',
-            ),
-            'counter' => array(
+            ,
+            'counter' => 
                 'type'      => 'integer',
                 'editable'  => false,
                 'hidden'    => true,
                 'generator' => 'random_counter',
-            ),
-        );
+            ,
+        ;
 
-        if (!in_array($this->config'digest', array('md5', 'sha1', 'sha256', 'sha512'))) {
+        if (!in_array($this->config'digest', 'md5', 'sha1', 'sha256', 'sha512')) {
             throw new \Exception("'{$this->config'digest'}' digest is not supported.");
         }
 
@@ -106,8 +106,7 @@
             // store incremented counter value
             $this->set('counter', $this->backend->getCounter());
             $this->commit();
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             // LOG: exception
             // rcube::console("VERIFY HOTP: $this->id, " . strval($e));
             $pass = false;

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/TOTP.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php Changed

@@ -36,13 +36,13 @@
     {
         parent::init($config);
 
-        $this->user_settings += array(
-            'yubikeyid' => array(
+        $this->user_settings += 
+            'yubikeyid' => 
                 'type'     => 'text',
                 'editable' => true,
                 'label'    => 'secret',
-            ),
-        );
+            ,
+        ;
 
         // initialize validator
         $this->backend = new \Yubikey\Validate($this->config'apikey', $this->config'clientid');
@@ -76,8 +76,7 @@
             try {
                 $response = $this->backend->check($code);
                 $pass     = $response->success() === true;
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 // TODO: log exception
             }
         }
@@ -99,8 +98,7 @@
                     // TODO: report error
                     return false;
                 }
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 return false;
             }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Log/RcubeLogger.php Changed

@@ -24,7 +24,7 @@
 
 namespace Kolab2FA\Log;
 
-use \rcube;
+use rcube;
 
 class RcubeLogger implements Logger
 {
@@ -43,7 +43,7 @@
         $this->name = $name;
     }
 
-    public function set_level($name)
+    public function set_level($level)
     {
         $this->level = $level;
     }
@@ -55,26 +55,25 @@
         }
 
         switch ($level) {
-        case LOG_DEBUG:
-        case LOG_INFO:
-        case LOG_NOTICE:
-            if ($level >= $this->level) {
-                rcube::write_log($this->name ?: 'console', $message);
-            }
-            break;
+            case LOG_DEBUG:
+            case LOG_INFO:
+            case LOG_NOTICE:
+                if ($level >= $this->level) {
+                    rcube::write_log($this->name ?: 'console', $message);
+                }
+                break;
 
-        case LOG_EMERG:
-        case LOG_ALERT:
-        case LOG_CRIT:
-        case LOG_ERR:
-        case LOG_WARNING:
-            rcube::raise_error(array(
-                'code' => 600,
-                'type' => 'php',
-                'message' => $message,
-            ), true, false);
-            break;
+            case LOG_EMERG:
+            case LOG_ALERT:
+            case LOG_CRIT:
+            case LOG_ERR:
+            case LOG_WARNING:
+                rcube::raise_error(
+                    'code' => 600,
+                    'type' => 'php',
+                    'message' => $message,
+                , true, false);
+                break;
         }
     }
 }
-

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Log/Syslog.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/Base.php Changed

@@ -23,13 +23,12 @@
 
 namespace Kolab2FA\Storage;
 
-use \Kolab2FA\Log;
-
+use Kolab2FA\Log;
 
 abstract class Base
 {
     public $username = null;
-    protected $config = array();
+    protected $config = ;
     protected $logger;
 
     /**
@@ -37,11 +36,11 @@
      */
     public static function factory($backend, $config)
     {
-        $classmap = array(
+        $classmap = 
             'ldap' => '\\Kolab2FA\\Storage\\LDAP',
             'roundcube' => '\\Kolab2FA\\Storage\\RcubeUser',
             'rcubeuser' => '\\Kolab2FA\\Storage\\RcubeUser',
-        );
+        ;
 
         $cls = $classmapstrtolower($backend);
         if ($cls && class_exists($cls)) {
@@ -73,7 +72,7 @@
     }
 
     /**
-     * 
+     *
      */
     public function set_logger(Log\Logger $logger)
     {
@@ -81,8 +80,7 @@
 
         if (!empty($this->config'debug')) {
             $this->logger->set_level(LOG_DEBUG);
-        }
-        else if (!empty($this->config'loglevel')) {
+        } elseif (!empty($this->config'loglevel')) {
             $this->logger->set_level($this->config'loglevel');
         }
     }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/Exception.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/LDAP.php Changed

@@ -23,24 +23,25 @@
 
 namespace Kolab2FA\Storage;
 
-use \Net_LDAP3;
-use \Kolab2FA\Log\Logger;
+use Net_LDAP3;
+use Kolab2FA\Log\Logger;
 
 class LDAP extends Base
 {
     public $userdn;
 
-    private $cache = array();
-    private $ldapcache = array();
+    private $cache = ;
+    private $ldapcache = ;
     private $conn;
-    private $error;
+    private $ready = false;
+
 
     public function init(array $config)
     {
         parent::init($config);
 
         $this->conn = new Net_LDAP3($config);
-        $this->conn->config_set('log_hook', array($this, 'log'));
+        $this->conn->config_set('log_hook', $this, 'log');
 
         $this->conn->connect();
 
@@ -51,7 +52,7 @@
         $this->ready = $this->conn->bind($bind_dn, $bind_pass);
 
         if (!$this->ready) {
-            throw new Exception("LDAP storage not ready: " . $this->error);
+            throw new Exception("LDAP storage not ready");
         }
     }
 
@@ -60,12 +61,12 @@
      */
     public function enumerate($active = true)
     {
-        $filter  = $this->parse_vars($this->config'filter',  '*');
+        $filter  = $this->parse_vars($this->config'filter', '*');
         $base_dn = $this->parse_vars($this->config'base_dn', '*');
         $scope   = $this->config'scope' ?: 'sub';
-        $ids     = array();
+        $ids     = ;
 
-        if ($this->ready && ($result = $this->conn->search($base_dn, $filter, $scope, array($this->config'fieldmap''id', $this->config'fieldmap''active')))) {
+        if ($this->ready && ($result = $this->conn->search($base_dn, $filter, $scope, $this->config'fieldmap''id', $this->config'fieldmap''active'))) {
             foreach ($result as $dn => $entry) {
                 $rec = $this->field_mapping($dn, Net_LDAP3::normalize_entry($entry, true));
                 if (!empty($rec'id') && ($active === null || $active == $rec'active')) {
@@ -97,19 +98,18 @@
     public function write($key, $value)
     {
         $success = false;
-        $ldap_attrs = array();
+        $ldap_attrs = ;
 
         if (is_array($value)) {
             // add some default values
-            $value += (array)$this->config'defaults' + array('active' => false, 'username' => $this->username, 'userdn' => $this->userdn);
+            $value += (array)$this->config'defaults' + 'active' => false, 'username' => $this->username, 'userdn' => $this->userdn;
 
             foreach ($value as $k => $val) {
                 if ($attr = $this->config'fieldmap'$k) {
                     $ldap_attrs$attr = $this->value_mapping($k, $val, false);
                 }
             }
-        }
-        else {
+        } else {
             // invalid data structure
             return false;
         }
@@ -123,12 +123,12 @@
             $success = !empty($result);
         }
         // insert new record
-        else if ($this->ready) {
+        elseif ($this->ready) {
             $entry_dn = $this->get_entry_dn($this->username, $key);
 
             // add object class attribute
             $me = $this;
-            $ldap_attrs'objectclass' = array_map(function($cls) use ($me, $key) {
+            $ldap_attrs'objectclass' = array_map(function ($cls) use ($me, $key) {
                 return $me->parse_vars($cls, $key);
             }, (array)$this->config'objectclass');
 
@@ -137,7 +137,7 @@
 
         if ($success) {
             $this->cache$key = $value;
-            $this->ldapcache = array();
+            $this->ldapcache = ;
 
             // cleanup: remove disabled/inactive/temporary entries
             if ($value'active') {
@@ -183,8 +183,8 @@
         parent::set_username($username);
 
         // reset cached values
-        $this->cache = array();
-        $this->ldapcache = array();
+        $this->cache = ;
+        $this->ldapcache = ;
     }
 
     /**
@@ -196,7 +196,7 @@
             return false;
         }
 
-        $auth_roles = array();
+        $auth_roles = ;
         foreach ($this->enumerate(true) as $id) {
             foreach ($this->config'user_roles' as $prefix => $role) {
                 if (strpos($id, $prefix) === 0) {
@@ -206,12 +206,12 @@
         }
 
         $role_attr = $this->config'fieldmap''roles' ?: 'nsroledn';
-        if ($user_attrs = $this->conn->get_entry($this->userdn, array($role_attr))) {
+        if ($user_attrs = $this->conn->get_entry($this->userdn, $role_attr)) {
             $internals = array_values($this->config'user_roles');
             $new_attrs = $old_attrs = Net_LDAP3::normalize_entry($user_attrs);
             $new_attrs$role_attr = array_merge(
                 array_unique($auth_roles),
-                array_filter((array)$old_attrs$role_attr, function($f) use ($internals) { return !in_array($f, $internals); })
+                array_filter((array)$old_attrs$role_attr, function ($f) use ($internals) { return !in_array($f, $internals); })
             );
 
             $result = $this->conn->modify_entry($this->userdn, $old_attrs, $new_attrs);
@@ -229,7 +229,7 @@
         $entry_dn = $this->get_entry_dn($user, $key);
 
         if (!isset($this->ldapcache$entry_dn)) {
-            $this->ldapcache$entry_dn = array();
+            $this->ldapcache$entry_dn = ;
 
             if ($this->ready && ($entry = $this->conn->get_entry($entry_dn, array_values($this->config'fieldmap')))) {
                 $this->ldapcache$entry_dn = $this->field_mapping($entry_dn, Net_LDAP3::normalize_entry($entry, true));
@@ -261,8 +261,7 @@
             $attr_lc = strtolower($attr);
             if (isset($entry$attr_lc)) {
                 $entry$field = $this->value_mapping($field, $entry$attr_lc, true);
-            }
-            else if (isset($entry$attr)) {
+            } elseif (isset($entry$attr)) {
                 $entry$field = $this->value_mapping($field, $entry$attr, true);
             }
         }
@@ -281,11 +280,10 @@
             }
 
             if (is_array($value)) {
-                $value = array_filter(array_map(function($val) use ($map) {
+                $value = array_filter(array_map(function ($val) use ($map) {
                     return $map$val;
                 }, $value));
-            }
-            else {
+            } else {
                 $value = $map$value;
             }
         }
@@ -315,9 +313,8 @@
         $user = $this->username;
 
         if (strpos($user, '@') > 0) {
-            list($u, $d) = explode('@', $user);
-        }
-        else if ($this->userdn) {
+            $u, $d = explode('@', $user);
+        } elseif ($this->userdn) {
             $u = $this->userdn;
             $d = trim(str_replace(',dc=', '.', substr($u, strpos($u, ',dc='))), '.');
         }
@@ -327,7 +324,7 @@
         }
 
         // build hierarchal domain string
-        $dc = $this->conn->domain_root_dn($d);
+        $dc = isset($d) ? $this->conn->domain_root_dn($d) : '';
 
         $class = $this->config'classmap' ? $this->config'classmap''*' : '*';
 
@@ -341,9 +338,8 @@
             }
         }
 
-        $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u, '%c' => $class);
+        $replaces = '%dc' => $dc, '%d' => $d ?? '', '%fu' => $user, '%u' => $u ?? '', '%c' => $class;
 
         return strtr($str, $replaces);
     }
-
 }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Storage/RcubeUser.php Changed

@@ -23,17 +23,17 @@
 
 namespace Kolab2FA\Storage;
 
-use \rcmail;
-use \rcube_user;
+use rcmail;
+use rcube_user;
 
 class RcubeUser extends Base
 {
     // sefault config
-    protected $config = array(
-        'keymap' => array(),
-    );
+    protected $config = 
+        'keymap' => ,
+    ;
 
-    private $cache = array();
+    private $cache = ;
     private $user;
 
     public function init(array $config)
@@ -50,12 +50,12 @@
     public function enumerate()
     {
         if ($factors = $this->get_factors()) {
-            return array_keys(array_filter($factors, function($prop) {
+            return array_keys(array_filter($factors, function ($prop) {
                 return !empty($prop'active');
             }));
         }
 
-        return array();
+        return ;
     }
 
     /**
@@ -86,7 +86,7 @@
             $factors$key = $value;
 
             $pkey = $this->key2property('blob');
-            $save_data = array($pkey => $factors);
+            $save_data = $pkey => $factors;
             $update_index = false;
 
             // remove entry
@@ -95,8 +95,8 @@
                 $update_index = true;
             }
             // remove non-active entries
-            else if (!empty($value'active')) {
-                $factors = array_filter($factors, function($prop) {
+            elseif (!empty($value'active')) {
+                $factors = array_filter($factors, function ($prop) {
                     return !empty($prop'active');
                 });
                 $update_index = true;
@@ -105,7 +105,7 @@
             // update the index of active factors
             if ($update_index) {
                 $save_data$this->key2property('factors') = array_keys(
-                    array_filter($factors, function($prop) {
+                    array_filter($factors, function ($prop) {
                         return !empty($prop'active');
                     })
                 );
@@ -139,7 +139,7 @@
         parent::set_username($username);
 
         // reset cached values
-        $this->cache = array();
+        $this->cache = ;
         $this->user = null;
     }

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_2fa/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/kolab_activesync.php Changed

@@ -34,8 +34,8 @@
     private $folder_meta;
     private $root_meta;
 
-    const ROOT_MAILBOX = 'INBOX';
-    const ASYNC_KEY    = '/private/vendor/kolab/activesync';
+    public const ROOT_MAILBOX = 'INBOX';
+    public const ASYNC_KEY    = '/private/vendor/kolab/activesync';
 
 
     /**
@@ -43,16 +43,16 @@
      */
     public function init()
     {
-        $this->rc = rcube::get_instance();
+        $this->rc = rcmail::get_instance();
 
         $this->require_plugin('libkolab');
 
-        $this->register_action('plugin.activesync', array($this, 'config_view'));
-        $this->register_action('plugin.activesync-config', array($this, 'config_frame'));
-        $this->register_action('plugin.activesync-json', array($this, 'json_command'));
+        $this->register_action('plugin.activesync', $this, 'config_view');
+        $this->register_action('plugin.activesync-config', $this, 'config_frame');
+        $this->register_action('plugin.activesync-json', $this, 'json_command');
 
-        $this->add_hook('settings_actions', array($this, 'settings_actions'));
-        $this->add_hook('folder_form', array($this, 'folder_form'));
+        $this->add_hook('settings_actions', $this, 'settings_actions');
+        $this->add_hook('folder_form', $this, 'folder_form');
 
         $this->add_texts('localization/');
 
@@ -65,15 +65,15 @@
     /**
      * Adds Activesync section in Settings
      */
-    function settings_actions($args)
+    public function settings_actions($args)
     {
-        $args'actions' = array(
+        $args'actions' = 
             'action' => 'plugin.activesync',
             'class'  => 'activesync',
             'label'  => 'tabtitle',
             'domain' => 'kolab_activesync',
             'title'  => 'activesynctitle',
-        );
+        ;
 
         return $args;
     }
@@ -82,7 +82,7 @@
      * Handler for folder info/edit form (folder_form hook).
      * Adds ActiveSync section.
      */
-    function folder_form($args)
+    public function folder_form($args)
     {
         $mbox_imap = $args'options''name' ?? '';
 
@@ -98,8 +98,8 @@
             return $args;
         }
 
-        list($type, ) = explode('.', (string) kolab_storage::folder_type($mbox_imap));
-        if ($type && !in_array($type, array('mail', 'event', 'contact', 'task', 'note'))) {
+        $type,  = explode('.', (string) kolab_storage::folder_type($mbox_imap));
+        if ($type && !in_array($type, 'mail', 'event', 'contact', 'task', 'note')) {
             return $args;
         }
 
@@ -107,10 +107,10 @@
         $this->ui = new kolab_activesync_ui($this);
 
         if ($content = $this->ui->folder_options_table($mbox_imap, $devices, $type)) {
-            $args'form''activesync' = array(
+            $args'form''activesync' = 
                 'name'    => $this->gettext('tabtitle'),
                 'content' => $content,
-            );
+            ;
         }
 
         return $args;
@@ -125,68 +125,70 @@
         $imei = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
 
         switch ($cmd) {
-        case 'save':
-            $devices       = $this->list_devices();
-            $device        = $devices$imei;
-            $subscriptions = (array) rcube_utils::get_input_value('subscribed', rcube_utils::INPUT_POST);
-            $devicealias   = rcube_utils::get_input_value('devicealias', rcube_utils::INPUT_POST, true);
-            $device'ALIAS' = $devicealias;
-
-            $err = !$this->device_update($device, $imei);
-
-            if (!$err) {
-                // iterate over folders list and update metadata if necessary
-                // old subscriptions
-                foreach (array_keys($this->folder_meta()) as $folder) {
-                    $err |= !$this->folder_set($folder, $imei, intval($subscriptions$folder));
-                    unset($subscriptions$folder);
-                }
-                // new subscription
-                foreach ($subscriptions as $folder => $flag) {
-                    $err |= !$this->folder_set($folder, $imei, intval($flag));
-                }
+            case 'save':
+                $devices       = $this->list_devices();
+                $device        = $devices$imei;
+                $subscriptions = (array) rcube_utils::get_input_value('subscribed', rcube_utils::INPUT_POST);
+                $devicealias   = rcube_utils::get_input_value('devicealias', rcube_utils::INPUT_POST, true);
+                $device'ALIAS' = $devicealias;
+
+                $err = !$this->device_update($device, $imei);
+
+                if (!$err) {
+                    // iterate over folders list and update metadata if necessary
+                    // old subscriptions
+                    foreach (array_keys($this->folder_meta()) as $folder) {
+                        $err |= !$this->folder_set($folder, $imei, intval($subscriptions$folder));
+                        unset($subscriptions$folder);
+                    }
+                    // new subscription
+                    foreach ($subscriptions as $folder => $flag) {
+                        $err |= !$this->folder_set($folder, $imei, intval($flag));
+                    }
 
-                $this->rc->output->command('plugin.activesync_save_complete', array(
-                    'success' => !$err, 'id' => $imei, 'alias' => rcube::Q($devicealias)));
-            }
+                    $this->rc->output->command('plugin.activesync_save_complete', 
+                        'success' => !$err, 'id' => $imei, 'alias' => rcube::Q($devicealias));
+                }
 
-            if ($err)
-                $this->rc->output->show_message($this->gettext('savingerror'), 'error');
-            else
-                $this->rc->output->show_message($this->gettext('successfullysaved'), 'confirmation');
+                if ($err) {
+                    $this->rc->output->show_message($this->gettext('savingerror'), 'error');
+                } else {
+                    $this->rc->output->show_message($this->gettext('successfullysaved'), 'confirmation');
+                }
 
-            break;
+                break;
 
-        case 'delete':
-            foreach ((array) $imei as $id) {
-                $success = $this->device_delete($id);
-            }
+            case 'delete':
+                foreach ((array) $imei as $id) {
+                    $success = $this->device_delete($id);
+                }
 
-            if ($success) {
-                $this->rc->output->show_message($this->gettext('successfullydeleted'), 'confirmation');
-                $this->rc->output->command('plugin.activesync_save_complete', array(
-                        'success' => true,
-                        'delete'  => true,
-                        'id'      => count($imei) > 1 ? 'ALL' : $imei0,
-                ));
-            }
-            else
-                $this->rc->output->show_message($this->gettext('savingerror'), 'error');
+                if (!empty($success)) {
+                    $this->rc->output->show_message($this->gettext('successfullydeleted'), 'confirmation');
+                    $this->rc->output->command('plugin.activesync_save_complete', 
+                            'success' => true,
+                            'delete'  => true,
+                            'id'      => count($imei) > 1 ? 'ALL' : $imei0,
+                    );
+                } else {
+                    $this->rc->output->show_message($this->gettext('savingerror'), 'error');
+                }
 
-            break;
+                break;
 
-        case 'update':
-            $subscription = (int) rcube_utils::get_input_value('flag', rcube_utils::INPUT_POST);
-            $folder       = rcube_utils::get_input_value('folder', rcube_utils::INPUT_POST);
+            case 'update':
+                $subscription = (int) rcube_utils::get_input_value('flag', rcube_utils::INPUT_POST);
+                $folder       = rcube_utils::get_input_value('folder', rcube_utils::INPUT_POST);
 
-            $err = !$this->folder_set($folder, $imei, $subscription);
+                $err = !$this->folder_set($folder, $imei, $subscription);
 
-            if ($err)
-                $this->rc->output->show_message($this->gettext('savingerror'), 'error');
-            else
-                $this->rc->output->show_message($this->gettext('successfullysaved'), 'confirmation');
+                if ($err) {
+                    $this->rc->output->show_message($this->gettext('savingerror'), 'error');
+                } else {
+                    $this->rc->output->show_message($this->gettext('successfullysaved'), 'confirmation');
+                }
 
-            break;
+                break;
         }
 
         $this->rc->output->send();
@@ -208,7 +210,7 @@
 
         $this->ui = new kolab_activesync_ui($this);
 
-        $this->register_handler('plugin.devicelist', array($this->ui, 'device_list'));
+        $this->register_handler('plugin.devicelist', $this->ui, 'device_list');
 
         $this->rc->output->send('kolab_activesync.config');
     }
@@ -233,8 +235,8 @@
             return $this->ui->init_message();
         }
 
-        $this->register_handler('plugin.deviceconfigform', array($this->ui, 'device_config_form'));
-        $this->register_handler('plugin.foldersubscriptions', array($this->ui, 'folder_subscriptions'));
+        $this->register_handler('plugin.deviceconfigform', $this->ui, 'device_config_form');
+        $this->register_handler('plugin.foldersubscriptions', $this->ui, 'folder_subscriptions');
 
         $imei    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $devices = $this->list_devices();
@@ -243,9 +245,8 @@
             $this->ui->device        = $device;
             $this->ui->device'_id' = $imei;
             $this->rc->output->set_env('active_device', $imei);
-            $this->rc->output->command('parent.enable_command','plugin.delete-device', true);
-        }
-        else {
+            $this->rc->output->command('parent.enable_command', 'plugin.delete-device', true);
+        } else {
             $this->rc->output->show_message($this->gettext('devicenotfound'), 'error');
         }
 
@@ -276,9 +277,8 @@
             // @TODO: consider server annotation instead of INBOX
             if ($meta = $storage->get_metadata(self::ROOT_MAILBOX, self::ASYNC_KEY)) {
                 $this->root_meta = $this->unserialize_metadata($metaself::ROOT_MAILBOXself::ASYNC_KEY);
-            }
-            else {
-                $this->root_meta = array();
+            } else {
+                $this->root_meta = ;
             }
         }
 
@@ -286,7 +286,7 @@
             return $this->root_meta'DEVICE';
         }
 
-        return array();
+        return ;
     }
 
     /**
@@ -297,7 +297,7 @@
     public function folder_meta()
     {
         if (!isset($this->folder_meta)) {
-            $this->folder_meta = array();
+            $this->folder_meta = ;
             $storage = $this->rc->get_storage();
 
             // get folders activesync config
@@ -332,17 +332,17 @@
         $metadata = $this->folder_meta();
         $metadata = $metadata$name;
 
-        if ($flag)  {
+        if ($flag) {
             if (empty($metadata)) {
-                $metadata = array();
+                $metadata = ;
             }
 
             if (empty($metadata'FOLDER')) {
-                $metadata'FOLDER' = array();
+                $metadata'FOLDER' = ;
             }
 
             if (empty($metadata'FOLDER'$deviceid)) {
-                $metadata'FOLDER'$deviceid = array();
+                $metadata'FOLDER'$deviceid = ;
             }
 
             // Z-Push uses:
@@ -376,8 +376,8 @@
 
         $storage = $this->rc->get_storage();
 
-        return $storage->set_metadata($name, array(
-            self::ASYNC_KEY => $this->serialize_metadata($metadata)));
+        return $storage->set_metadata($name, 
+            self::ASYNC_KEY => $this->serialize_metadata($metadata));
     }
 
     /**
@@ -406,7 +406,7 @@
 
         $metadata = $this->root_meta;
         $metadata'DEVICE'$id = $device;
-        $metadata = array(self::ASYNC_KEY => $this->serialize_metadata($metadata));
+        $metadata = self::ASYNC_KEY => $this->serialize_metadata($metadata);
         $storage  = $this->rc->get_storage();
 
         $result = $storage->set_metadata(self::ROOT_MAILBOX, $metadata);
@@ -445,7 +445,7 @@
         }
 
         $metadata = $this->serialize_metadata($this->root_meta);
-        $metadata = array(self::ASYNC_KEY => $metadata);
+        $metadata = self::ASYNC_KEY => $metadata;
         $storage  = $this->rc->get_storage();
 
         // update meta data
@@ -455,8 +455,9 @@
             // remove device annotation for every folder
             foreach ($this->folder_meta() as $folder => $meta) {
                 // skip root folder (already handled above)
-                if ($folder == self::ROOT_MAILBOX)
+                if ($folder == self::ROOT_MAILBOX) {
                     continue;
+                }
 
                 if (!empty($meta'FOLDER') && isset($meta'FOLDER'$id)) {
                     unset($meta'FOLDER'$id);
@@ -470,7 +471,7 @@
                         $meta = null;
                     }
 
-                    $metadata = array(self::ASYNC_KEY => $this->serialize_metadata($meta));
+                    $metadata = self::ASYNC_KEY => $this->serialize_metadata($meta);
                     $res = $storage->set_metadata($folder, $metadata);
 
                     if ($res && $meta) {
@@ -484,8 +485,11 @@
             $table = $db->table_name('syncroton_device');
 
             if (in_array($table, $db->list_tables())) {
-                $db->query("DELETE FROM $table WHERE owner_id = ? AND deviceid = ?",
-                    $this->rc->user->ID, $id);
+                $db->query(
+                    "DELETE FROM $table WHERE owner_id = ? AND deviceid = ?",
+                    $this->rc->user->ID,
+                    $id
+                );
             }
         }
 
@@ -497,7 +501,7 @@
      *
      * @param string $id  Device ID
      *
-     * @return array Device data
+     * @return array|null Device data
      */
     public function device_info($id)
     {
@@ -505,17 +509,22 @@
         $table = $db->table_name('syncroton_device');
 
         if (in_array($table, $db->list_tables())) {
-            $fields = array('devicetype', 'acsversion', 'useragent', 'friendlyname', 'os',
-                'oslanguage', 'phonenumber');
+            $fields = 'devicetype', 'acsversion', 'useragent', 'friendlyname', 'os',
+                'oslanguage', 'phonenumber';
 
-            $result = $db->query("SELECT " . $db->array2list($fields, 'ident')
+            $result = $db->query(
+                "SELECT " . $db->array2list($fields, 'ident')
                 . " FROM $table WHERE owner_id = ? AND id = ?",
-                $this->rc->user->ID, $id);
+                $this->rc->user->ID,
+                $id
+            );
 
             if ($result && ($sql_arr = $db->fetch_assoc($result))) {
                 return $sql_arr;
             }
         }
+
+        return null;
     }
 
     /**

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php Changed

@@ -25,12 +25,14 @@
 
 class kolab_activesync_ui
 {
+    public $device = ;
+
     private $rc;
     private $plugin;
     private $force_subscriptions = ;
-    public  $device = ;
+    private $skin_path;
 
-    const SETUP_URL = 'https://kb.kolabenterprise.com/documentation/setting-up-an-activesync-client';
+    public const SETUP_URL = 'https://kb.kolabenterprise.com/documentation/setting-up-an-activesync-client';
 
 
     public function __construct($plugin)
@@ -109,14 +111,14 @@
 
     public function folder_subscriptions($attrib = )
     {
-        if (!$attrib'id') {
+        if (empty($attrib'id')) {
             $attrib'id' = 'foldersubscriptions';
         }
 
         // group folders by type (show only known types)
         $folder_groups = 'mail' => , 'contact' => , 'event' => , 'task' => , 'note' => ;
         $folder_types  = kolab_storage::folders_typedata();
-        $use_fieldsets = rcube_utils::get_boolean($attrib'use-fieldsets');
+        $use_fieldsets = rcube_utils::get_boolean($attrib'use-fieldsets' ?? '');
         $imei          = $this->device'_id';
         $subscribed    = ;
 
@@ -129,9 +131,8 @@
 
         foreach ($this->plugin->list_folders() as $folder) {
             if (!empty($folder_types$folder)) {
-                list($type, ) = explode('.', $folder_types$folder);
-            }
-            else {
+                $type,  = explode('.', $folder_types$folder);
+            } else {
                 $type = 'mail';
             }
 
@@ -140,7 +141,7 @@
 
                 if ($device_force_subscriptions && array_key_exists($folder, $device_force_subscriptions)) {
                     $subscribed$folder = intval($device_force_subscriptions$folder);
-                } else if (!empty($folder_meta$folder'FOLDER'$imei'S')) {
+                } elseif (!empty($folder_meta$folder'FOLDER'$imei'S')) {
                     $subscribed$folder = intval($folder_meta$folder'FOLDER'$imei'S');
                 }
             }
@@ -159,8 +160,7 @@
 
             if ($use_fieldsets) {
                 $html .= html::tag('fieldset', 'subscriptionblock', html::tag('legend', $type, $label) . $table);
-            }
-            else {
+            } else {
                 $html .= html::div('subscriptionblock', html::tag('h3', $type, $label) . $table);
             }
         }
@@ -175,19 +175,21 @@
         $alarms = ($attrib'type' == 'event' || $attrib'type' == 'task');
 
         $table = new html_table('cellspacing' => 0, 'class' => 'table-striped');
-        $table->add_header(
+        $table->add_header(
+            
                 'class'    => 'subscription checkbox-cell',
                 'title'    => $this->plugin->gettext('synchronize'),
-                'tabindex' => 0
+                'tabindex' => 0,
             ,
             !empty($attrib'syncicon') ? html::img('src' => $this->skin_path . $attrib'syncicon') : $this->plugin->gettext('synchronize')
         );
 
         if ($alarms) {
-            $table->add_header(
+            $table->add_header(
+                
                     'class'    => 'alarm checkbox-cell',
                     'title'    => $this->plugin->gettext('withalarms'),
-                    'tabindex' => 0
+                    'tabindex' => 0,
                 ,
                 !empty($attrib'alarmicon') ? html::img('src' => $this->skin_path . $attrib'alarmicon') : $this->plugin->gettext('withalarms')
             );
@@ -203,12 +205,12 @@
             $foldername = $origname = kolab_storage::object_prettyname($folder);
 
             // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
-            for ($i = count($names)-1; $i >= 0; $i--) {
-                if (strpos($foldername, $names$i.' &raquo; ') === 0) {
-                    $length = strlen($names$i.' &raquo; ');
+            for ($i = count($names) - 1; $i >= 0; $i--) {
+                if (strpos($foldername, $names$i . ' &raquo; ') === 0) {
+                    $length = strlen($names$i . ' &raquo; ');
                     $prefix = substr($foldername, 0, $length);
                     $count  = count(explode(' &raquo; ', $prefix));
-                    $foldername = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($foldername, $length);
+                    $foldername = str_repeat('&nbsp;&nbsp;', $count - 1) . '&raquo; ' . substr($foldername, $length);
                     break;
                 }
             }
@@ -230,15 +232,17 @@
 
             $table->add('subscription checkbox-cell', $checkbox_sync->show(
                 !empty($subscribed$folder) ? $folder : null,
-                'value' => $folder, 'id' => $folder_id, 'disabled' => $disabled));
+                'value' => $folder, 'id' => $folder_id, 'disabled' => $disabled
+            ));
 
             if ($alarms) {
                 $table->add('alarm checkbox-cell', $checkbox_alarm->show(
                     intval($subscribed$folder ?? 0) > 1 ? $folder : null,
-                    'value' => $folder, 'id' => $folder_id.'_alarm', 'disabled' => $disabled));
+                    'value' => $folder, 'id' => $folder_id . '_alarm', 'disabled' => $disabled
+                ));
             }
 
-            $table->add(join(' ', $classes), html::label($folder_id, $foldername));
+            $table->add(implode(' ', $classes), html::label($folder_id, $foldername));
         }
 
         return $table->show();
@@ -250,13 +254,13 @@
         $meta        = $this->plugin->folder_meta();
         $folder_data = (array) ($meta$folder_name ? $meta$folder_name'FOLDER' : null);
 
-        $table = new html_table(array('cellspacing' => 0, 'id' => 'folder-sync-options', 'class' => 'records-table'));
+        $table = new html_table('cellspacing' => 0, 'id' => 'folder-sync-options', 'class' => 'records-table');
 
         // table header
-        $table->add_header(array('class' => 'device'), $this->plugin->gettext('devicealias'));
-        $table->add_header(array('class' => 'subscription'), $this->plugin->gettext('synchronize'));
+        $table->add_header('class' => 'device', $this->plugin->gettext('devicealias'));
+        $table->add_header('class' => 'subscription', $this->plugin->gettext('synchronize'));
         if ($alarms) {
-            $table->add_header(array('class' => 'alarm'), $this->plugin->gettext('withalarms'));
+            $table->add_header('class' => 'alarm', $this->plugin->gettext('withalarms'));
         }
 
         // table records
@@ -264,8 +268,8 @@
             $info     = $this->plugin->device_info($device'ID');
             $name     = $id;
             $title    = '';
-            $checkbox = new html_checkbox(array('name' => "_subscriptions$id", 'value' => 1,
-                'onchange' => 'return activesync_object.update_sync_data(this)'));
+            $checkbox = new html_checkbox('name' => "_subscriptions$id", 'value' => 1,
+                'onchange' => 'return activesync_object.update_sync_data(this)');
 
             if (!empty($info)) {
                 $_name = trim($info'friendlyname' . ' ' . $info'os');
@@ -279,14 +283,14 @@
             $disabled = $this->is_protected($folder_name, $device'TYPE');
 
             $table->add_row();
-            $table->add(array('class' => 'device', 'title' => $title), $name);
-            $table->add('subscription checkbox-cell', $checkbox->show(!empty($folder_data$id'S') ? 1 : 0, array('disabled' => $disabled)));
+            $table->add('class' => 'device', 'title' => $title, $name);
+            $table->add('subscription checkbox-cell', $checkbox->show(!empty($folder_data$id'S') ? 1 : 0, 'disabled' => $disabled));
 
             if ($alarms) {
-                $checkbox_alarm = new html_checkbox(array('name' => "_alarms$id", 'value' => 1,
-                    'onchange' => 'return activesync_object.update_sync_data(this)'));
+                $checkbox_alarm = new html_checkbox('name' => "_alarms$id", 'value' => 1,
+                    'onchange' => 'return activesync_object.update_sync_data(this)');
 
-                $table->add('alarm checkbox-cell', $checkbox_alarm->show($folder_data$id'S' > 1 ? 1 : 0, array('disabled' => $disabled)));
+                $table->add('alarm checkbox-cell', $checkbox_alarm->show($folder_data$id'S' > 1 ? 1 : 0, 'disabled' => $disabled));
             }
         }
 
@@ -296,13 +300,13 @@
     /**
      * Displays initial page (when no devices are registered)
      */
-    function init_message()
+    public function init_message()
     {
         $this->plugin->load_config();
 
-        $this->rc->output->add_handlers(array(
-                'initmessage' => array($this, 'init_message_content')
-        ));
+        $this->rc->output->add_handlers(
+                'initmessage' => $this, 'init_message_content',
+        );
 
         $this->rc->output->send('kolab_activesync.configempty');
     }
@@ -310,11 +314,11 @@
     /**
      * Handler for initmessage template object
      */
-    function init_message_content()
+    public function init_message_content()
     {
         $url  = $this->rc->config->get('activesync_setup_url', self::SETUP_URL);
-        $vars = array('url' => $url);
-        $msg  = $this->plugin->gettext(array('name' => 'nodevices', 'vars' => $vars));
+        $vars = 'url' => $url;
+        $msg  = $this->plugin->gettext('name' => 'nodevices', 'vars' => $vars);
 
         return $msg;
     }

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/bg.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/bg_BG.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/ca_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/cs_CZ.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/da_DK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/de.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/de_CH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/de_DE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/el.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/es_AR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/es_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/et_EE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/fi_FI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/fr_FR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/hr_HR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/hu_HU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/it_IT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/ja_JP.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/ko_KR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/lv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/nl_NL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/pl.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/pl_PL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/pt_BR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/pt_PT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/ru_RU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/sk_SK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/sl_SI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/sv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/sv_SE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/th_TH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/uk_UA.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/zh_CN.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/localization/zh_TW.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_activesync/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/carddav/carddav_contacts.php Changed

@@ -87,7 +87,6 @@
     private $filter;
     private $result;
     private $namespace;
-    private $action;
 
     // list of fields used for searching in "All fields" mode
     private $search_fields = 
@@ -126,8 +125,7 @@
             if ($this->storage->get_owner() == $_SESSION'username') {
                 $this->readonly = false;
                 $this->rights = 'lrswikxtea';
-            }
-            else {
+            } else {
                 $rights = $this->storage->get_myrights();
                 if ($rights && !PEAR::isError($rights)) {
                     $this->rights = $rights;
@@ -137,8 +135,6 @@
                 }
             }
         }
-
-        $this->action = rcube::get_instance()->action;
     }
 
     /**
@@ -208,17 +204,17 @@
      */
     public function get_carddav_url()
     {
-/*
-        $rcmail = rcmail::get_instance();
-        if ($template = $rcmail->config->get('kolab_addressbook_carddav_url', null)) {
-            return strtr($template, 
-                    '%h' => $_SERVER'HTTP_HOST',
-                    '%u' => urlencode($rcmail->get_user_name()),
-                    '%i' => urlencode($this->storage->get_uid()),
-                    '%n' => urlencode($this->imap_folder),
-            );
-        }
-*/
+        /*
+                $rcmail = rcmail::get_instance();
+                if ($template = $rcmail->config->get('kolab_addressbook_carddav_url', null)) {
+                    return strtr($template, 
+                            '%h' => $_SERVER'HTTP_HOST',
+                            '%u' => urlencode($rcmail->get_user_name()),
+                            '%i' => urlencode($this->storage->get_uid()),
+                            '%n' => urlencode($this->imap_folder),
+                    );
+                }
+        */
         return false;
     }
 
@@ -233,9 +229,9 @@
     /**
      * Save a search string for future listings
      *
-     * @param mixed Search params to use in listing method, obtained by get_search_set()
+     * @param mixed $filter Search params to use in listing method, obtained by get_search_set()
      */
-    public function set_search_set($filter)
+    public function set_search_set($filter): void
     {
         $this->filter = $filter;
     }
@@ -253,7 +249,7 @@
     /**
      * Reset saved results and search parameters
      */
-    public function reset()
+    public function reset(): void
     {
         $this->result = null;
         $this->filter = null;
@@ -262,12 +258,12 @@
     /**
      * List all active contact groups of this source
      *
-     * @param string Optional search string to match group name
-     * @param int    Search mode. Sum of self::SEARCH_*
+     * @param string $search Optional search string to match group name
+     * @param int    $mode   Search mode. Sum of self::SEARCH_*
      *
      * @return array Indexed list of contact groups, each a hash array
      */
-    function list_groups($search = null, $mode = 0)
+    public function list_groups($search = null, $mode = 0)
     {
         $this->_fetch_groups();
         $groups = ;
@@ -279,7 +275,7 @@
         }
 
         // sort groups by name
-        uasort($groups, function($a, $b) { return strcoll($a'name', $b'name'); });
+        uasort($groups, function ($a, $b) { return strcoll($a'name', $b'name'); });
 
         return array_values($groups);
     }
@@ -287,15 +283,15 @@
     /**
      * List the current set of contact records
      *
-     * @param array List of cols to show
-     * @param int   Only return this number of records, use negative values for tail
-     * @param bool  True to skip the count query (select only)
+     * @param array $cols    List of cols to show
+     * @param int   $subset  Only return this number of records, use negative values for tail
+     * @param bool  $nocount True to skip the count query (select only)
      *
-     * @return array Indexed list of contact records, each a hash array
+     * @return rcube_result_set Indexed list of contact records, each a hash array
      */
     public function list_records($cols = null, $subset = 0, $nocount = false)
     {
-        $this->result = new rcube_result_set(0, ($this->list_page-1) * $this->page_size);
+        $this->result = new rcube_result_set(0, ($this->list_page - 1) * $this->page_size);
 
         $fetch_all = false;
         $fast_mode = !empty($cols) && is_array($cols);
@@ -318,8 +314,7 @@
 
                 if (!empty($member'uid')) {
                     $uids = $member'uid';
-                }
-                else if (!empty($member'email')) {
+                } elseif (!empty($member'email')) {
                     $this->contacts$member'ID' = $member;
                     $local_sortindex$member'ID' = $this->_sort_string($member);
                     $fetch_all = true;
@@ -331,15 +326,13 @@
                 $this->_fetch_contacts($query = 'uid', '=', $uids, $fetch_all ? false : count($uids), $fast_mode);
                 $this->sortindex = array_merge($this->sortindex, $local_sortindex);
             }
-        }
-        else if (isset($this->filter'ids') && is_array($this->filter'ids')) {
+        } elseif (isset($this->filter'ids') && is_array($this->filter'ids')) {
             $ids = $this->filter'ids';
             if (count($ids)) {
                 $uids = array_map($this, 'id2uid', $this->filter'ids');
                 $this->_fetch_contacts($query = 'uid', '=', $uids, count($ids), $fast_mode);
             }
-        }
-        else {
+        } else {
             $this->_fetch_contacts($query = 'contact', true, $fast_mode);
         }
 
@@ -359,13 +352,11 @@
                     $this->result->add($this->contacts$idx ?: $this->_to_rcube_contact($this->dataset$idx));
                 }
             }
-        }
-        else if (!empty($this->dataset)) {
+        } elseif (!empty($this->dataset)) {
             // get all records count, skip the query if possible
             if (!isset($query) || count($this->dataset) < $this->page_size) {
                 $this->result->count = count($this->dataset) + $this->page_size * ($this->list_page - 1);
-            }
-            else {
+            } else {
                 $this->result->count = $this->storage->count($query);
             }
 
@@ -410,8 +401,7 @@
                 }
             }
             return $result;
-        }
-        else if ($fields == '*') {
+        } elseif ($fields == '*') {
             $fields = $this->search_fields;
         }
 
@@ -426,8 +416,7 @@
         if (is_array($value)) {
             $advanced = true;
             $value = array_map('mb_strtolower', $value);
-        }
-        else {
+        } else {
             $value = mb_strtolower($value);
         }
 
@@ -461,7 +450,8 @@
             if ($required) {
                 foreach ($required as $f) {
                     // required field might be 'email', but contact might contain 'email:home'
-                    if (!($v = rcube_addressbook::get_col_values($f, $contact, true)) || empty($v)) {
+                    $v = rcube_addressbook::get_col_values($f, $contact, true);
+                    if (count($v) === 0) {
                         continue 2;
                     }
                 }
@@ -477,9 +467,8 @@
                 foreach ((array)$contact$col as $val) {
                     if (!empty($advanced)) {
                         $found$colname = $this->compare_search_value($colname, $val, $valuearray_search($colname, $fields), $mode);
-                    }
-                    else {
-                        $contents .= ' ' . join(' ', (array)$val);
+                    } else {
+                        $contents .= ' ' . implode(' ', (array)$val);
                     }
                 }
             }
@@ -494,7 +483,7 @@
 
         // dummy result with contacts count
         if (!$select) {
-            return new rcube_result_set(count($this->filter'ids'), ($this->list_page-1) * $this->page_size);
+            return new rcube_result_set(count($this->filter'ids'), ($this->list_page - 1) * $this->page_size);
         }
 
         // list records (now limited by $this->filter)
@@ -523,21 +512,19 @@
         if ($this->gid) {
             $this->_fetch_groups();
             $count = count($this->distlists$this->gid'member');
-        }
-        else if (isset($this->filter'ids') && is_array($this->filter'ids')) {
+        } elseif (isset($this->filter'ids') && is_array($this->filter'ids')) {
             $count = count($this->filter'ids');
-        }
-        else {
+        } else {
             $count = $this->storage->count('contact');
         }
 
-        return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
+        return new rcube_result_set($count, ($this->list_page - 1) * $this->page_size);
     }
 
     /**
      * Return the last result set
      *
-     * @return rcube_result_set Current result set or NULL if nothing selected yet
+     * @return ?rcube_result_set Current result set or NULL if nothing selected yet
      */
     public function get_result()
     {
@@ -547,10 +534,10 @@
     /**
      * Get a specific contact record
      *
-     * @param mixed Record identifier(s)
-     * @param bool  True to return record as associative array, otherwise a result set is returned
+     * @param mixed $id    Record identifier(s)
+     * @param bool  $assoc True to return record as associative array, otherwise a result set is returned
      *
-     * @return mixed Result object with all record fields or False if not found
+     * @return rcube_result_set|array|false Result object with all record fields or False if not found
      */
     public function get_record($id, $assoc = false)
     {
@@ -563,18 +550,18 @@
             $rec = $this->contacts$id;
             $this->readonly = true;  // set source to read-only
         }
-/*
-        else if (!empty($rev)) {
-            $rcmail = rcube::get_instance();
-            $plugin = $rcmail->plugins->get_plugin('kolab_addressbook');
-            if ($plugin && ($object = $plugin->get_revision($id, kolab_storage::id_encode($this->imap_folder), $rev))) {
-                $rec = $this->_to_rcube_contact($object);
-                $rec'rev' = $rev;
-            }
-            $this->readonly = true;  // set source to read-only
-        }
-*/
-        else if ($object = $this->storage->get_object($uid)) {
+        /*
+                else if (!empty($rev)) {
+                    $rcmail = rcube::get_instance();
+                    $plugin = $rcmail->plugins->get_plugin('kolab_addressbook');
+                    if ($plugin && ($object = $plugin->get_revision($id, kolab_storage::id_encode($this->imap_folder), $rev))) {
+                        $rec = $this->_to_rcube_contact($object);
+                        $rec'rev' = $rev;
+                    }
+                    $this->readonly = true;  // set source to read-only
+                }
+        */
+        elseif ($object = $this->storage->get_object($uid)) {
             $rec = $this->_to_rcube_contact($object);
         }
 
@@ -590,7 +577,7 @@
     /**
      * Get group assignments of a specific contact record
      *
-     * @param mixed Record identifier
+     * @param mixed $id Record identifier
      *
      * @return array List of assigned groups as ID=>Name pairs
      */
@@ -614,10 +601,10 @@
     /**
      * Create a new contact record
      *
-     * @param array Associative array with save data
+     * @param array $save_data Associative array with save data
      *  Keys:   Field name with optional section in the form FIELD:SECTION
      *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @param bool  True to check for duplicates first
+     * @param bool  $check     True to check for duplicates first
      *
      * @return mixed The created record ID on success, False on error
      */
@@ -648,13 +635,15 @@
             $saved  = $this->storage->save($object, 'contact');
 
             if (!$saved) {
-                rcube::raise_error(
+                rcube::raise_error(
+                    
                         'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Error saving contact object to CardDAV server"
+                        'message' => "Error saving contact object to CardDAV server",
                     ,
-                    true, false);
-            }
-            else {
+                    true,
+                    false
+                );
+            } else {
                 $insert_id = $object'uid';
             }
         }
@@ -665,8 +654,8 @@
     /**
      * Update a specific contact record
      *
-     * @param mixed Record identifier
-     * @param array Associative array with save data
+     * @param mixed $id        Record identifier
+     * @param array $save_data Associative array with save data
      *  Keys:   Field name with optional section in the form FIELD:SECTION
      *  Values: Field value. Can be either a string or an array of strings for multiple values
      *
@@ -679,14 +668,15 @@
             $object = $this->_from_rcube_contact($save_data, $old);
 
             if (!$this->storage->save($object, 'contact', $old'uid')) {
-                rcube::raise_error(
+                rcube::raise_error(
+                    
                         'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Error saving contact object to CardDAV server"
+                        'message' => "Error saving contact object to CardDAV server",
                     ,
-                    true, false
+                    true,
+                    false
                 );
-            }
-            else {
+            } else {
                 $updated = true;
 
                 // TODO: update data in groups this contact is member of
@@ -699,8 +689,8 @@
     /**
      * Mark one or more contact records as deleted
      *
-     * @param array Record identifiers
-     * @param bool  Remove record(s) irreversible (mark as deleted otherwise)
+     * @param array $ids   Record identifiers
+     * @param bool  $force Remove record(s) irreversible (mark as deleted otherwise)
      *
      * @return int Number of records deleted
      */
@@ -719,14 +709,15 @@
                 $deleted = $is_mailto || $this->storage->delete($uid, $force);
 
                 if (!$deleted) {
-                    rcube::raise_error(
+                    rcube::raise_error(
+                        
                             'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                            'message' => "Error deleting a contact object $uid from the CardDAV server"
+                            'message' => "Error deleting a contact object $uid from the CardDAV server",
                         ,
-                        true, false
+                        true,
+                        false
                     );
-                }
-                else {
+                } else {
                     // remove from distribution lists
                     if (isset($this->groupmembers$id)) {
                         foreach ((array) $this->groupmembers$id as $gid) {
@@ -751,7 +742,7 @@
      * Undelete one or more contact records.
      * Only possible just after delete (see 2nd argument of delete() method).
      *
-     * @param array Record identifiers
+     * @param array $ids Record identifiers
      *
      * @return int Number of records restored
      */
@@ -766,13 +757,14 @@
             $uid = $this->id2uid($id);
             if ($this->storage->undelete($uid)) {
                 $count++;
-            }
-            else {
-                rcube::raise_error(
+            } else {
+                rcube::raise_error(
+                    
                         'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Error undeleting a contact object $uid from the CardDav server"
+                        'message' => "Error undeleting a contact object $uid from the CardDav server",
                     ,
-                    true, false
+                    true,
+                    false
                 );
             }
         }
@@ -807,11 +799,11 @@
     /**
      * Create a contact group with the given name
      *
-     * @param string The group name
+     * @param string $name The group name
      *
      * @return mixed False on error, array with record props in success
      */
-    function create_group($name)
+    public function create_group($name)
     {
         $this->_fetch_groups();
 
@@ -827,11 +819,13 @@
         $saved = $this->storage->save($list, 'contact');
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving a contact group to CardDAV server"
+                    'message' => "Error saving a contact group to CardDAV server",
                 ,
-                true, false
+                true,
+                false
             );
 
             return false;
@@ -847,11 +841,11 @@
     /**
      * Delete the given group and all linked group members
      *
-     * @param string Group identifier
+     * @param string $gid Group identifier
      *
      * @return bool True on success, false if no data was changed
      */
-    function delete_group($gid)
+    public function delete_group($gid)
     {
         $this->_fetch_groups();
 
@@ -864,11 +858,13 @@
         $deleted = $this->storage->delete($list'uid');
 
         if (!$deleted) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error deleting a contact group from the CardDAV server"
+                    'message' => "Error deleting a contact group from the CardDAV server",
                 ,
-                true, false
+                true,
+                false
             );
         }
 
@@ -878,13 +874,13 @@
     /**
      * Rename a specific contact group
      *
-     * @param string Group identifier
-     * @param string New name to set for this group
-     * @param string New group identifier (if changed, otherwise don't set)
+     * @param string $gid     Group identifier
+     * @param string $newname New name to set for this group
+     * @param string $newid   New group identifier (if changed, otherwise don't set)
      *
      * @return string|false New name on success, false if no data was changed
      */
-    function rename_group($gid, $newname, &$newid)
+    public function rename_group($gid, $newname, &$newid)
     {
         $this->_fetch_groups();
 
@@ -902,11 +898,13 @@
         $saved = $this->storage->save($list, 'contact', $list'uid');
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving a contact group to CardDAV server"
+                    'message' => "Error saving a contact group to CardDAV server",
                 ,
-                true, false
+                true,
+                false
             );
 
             return false;
@@ -918,12 +916,12 @@
     /**
      * Add the given contact records the a certain group
      *
-     * @param string Group identifier
-     * @param array  List of contact identifiers to be added
+     * @param string $gid Group identifier
+     * @param array  $ids List of contact identifiers to be added
      *
      * @return int Number of contacts added
      */
-    function add_to_group($gid, $ids)
+    public function add_to_group($gid, $ids)
     {
         if (!is_array($ids)) {
             $ids = explode(',', $ids);
@@ -958,8 +956,7 @@
                 ;
                 $this->groupmembers$contact_id = $gid;
                 $added++;
-            }
-            else {
+            } else {
                 $uids$uid = $contact_id;
             }
         }
@@ -975,23 +972,23 @@
 
         if ($added) {
             $saved = $this->storage->save($list, 'contact', $list'uid');
-        }
-        else {
+        } else {
             $saved = true;
         }
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving a contact-group to CardDAV server"
+                    'message' => "Error saving a contact-group to CardDAV server",
                 ,
-                true, false
+                true,
+                false
             );
 
             $added = false;
             $this->set_error(self::ERROR_SAVING, 'errorsaving');
-        }
-        else {
+        } else {
             $this->distlists$gid = $list;
         }
 
@@ -1001,19 +998,19 @@
     /**
      * Remove the given contact records from a certain group
      *
-     * @param string Group identifier
-     * @param array  List of contact identifiers to be removed
+     * @param string $gid Group identifier
+     * @param array  $ids List of contact identifiers to be removed
      *
-     * @return bool
+     * @return int Numer of removed contacts
      */
-    function remove_from_group($gid, $ids)
+    public function remove_from_group($gid, $ids)
     {
         $this->_fetch_groups();
 
         $list = $this->distlists$gid;
 
         if (!$list) {
-            return false;
+            return 0;
         }
 
         if (!is_array($ids)) {
@@ -1021,9 +1018,12 @@
         }
 
         $new_member = ;
+        $removed = 0;
         foreach ((array) $list'member' as $member) {
             if (!in_array($member'ID', $ids)) {
                 $new_member = $member;
+            } else {
+                $removed++;
             }
         }
 
@@ -1032,34 +1032,35 @@
         $saved = $this->storage->save($list, 'contact', $list'uid');
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving a contact group to CardDAV server"
+                    'message' => "Error saving a contact group to CardDAV server",
                 ,
-                true, false
+                true,
+                false
             );
-        }
-        else {
-            // remove group assigments in local cache
-            foreach ($ids as $id) {
-                $j = array_search($gid, $this->groupmembers$id);
-                unset($this->groupmembers$id$j);
-            }
 
-            $this->distlists$gid = $list;
+            return 0;
+        }
 
-            return true;
+        // remove group assigments in local cache
+        foreach ($ids as $id) {
+            $j = array_search($gid, $this->groupmembers$id);
+            unset($this->groupmembers$id$j);
         }
 
-        return false;
+        $this->distlists$gid = $list;
+
+        return $removed;
     }
 
     /**
      * Check the given data before saving.
      * If input not valid, the message to display can be fetched using get_error()
      *
-     * @param array Associative array with contact data to save
-     * @param bool  Attempt to fix/complete data automatically
+     * @param array $save_data Associative array with contact data to save
+     * @param bool  $autofix   Attempt to fix/complete data automatically
      *
      * @return bool True if input is valid, False if not.
      */
@@ -1091,7 +1092,7 @@
         if (!isset($this->dataset) || !empty($query)) {
             if ($limit) {
                 $size = is_int($limit) && $limit < $this->page_size ? $limit : $this->page_size;
-                $this->storage->set_order_and_limit($this->_sort_columns(), $size, ($this->list_page-1) * $this->page_size);
+                $this->storage->set_order_and_limit($this->_sort_columns(), $size, ($this->list_page - 1) * $this->page_size);
             }
 
             $this->sortindex = ;
@@ -1112,19 +1113,20 @@
         $str = '';
 
         switch ($this->sort_col) {
-        case 'name':
-            $str = ($rec'name' ?? '') . ($rec'prefix' ?? '');
-        case 'firstname':
-            $str .= ($rec'firstname' ?? '') . ($rec'middlename' ?? '') . ($rec'surname' ?? '');
-            break;
-
-        case 'surname':
-            $str = ($rec'surname' ?? '') . ($rec'firstname' ?? '') . ($rec'middlename' ?? '');
-            break;
-
-        default:
-            $str = $rec$this->sort_col ?? '';
-            break;
+            case 'name':
+                $str = ($rec'name' ?? '') . ($rec'prefix' ?? '');
+                // no break
+            case 'firstname':
+                $str .= ($rec'firstname' ?? '') . ($rec'middlename' ?? '') . ($rec'surname' ?? '');
+                break;
+
+            case 'surname':
+                $str = ($rec'surname' ?? '') . ($rec'firstname' ?? '') . ($rec'middlename' ?? '');
+                break;
+
+            default:
+                $str = $rec$this->sort_col ?? '';
+                break;
         }
 
         if (!empty($rec'email')) {
@@ -1142,16 +1144,17 @@
         $sortcols = ;
 
         switch ($this->sort_col) {
-        case 'name':
-            $sortcols = 'name';
+            case 'name':
+                $sortcols = 'name';
 
-        case 'firstname':
-            $sortcols = 'firstname';
-            break;
+                // no break
+            case 'firstname':
+                $sortcols = 'firstname';
+                break;
 
-        case 'surname':
-            $sortcols = 'surname';
-            break;
+            case 'surname':
+                $sortcols = 'surname';
+                break;
         }
 
         $sortcols = 'email';
@@ -1217,16 +1220,17 @@
 
         if (count($cols)) {
             if ($mode & rcube_addressbook::SEARCH_STRICT) {
-                $prefix = '^'; $suffix = '$';
-            }
-            else if ($mode & rcube_addressbook::SEARCH_PREFIX) {
-                $prefix = '^'; $suffix = '';
-            }
-            else {
-                $prefix = ''; $suffix = '';
+                $prefix = '^';
+                $suffix = '$';
+            } elseif ($mode & rcube_addressbook::SEARCH_PREFIX) {
+                $prefix = '^';
+                $suffix = '';
+            } else {
+                $prefix = '';
+                $suffix = '';
             }
 
-            $search_string = is_array($value) ? join(' ', $value) : $value;
+            $search_string = is_array($value) ? implode(' ', $value) : $value;
             foreach (rcube_utils::normalize_string($search_string, true) as $word) {
                 $query = 'words', 'LIKE', $prefix . $word . $suffix;
             }
@@ -1258,11 +1262,9 @@
     {
         if (empty($contact'uid') && !empty($contact'ID')) {
             $contact'uid' = $this->id2uid($contact'ID');
-        }
-        else if (empty($contact'uid') && !empty($old'uid')) {
+        } elseif (empty($contact'uid') && !empty($old'uid')) {
             $contact'uid' = $old'uid';
-        }
-        else if (empty($contact'uid')) {
+        } elseif (empty($contact'uid')) {
             $rcube = rcube::get_instance();
             $contact'uid' = strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($rcube->user->get_username()), 0, 16));
         }

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/carddav/carddav_contacts_driver.php Changed

@@ -74,6 +74,8 @@
         if ($folder) {
             return new carddav_contacts($folder);
         }
+
+        return null;
     }
 
     /**
@@ -90,7 +92,7 @@
     /**
      * Delete address book folder
      *
-     * @param string $source Addressbook identifier
+     * @param string $folder Addressbook identifier
      *
      * @return bool
      */
@@ -165,11 +167,10 @@
             $abook_id = $prop'id' ?: $result;
             $props = $this->abook_prop($abook_id, $abook);
 
-            $this->rc->output->show_message('kolab_addressbook.book'.$type.'d', 'confirmation');
+            $this->rc->output->show_message('kolab_addressbook.book' . $type . 'd', 'confirmation');
             $this->rc->output->command('book_update', $props, $prop'id');
-        }
-        else {
-            $this->rc->output->show_message('kolab_addressbook.book'.$type.'error', 'error');
+        } else {
+            $this->rc->output->show_message('kolab_addressbook.book' . $type . 'error', 'error');
         }
     }
 
@@ -178,21 +179,21 @@
      */
     public function abook_prop($id, $abook)
     {
-/*
-        if ($abook->virtual) {
-            return 
-                'id'       => $id,
-                'name'     => $abook->get_name(),
-                'listname' => $abook->get_foldername(),
-                'group'    => $abook instanceof kolab_storage_folder_user ? 'user' : $abook->get_namespace(),
-                'readonly' => true,
-                'rights'   => 'l',
-                'kolab'    => true,
-                'virtual'  => true,
-                'carddav'  => true,
-            ;
-        }
-*/
+        /*
+                if ($abook instanceof kolab_storage_folder_virtual) {
+                    return 
+                        'id'       => $id,
+                        'name'     => $abook->get_name(),
+                        'listname' => $abook->get_foldername(),
+                        'group'    => $abook instanceof kolab_storage_folder_user ? 'user' : $abook->get_namespace(),
+                        'readonly' => true,
+                        'rights'   => 'l',
+                        'kolab'    => true,
+                        'virtual'  => true,
+                        'carddav'  => true,
+                    ;
+                }
+        */
         return 
             'id'         => $id,
             'name'       => $abook->get_name(),

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts.php Changed

@@ -33,85 +33,85 @@
     public $readonly = true;
     public $undelete = true;
     public $groups = true;
-    public $coltypes = array(
-        'name'         => array('limit' => 1),
-        'firstname'    => array('limit' => 1),
-        'surname'      => array('limit' => 1),
-        'middlename'   => array('limit' => 1),
-        'prefix'       => array('limit' => 1),
-        'suffix'       => array('limit' => 1),
-        'nickname'     => array('limit' => 1),
-        'jobtitle'     => array('limit' => 1),
-        'organization' => array('limit' => 1),
-        'department'   => array('limit' => 1),
-        'email'        => array('subtypes' => array('home','work','other')),
-        'phone'        => array(),
-        'address'      => array('subtypes' => array('home','work','office')),
-        'website'      => array('subtypes' => array('homepage','blog')),
-        'im'           => array('subtypes' => null),
-        'gender'       => array('limit' => 1),
-        'birthday'     => array('limit' => 1),
-        'anniversary'  => array('limit' => 1),
-        'profession'   => array(
+    public $coltypes = 
+        'name'         => 'limit' => 1,
+        'firstname'    => 'limit' => 1,
+        'surname'      => 'limit' => 1,
+        'middlename'   => 'limit' => 1,
+        'prefix'       => 'limit' => 1,
+        'suffix'       => 'limit' => 1,
+        'nickname'     => 'limit' => 1,
+        'jobtitle'     => 'limit' => 1,
+        'organization' => 'limit' => 1,
+        'department'   => 'limit' => 1,
+        'email'        => 'subtypes' => 'home','work','other',
+        'phone'        => ,
+        'address'      => 'subtypes' => 'home','work','office',
+        'website'      => 'subtypes' => 'homepage','blog',
+        'im'           => 'subtypes' => null,
+        'gender'       => 'limit' => 1,
+        'birthday'     => 'limit' => 1,
+        'anniversary'  => 'limit' => 1,
+        'profession'   => 
             'type'      => 'text',
             'size'      => 40,
             'maxlength' => 80,
             'limit'     => 1,
             'label'     => 'kolab_addressbook.profession',
-            'category'  => 'personal'
-        ),
-        'manager'      => array('limit' => null),
-        'assistant'    => array('limit' => null),
-        'spouse'       => array('limit' => 1),
-        'children'     => array(
+            'category'  => 'personal',
+        ,
+        'manager'      => 'limit' => null,
+        'assistant'    => 'limit' => null,
+        'spouse'       => 'limit' => 1,
+        'children'     => 
             'type'      => 'text',
             'size'      => 40,
             'maxlength' => 80,
             'limit'     => null,
             'label'     => 'kolab_addressbook.children',
-            'category'  => 'personal'
-        ),
-        'freebusyurl'  => array(
+            'category'  => 'personal',
+        ,
+        'freebusyurl'  => 
             'type'  => 'text',
             'size'  => 40,
             'limit' => 1,
-            'label' => 'kolab_addressbook.freebusyurl'
-        ),
-        'pgppublickey' => array(
+            'label' => 'kolab_addressbook.freebusyurl',
+        ,
+        'pgppublickey' => 
             'type' => 'textarea',
             'size' => 70,
             'rows' => 10,
             'limit' => 1,
-            'label' => 'kolab_addressbook.pgppublickey'
-        ),
-        'pkcs7publickey' => array(
+            'label' => 'kolab_addressbook.pgppublickey',
+        ,
+        'pkcs7publickey' => 
             'type' => 'textarea',
             'size' => 70,
             'rows' => 10,
             'limit' => 1,
-            'label' => 'kolab_addressbook.pkcs7publickey'
-        ),
-        'notes'        => array('limit' => 1),
-        'photo'        => array('limit' => 1),
+            'label' => 'kolab_addressbook.pkcs7publickey',
+        ,
+        'notes'        => 'limit' => 1,
+        'photo'        => 'limit' => 1,
         // TODO: define more Kolab-specific fields such as: language, latitude, longitude, crypto settings
-    );
+    ;
 
     /**
      * vCard additional fields mapping
      */
-    public $vcard_map = array(
+    public $vcard_map = 
         'profession'     => 'X-PROFESSION',
         'officelocation' => 'X-OFFICE-LOCATION',
         'initials'       => 'X-INITIALS',
         'children'       => 'X-CHILDREN',
         'freebusyurl'    => 'X-FREEBUSY-URL',
         'pgppublickey'   => 'KEY',
-    );
+    ;
 
     /**
      * List of date type fields
      */
-    public $date_cols = array('birthday', 'anniversary');
+    public $date_cols = 'birthday', 'anniversary';
 
     private $gid;
     private $storagefolder;
@@ -127,7 +127,7 @@
     private $action;
 
     // list of fields used for searching in "All fields" mode
-    private $search_fields = array(
+    private $search_fields = 
         'name',
         'firstname',
         'surname',
@@ -147,7 +147,7 @@
         'spouse',
         'children',
         'notes',
-    );
+    ;
 
 
     public function __construct($imap_folder = null)
@@ -156,13 +156,14 @@
             $this->imap_folder = $imap_folder;
         }
 
-        // extend coltypes configuration 
+        // extend coltypes configuration
+        /** @var kolab_format_contact $format */
         $format = kolab_format::factory('contact');
 
         $this->coltypes'phone''subtypes'   = array_keys($format->phonetypes);
         $this->coltypes'address''subtypes' = array_keys($format->addresstypes);
 
-        $rcube = rcube::get_instance();
+        $rcube = rcmail::get_instance();
 
         // set localized labels for proprietary cols
         foreach ($this->coltypes as $col => $prop) {
@@ -180,8 +181,7 @@
             if ($this->storagefolder->get_owner() == $_SESSION'username') {
                 $this->readonly = false;
                 $this->rights = 'lrswikxtea';
-            }
-            else {
+            } else {
                 $rights = $this->storagefolder->get_myrights();
                 if ($rights && !PEAR::isError($rights)) {
                     $this->rights = $rights;
@@ -192,7 +192,7 @@
             }
         }
 
-        $this->action = rcube::get_instance()->action;
+        $this->action = $rcube->action;
     }
 
     /**
@@ -264,12 +264,12 @@
     {
         $rcmail = rcmail::get_instance();
         if ($template = $rcmail->config->get('kolab_addressbook_carddav_url', null)) {
-            return strtr($template, array(
+            return strtr($template, 
                     '%h' => $_SERVER'HTTP_HOST',
                     '%u' => urlencode($rcmail->get_user_name()),
                     '%i' => urlencode($this->storagefolder->get_uid()),
                     '%n' => urlencode($this->imap_folder),
-            ));
+            );
         }
 
         return false;
@@ -286,9 +286,9 @@
     /**
      * Save a search string for future listings
      *
-     * @param mixed Search params to use in listing method, obtained by get_search_set()
+     * @param mixed $filter Search params to use in listing method, obtained by get_search_set()
      */
-    public function set_search_set($filter)
+    public function set_search_set($filter): void
     {
         $this->filter = $filter;
     }
@@ -306,7 +306,7 @@
     /**
      * Reset saved results and search parameters
      */
-    public function reset()
+    public function reset(): void
     {
         $this->result = null;
         $this->filter = null;
@@ -315,24 +315,24 @@
     /**
      * List all active contact groups of this source
      *
-     * @param string Optional search string to match group name
-     * @param int    Search mode. Sum of self::SEARCH_*
+     * @param string $search Optional search string to match group name
+     * @param int    $mode   Search mode. Sum of self::SEARCH_*
      *
      * @return array Indexed list of contact groups, each a hash array
      */
-    function list_groups($search = null, $mode = 0)
+    public function list_groups($search = null, $mode = 0)
     {
         $this->_fetch_groups();
-        $groups = array();
+        $groups = ;
 
         foreach ((array)$this->distlists as $group) {
             if (!$search || strstr(mb_strtolower($group'name'), mb_strtolower($search))) {
-                $groups$group'ID' = array('ID' => $group'ID', 'name' => $group'name');
+                $groups$group'ID' = 'ID' => $group'ID', 'name' => $group'name';
             }
         }
 
         // sort groups by name
-        uasort($groups, function($a, $b) { return strcoll($a'name', $b'name'); });
+        uasort($groups, function ($a, $b) { return strcoll($a'name', $b'name'); });
 
         return array_values($groups);
     }
@@ -340,15 +340,15 @@
     /**
      * List the current set of contact records
      *
-     * @param array List of cols to show
-     * @param int   Only return this number of records, use negative values for tail
-     * @param bool  True to skip the count query (select only)
+     * @param array $cols    List of cols to show
+     * @param int   $subset  Only return this number of records, use negative values for tail
+     * @param bool  $nocount True to skip the count query (select only)
      *
-     * @return array Indexed list of contact records, each a hash array
+     * @return rcube_result_set Indexed list of contact records, each a hash array
      */
     public function list_records($cols = null, $subset = 0, $nocount = false)
     {
-        $this->result = new rcube_result_set(0, ($this->list_page-1) * $this->page_size);
+        $this->result = new rcube_result_set(0, ($this->list_page - 1) * $this->page_size);
 
         $fetch_all = false;
         $fast_mode = !empty($cols) && is_array($cols);
@@ -357,10 +357,10 @@
         if ($this->gid) {
             $this->_fetch_groups();
 
-            $this->sortindex = array();
-            $this->contacts  = array();
-            $local_sortindex = array();
-            $uids            = array();
+            $this->sortindex = ;
+            $this->contacts  = ;
+            $local_sortindex = ;
+            $uids            = ;
 
             // get members with email specified
             foreach ((array)$this->distlists$this->gid'member' as $member) {
@@ -371,8 +371,7 @@
 
                 if (!empty($member'uid')) {
                     $uids = $member'uid';
-                }
-                else if (!empty($member'email')) {
+                } elseif (!empty($member'email')) {
                     $this->contacts$member'ID' = $member;
                     $local_sortindex$member'ID' = $this->_sort_string($member);
                     $fetch_all = true;
@@ -381,18 +380,16 @@
 
             // get members by UID
             if (!empty($uids)) {
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids), $fast_mode);
+                $this->_fetch_contacts($query = 'uid', '=', $uids, $fetch_all ? false : count($uids), $fast_mode);
                 $this->sortindex = array_merge($this->sortindex, $local_sortindex);
             }
-        }
-        else if ($this->filter && is_array($this->filter'ids')) {
+        } elseif ($this->filter && is_array($this->filter'ids')) {
             $ids = $this->filter'ids';
             if (count($ids)) {
-                $uids = array_map(array($this, 'id2uid'), $this->filter'ids');
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids), $fast_mode);
+                $uids = array_map($this, 'id2uid', $this->filter'ids');
+                $this->_fetch_contacts($query = 'uid', '=', $uids, count($ids), $fast_mode);
             }
-        }
-        else {
+        } else {
             $this->_fetch_contacts($query = 'contact', true, $fast_mode);
         }
 
@@ -412,13 +409,11 @@
                     $this->result->add($this->contacts$idx ?: $this->_to_rcube_contact($this->dataset$idx));
                 }
             }
-        }
-        else if (!empty($this->dataset)) {
+        } elseif (!empty($this->dataset)) {
             // get all records count, skip the query if possible
             if (!isset($query) || count($this->dataset) < $this->page_size) {
                 $this->result->count = count($this->dataset) + $this->page_size * ($this->list_page - 1);
-            }
-            else {
+            } else {
                 $this->result->count = $this->storagefolder->count($query);
             }
 
@@ -449,7 +444,7 @@
      *
      * @return rcube_result_set List of contact records and 'count' value
      */
-    public function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array())
+    public function search($fields, $value, $mode = 0, $select = true, $nocount = false, $required = )
     {
         // search by ID
         if ($fields == $this->primary_key) {
@@ -463,16 +458,15 @@
                 }
             }
             return $result;
-        }
-        else if ($fields == '*') {
+        } elseif ($fields == '*') {
             $fields = $this->search_fields;
         }
 
         if (!is_array($fields)) {
-            $fields = array($fields);
+            $fields = $fields;
         }
         if (!is_array($required) && !empty($required)) {
-            $required = array($required);
+            $required = $required;
         }
 
         // advanced search
@@ -480,8 +474,7 @@
         if (is_array($value)) {
             $advanced = true;
             $value = array_map('mb_strtolower', $value);
-        }
-        else {
+        } else {
             $value = mb_strtolower($value);
         }
 
@@ -495,16 +488,16 @@
 
         // add magic selector to select contacts with birthday dates only
         if (in_array('birthday', $required)) {
-            $squery = array('tags', '=', 'x-has-birthday');
+            $squery = 'tags', '=', 'x-has-birthday';
         }
 
-        $squery = array('type', '=', 'contact');
+        $squery = 'type', '=', 'contact';
 
         // get all/matching records
         $this->_fetch_contacts($squery);
 
         // save searching conditions
-        $this->filter = array('fields' => $fields, 'value' => $value, 'mode' => $mode, 'ids' => array());
+        $this->filter = 'fields' => $fields, 'value' => $value, 'mode' => $mode, 'ids' => ;
 
         // search by iterating over all records in dataset
         foreach ($this->dataset as $record) {
@@ -515,13 +508,14 @@
             if ($required) {
                 foreach ($required as $f) {
                     // required field might be 'email', but contact might contain 'email:home'
-                    if (!($v = rcube_addressbook::get_col_values($f, $contact, true)) || empty($v)) {
+                    $v = rcube_addressbook::get_col_values($f, $contact, true);
+                    if (count($v) === 0) {
                         continue 2;
                     }
                 }
             }
 
-            $found = array();
+            $found = ;
             $contents = '';
             foreach (preg_grep($regexp, array_keys($contact)) as $col) {
                 $pos     = strpos($col, ':');
@@ -530,9 +524,8 @@
                 foreach ((array)$contact$col as $val) {
                     if ($advanced) {
                         $found$colname = $this->compare_search_value($colname, $val, $valuearray_search($colname, $fields), $mode);
-                    }
-                    else {
-                        $contents .= ' ' . join(' ', (array)$val);
+                    } else {
+                        $contents .= ' ' . implode(' ', (array)$val);
                     }
                 }
             }
@@ -546,7 +539,7 @@
 
         // dummy result with contacts count
         if (!$select) {
-            return new rcube_result_set(count($this->filter'ids'), ($this->list_page-1) * $this->page_size);
+            return new rcube_result_set(count($this->filter'ids'), ($this->list_page - 1) * $this->page_size);
         }
 
         // list records (now limited by $this->filter)
@@ -575,21 +568,19 @@
         if ($this->gid) {
             $this->_fetch_groups();
             $count = count($this->distlists$this->gid'member');
-        }
-        else if (isset($this->filter'ids') && is_array($this->filter'ids')) {
+        } elseif (isset($this->filter'ids') && is_array($this->filter'ids')) {
             $count = count($this->filter'ids');
-        }
-        else {
+        } else {
             $count = $this->storagefolder->count('contact');
         }
 
-        return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
+        return new rcube_result_set($count, ($this->list_page - 1) * $this->page_size);
     }
 
     /**
      * Return the last result set
      *
-     * @return rcube_result_set Current result set or NULL if nothing selected yet
+     * @return ?rcube_result_set Current result set or NULL if nothing selected yet
      */
     public function get_result()
     {
@@ -599,10 +590,10 @@
     /**
      * Get a specific contact record
      *
-     * @param mixed Record identifier(s)
-     * @param bool  True to return record as associative array, otherwise a result set is returned
+     * @param mixed $id    Record identifier(s)
+     * @param bool  $assoc True to return record as associative array, otherwise a result set is returned
      *
-     * @return mixed Result object with all record fields or False if not found
+     * @return false|rcube_result_set Result object with all record fields or False if not found
      */
     public function get_record($id, $assoc = false)
     {
@@ -614,17 +605,16 @@
             $this->_fetch_groups(true);
             $rec = $this->contacts$id;
             $this->readonly = true;  // set source to read-only
-        }
-        else if (!empty($rev)) {
+        } elseif (!empty($rev)) {
             $rcmail = rcube::get_instance();
+            /** @var ?kolab_addressbook $plugin */
             $plugin = $rcmail->plugins->get_plugin('kolab_addressbook');
             if ($plugin && ($object = $plugin->get_revision($id, kolab_storage::id_encode($this->imap_folder), $rev))) {
                 $rec = $this->_to_rcube_contact($object);
                 $rec'rev' = $rev;
             }
             $this->readonly = true;  // set source to read-only
-        }
-        else if ($object = $this->storagefolder->get_object($uid)) {
+        } elseif ($object = $this->storagefolder->get_object($uid)) {
             $rec = $this->_to_rcube_contact($object);
         }
 
@@ -640,13 +630,13 @@
     /**
      * Get group assignments of a specific contact record
      *
-     * @param mixed Record identifier
+     * @param mixed $id Record identifier
      *
      * @return array List of assigned groups as ID=>Name pairs
      */
     public function get_record_groups($id)
     {
-        $out = array();
+        $out = ;
         $this->_fetch_groups();
 
         if (!empty($this->groupmembers$id)) {
@@ -664,14 +654,14 @@
     /**
      * Create a new contact record
      *
-     * @param array Associative array with save data
+     * @param array $save_data Associative array with save data
      *  Keys:   Field name with optional section in the form FIELD:SECTION
      *  Values: Field value. Can be either a string or an array of strings for multiple values
-     * @param bool  True to check for duplicates first
+     * @param bool  $check     True to check for duplicates first
      *
      * @return mixed The created record ID on success, False on error
      */
-    public function insert($save_data, $check=false)
+    public function insert($save_data, $check = false)
     {
         if (!is_array($save_data)) {
             return false;
@@ -698,13 +688,15 @@
             $saved  = $this->storagefolder->save($object, 'contact');
 
             if (!$saved) {
-                rcube::raise_error(array(
+                rcube::raise_error(
+                    
                   'code' => 600, 'type' => 'php',
                   'file' => __FILE__, 'line' => __LINE__,
-                  'message' => "Error saving contact object to Kolab server"),
-                true, false);
-            }
-            else {
+                  'message' => "Error saving contact object to Kolab server",
+                    true,
+                    false
+                );
+            } else {
                 $insert_id = $this->uid2id($object'uid');
             }
         }
@@ -715,8 +707,8 @@
     /**
      * Update a specific contact record
      *
-     * @param mixed Record identifier
-     * @param array Associative array with save data
+     * @param mixed $id        Record identifier
+     * @param array $save_data Associative array with save data
      *  Keys:   Field name with optional section in the form FIELD:SECTION
      *  Values: Field value. Can be either a string or an array of strings for multiple values
      *
@@ -729,14 +721,15 @@
             $object = $this->_from_rcube_contact($save_data, $old);
 
             if (!$this->storagefolder->save($object, 'contact', $old'uid')) {
-                rcube::raise_error(array(
+                rcube::raise_error(
+                    
                         'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Error saving contact object to Kolab server"
-                    ),
-                    true, false
+                        'message' => "Error saving contact object to Kolab server",
+                    ,
+                    true,
+                    false
                 );
-            }
-            else {
+            } else {
                 $updated = true;
 
                 // TODO: update data in groups this contact is member of
@@ -749,12 +742,12 @@
     /**
      * Mark one or more contact records as deleted
      *
-     * @param array Record identifiers
-     * @param bool  Remove record(s) irreversible (mark as deleted otherwise)
+     * @param array $ids   Record identifiers
+     * @param bool  $force Remove record(s) irreversible (mark as deleted otherwise)
      *
      * @return int Number of records deleted
      */
-    public function delete($ids, $force=true)
+    public function delete($ids, $force = true)
     {
         $this->_fetch_groups();
 
@@ -769,14 +762,15 @@
                 $deleted = $is_mailto || $this->storagefolder->delete($uid, $force);
 
                 if (!$deleted) {
-                    rcube::raise_error(array(
+                    rcube::raise_error(
+                        
                             'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                            'message' => "Error deleting a contact object $uid from the Kolab server"
-                        ),
-                        true, false
+                            'message' => "Error deleting a contact object $uid from the Kolab server",
+                        ,
+                        true,
+                        false
                     );
-                }
-                else {
+                } else {
                     // remove from distribution lists
                     if (!empty($this->groupmembers$id)) {
                         foreach ((array) $this->groupmembers$id as $gid) {
@@ -801,7 +795,7 @@
      * Undelete one or more contact records.
      * Only possible just after delete (see 2nd argument of delete() method).
      *
-     * @param array Record identifiers
+     * @param array $ids Record identifiers
      *
      * @return int Number of records restored
      */
@@ -816,13 +810,14 @@
             $uid = $this->id2uid($id);
             if ($this->storagefolder->undelete($uid)) {
                 $count++;
-            }
-            else {
-                rcube::raise_error(array(
+            } else {
+                rcube::raise_error(
+                    
                         'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Error undeleting a contact object $uid from the Kolab server"
-                    ),
-                    true, false
+                        'message' => "Error undeleting a contact object $uid from the Kolab server",
+                    ,
+                    true,
+                    false
                 );
             }
         }
@@ -838,8 +833,8 @@
     public function delete_all($with_groups = false)
     {
         if ($this->storagefolder->delete_all()) {
-            $this->contacts  = array();
-            $this->sortindex = array();
+            $this->contacts  = ;
+            $this->sortindex = ;
             $this->dataset   = null;
             $this->result    = null;
         }
@@ -856,34 +851,36 @@
     /**
      * Create a contact group with the given name
      *
-     * @param string The group name
+     * @param string $name The group name
      *
-     * @return mixed False on error, array with record props in success
+     * @return array|false False on error, array with record props in success
      */
-    function create_group($name)
+    public function create_group($name)
     {
         $this->_fetch_groups();
         $result = false;
 
-        $list = array(
+        $list = 
             'name' => $name,
-            'member' => array(),
-        );
+            'member' => ,
+        ;
         $saved = $this->storagefolder->save($list, 'distribution-list');
 
         if (!$saved) {
-            rcube::raise_error(array(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving distribution-list object to Kolab server"
-                ),
-                true, false
+                    'message' => "Error saving distribution-list object to Kolab server",
+                ,
+                true,
+                false
             );
             return false;
-        }
-        else {
+        } else {
+            // @phpstan-ignore-next-line FIXME: this one might be valid error
             $id = $this->uid2id($list'uid');
             $this->distlists$id = $list;
-            $result = array('id' => $id, 'name' => $name);
+            $result = 'id' => $id, 'name' => $name;
         }
 
         return $result;
@@ -892,11 +889,11 @@
     /**
      * Delete the given group and all linked group members
      *
-     * @param string Group identifier
+     * @param string $gid Group identifier
      *
      * @return bool True on success, false if no data was changed
      */
-    function delete_group($gid)
+    public function delete_group($gid)
     {
         $this->_fetch_groups();
         $result = false;
@@ -905,15 +902,16 @@
             $deleted = $this->storagefolder->delete($list'uid');
         }
 
-        if (!$deleted) {
-            rcube::raise_error(array(
+        if (empty($deleted)) {
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error deleting distribution-list object from the Kolab server"
-                ),
-                true, false
+                    'message' => "Error deleting distribution-list object from the Kolab server",
+                ,
+                true,
+                false
             );
-        }
-        else {
+        } else {
             $result = true;
         }
 
@@ -923,13 +921,13 @@
     /**
      * Rename a specific contact group
      *
-     * @param string Group identifier
-     * @param string New name to set for this group
-     * @param string New group identifier (if changed, otherwise don't set)
+     * @param string $gid     Group identifier
+     * @param string $newname New name to set for this group
+     * @param string $newid   New group identifier (if changed, otherwise don't set)
      *
-     * @return bool New name on success, false if no data was changed
+     * @return string|bool New name on success, false if no data was changed
      */
-    function rename_group($gid, $newname, &$newid)
+    public function rename_group($gid, $newname, &$newid)
     {
         $this->_fetch_groups();
         $list = $this->distlists$gid;
@@ -939,12 +937,14 @@
             $saved = $this->storagefolder->save($list, 'distribution-list', $list'uid');
         }
 
-        if (!$saved) {
-            rcube::raise_error(array(
+        if (empty($saved)) {
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving distribution-list object to Kolab server"
-                ),
-                true, false
+                    'message' => "Error saving distribution-list object to Kolab server",
+                ,
+                true,
+                false
             );
             return false;
         }
@@ -955,11 +955,12 @@
     /**
      * Add the given contact records the a certain group
      *
-     * @param string Group identifier
-     * @param array  List of contact identifiers to be added
-     * @return int   Number of contacts added
+     * @param string $gid Group identifier
+     * @param array  $ids List of contact identifiers to be added
+     *
+     * @return int Number of contacts added
      */
-    function add_to_group($gid, $ids)
+    public function add_to_group($gid, $ids)
     {
         if (!is_array($ids)) {
             $ids = explode(',', $ids);
@@ -969,8 +970,8 @@
 
         $list   = $this->distlists$gid;
         $added  = 0;
-        $uids   = array();
-        $exists = array();
+        $uids   = ;
+        $exists = ;
 
         foreach ((array)$list'member' as $member) {
             $exists = $member'ID';
@@ -983,14 +984,13 @@
         foreach ($ids as $contact_id) {
             $uid = $this->id2uid($contact_id);
             if (strpos($uid, 'mailto:') === 0 && ($contact = $this->contacts$contact_id)) {
-                $list'member' = array(
+                $list'member' = 
                     'email' => $contact'email',
                     'name'  => $contact'name',
-                );
+                ;
                 $this->groupmembers$contact_id = $gid;
                 $added++;
-            }
-            else {
+            } else {
                 $uids$uid = $contact_id;
             }
         }
@@ -998,7 +998,7 @@
         // add members with UID
         if (!empty($uids)) {
             foreach ($uids as $uid => $contact_id) {
-                $list'member' = array('uid' => $uid);
+                $list'member' = 'uid' => $uid;
                 $this->groupmembers$contact_id = $gid;
                 $added++;
             }
@@ -1006,23 +1006,23 @@
 
         if ($added) {
             $saved = $this->storagefolder->save($list, 'distribution-list', $list'uid');
-        }
-        else {
+        } else {
             $saved = true;
         }
 
         if (!$saved) {
-            rcube::raise_error(array(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving distribution-list to Kolab server"
-                ),
-                true, false
+                    'message' => "Error saving distribution-list to Kolab server",
+                ,
+                true,
+                false
             );
 
-            $added = false;
+            $added = 0;
             $this->set_error(self::ERROR_SAVING, 'errorsaving');
-        }
-        else {
+        } else {
             $this->distlists$gid = $list;
         }
 
@@ -1032,11 +1032,12 @@
     /**
      * Remove the given contact records from a certain group
      *
-     * @param string Group identifier
-     * @param array  List of contact identifiers to be removed
-     * @return int   Number of deleted group members
+     * @param string $gid Group identifier
+     * @param array  $ids List of contact identifiers to be removed
+     *
+     * @return int Number of deleted group members
      */
-    function remove_from_group($gid, $ids)
+    public function remove_from_group($gid, $ids)
     {
         if (!is_array($ids)) {
             $ids = explode(',', $ids);
@@ -1044,13 +1045,17 @@
 
         $this->_fetch_groups();
         if (!($list = $this->distlists$gid)) {
-            return false;
+            return 0;
         }
 
-        $new_member = array();
+        $new_member = ;
+        $removed = 0;
+
         foreach ((array)$list'member' as $member) {
             if (!in_array($member'ID', $ids)) {
                 $new_member = $member;
+            } else {
+                $removed++;
             }
         }
 
@@ -1059,32 +1064,35 @@
         $saved = $this->storagefolder->save($list, 'distribution-list', $list'uid');
 
         if (!$saved) {
-            rcube::raise_error(array(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving distribution-list object to Kolab server"
-                ),
-                true, false
+                    'message' => "Error saving distribution-list object to Kolab server",
+                ,
+                true,
+                false
             );
+
+            return 0;
         }
-        else {
-            // remove group assigments in local cache
-            foreach ($ids as $id) {
-                $j = array_search($gid, $this->groupmembers$id);
-                unset($this->groupmembers$id$j);
-            }
-            $this->distlists$gid = $list;
-            return true;
+
+        // remove group assigments in local cache
+        foreach ($ids as $id) {
+            $j = array_search($gid, $this->groupmembers$id);
+            unset($this->groupmembers$id$j);
         }
 
-        return false;
+        $this->distlists$gid = $list;
+
+        return $removed;
     }
 
     /**
      * Check the given data before saving.
      * If input not valid, the message to display can be fetched using get_error()
      *
-     * @param array Associative array with contact data to save
-     * @param bool  Attempt to fix/complete data automatically
+     * @param array $save_data Associative array with contact data to save
+     * @param bool  $autofix   Attempt to fix/complete data automatically
      *
      * @return bool True if input is valid, False if not.
      */
@@ -1111,15 +1119,15 @@
     /**
      * Query storage layer and store records in private member var
      */
-    private function _fetch_contacts($query = array(), $limit = false, $fast_mode = false)
+    private function _fetch_contacts($query = , $limit = false, $fast_mode = false)
     {
         if (!isset($this->dataset) || !empty($query)) {
             if ($limit) {
                 $size = is_int($limit) && $limit < $this->page_size ? $limit : $this->page_size;
-                $this->storagefolder->set_order_and_limit($this->_sort_columns(), $size, ($this->list_page-1) * $this->page_size);
+                $this->storagefolder->set_order_and_limit($this->_sort_columns(), $size, ($this->list_page - 1) * $this->page_size);
             }
 
-            $this->sortindex = array();
+            $this->sortindex = ;
             $this->dataset   = $this->storagefolder->select($query, $fast_mode);
 
             foreach ($this->dataset as $idx => $record) {
@@ -1137,19 +1145,20 @@
         $str = '';
 
         switch ($this->sort_col) {
-        case 'name':
-            $str = ($rec'name' ?? '') . ($rec'prefix' ?? '');
-        case 'firstname':
-            $str .= ($rec'firstname' ?? '') . ($rec'middlename' ?? '') . ($rec'surname' ?? '');
-            break;
-
-        case 'surname':
-            $str = ($rec'surname' ?? '') . ($rec'firstname' ?? '') . ($rec'middlename' ?? '');
-            break;
-
-        default:
-            $str = $rec$this->sort_col;
-            break;
+            case 'name':
+                $str = ($rec'name' ?? '') . ($rec'prefix' ?? '');
+                // no break
+            case 'firstname':
+                $str .= ($rec'firstname' ?? '') . ($rec'middlename' ?? '') . ($rec'surname' ?? '');
+                break;
+
+            case 'surname':
+                $str = ($rec'surname' ?? '') . ($rec'firstname' ?? '') . ($rec'middlename' ?? '');
+                break;
+
+            default:
+                $str = $rec$this->sort_col;
+                break;
         }
 
         if (!empty($rec'email')) {
@@ -1164,18 +1173,19 @@
      */
     private function _sort_columns()
     {
-        $sortcols = array();
+        $sortcols = ;
 
         switch ($this->sort_col) {
-        case 'name':
-            $sortcols = 'name';
-        case 'firstname':
-            $sortcols = 'firstname';
-            break;
-
-        case 'surname':
-            $sortcols = 'surname';
-            break;
+            case 'name':
+                $sortcols = 'name';
+                // no break
+            case 'firstname':
+                $sortcols = 'firstname';
+                break;
+
+            case 'surname':
+                $sortcols = 'surname';
+                break;
         }
 
         $sortcols = 'email';
@@ -1188,7 +1198,7 @@
     private function _fetch_groups($with_contacts = false)
     {
         if (!isset($this->distlists)) {
-            $this->distlists = $this->groupmembers = array();
+            $this->distlists = $this->groupmembers = ;
             foreach ($this->storagefolder->select('distribution-list', true) as $record) {
                 $record'ID' = $this->uid2id($record'uid');
                 foreach ((array)$record'member' as $i => $member) {
@@ -1227,8 +1237,8 @@
      */
     private function _search_query($fields, $value, $mode)
     {
-        $query = array();
-        $cols  = array();
+        $query = ;
+        $cols  = ;
 
         // $fulltext_cols might contain composite field names e.g. 'email:address' while $fields not
         foreach (kolab_format_contact::$fulltext_cols as $col) {
@@ -1242,18 +1252,19 @@
 
         if (count($cols) == count($fields)) {
             if ($mode & rcube_addressbook::SEARCH_STRICT) {
-                $prefix = '^'; $suffix = '$';
-            }
-            else if ($mode & rcube_addressbook::SEARCH_PREFIX) {
-                $prefix = '^'; $suffix = '';
-            }
-            else {
-                $prefix = ''; $suffix = '';
+                $prefix = '^';
+                $suffix = '$';
+            } elseif ($mode & rcube_addressbook::SEARCH_PREFIX) {
+                $prefix = '^';
+                $suffix = '';
+            } else {
+                $prefix = '';
+                $suffix = '';
             }
 
-            $search_string = is_array($value) ? join(' ', $value) : $value;
+            $search_string = is_array($value) ? implode(' ', $value) : $value;
             foreach (rcube_utils::normalize_string($search_string, true) as $word) {
-                $query = array('words', 'LIKE', $prefix . $word . $suffix);
+                $query = 'words', 'LIKE', $prefix . $word . $suffix;
             }
         }
 
@@ -1268,7 +1279,7 @@
         $record'ID' = $this->uid2id($record'uid');
 
         // convert email, website, phone values
-        foreach (array('email'=>'address', 'website'=>'url', 'phone'=>'number') as $col => $propname) {
+        foreach ('email' => 'address', 'website' => 'url', 'phone' => 'number' as $col => $propname) {
             if (isset($record$col) && is_array($record$col)) {
                 $values = $record$col;
                 unset($record$col);
@@ -1284,13 +1295,13 @@
             unset($record'address');
             foreach ($addresses as $i => $adr) {
                 $key = 'address' . ($adr'type' ? ':' . $adr'type' : '');
-                $record$key = array(
+                $record$key = 
                     'street'   => $adr'street',
                     'locality' => $adr'locality',
                     'zipcode'  => $adr'code',
                     'region'   => $adr'region',
                     'country'  => $adr'country',
-                );
+                ;
             }
         }
 
@@ -1301,8 +1312,7 @@
             if ($this->action == 'photo') {
                 if (!empty($att'content')) {
                     $record'photo' = $att'content';
-                }
-                else {
+                } else {
                     $record'photo' = $this->storagefolder->get_attachment($record'uid', $att'id');
                 }
             }
@@ -1325,32 +1335,31 @@
     /**
      * Map fields from Roundcube format to internal kolab_format_contact properties
      */
-    private function _from_rcube_contact($contact, $old = array())
+    private function _from_rcube_contact($contact, $old = )
     {
         if (empty($contact'uid') && !empty($contact'ID')) {
             $contact'uid' = $this->id2uid($contact'ID');
-        }
-        else if (empty($contact'uid') && !empty($old'uid')) {
+        } elseif (empty($contact'uid') && !empty($old'uid')) {
             $contact'uid' = $old'uid';
         }
 
         $contact'im' = array_filter($this->get_col_values('im', $contact, true));
 
         // convert email, website, phone values
-        foreach (array('email'=>'address', 'website'=>'url', 'phone'=>'number') as $col => $propname) {
+        foreach ('email' => 'address', 'website' => 'url', 'phone' => 'number' as $col => $propname) {
             $col_values = $this->get_col_values($col, $contact);
-            $contact$col = array();
+            $contact$col = ;
             foreach ($col_values as $type => $values) {
                 foreach ((array)$values as $val) {
                     if (!empty($val)) {
-                        $contact$col = array($propname => $val, 'type' => $type);
+                        $contact$col = $propname => $val, 'type' => $type;
                     }
                 }
-                unset($contact$col.':'.$type);
+                unset($contact$col . ':' . $type);
             }
         }
 
-        $addresses = array();
+        $addresses = ;
         foreach ($this->get_col_values('address', $contact) as $type => $values) {
             foreach ((array)$values as $adr) {
                 // skip empty address
@@ -1359,17 +1368,17 @@
                     continue;
                 }
 
-                $addresses = array(
+                $addresses = 
                     'type' => $type,
                     'street' => $adr'street',
                     'locality' => $adr'locality',
                     'code' => $adr'zipcode',
                     'region' => $adr'region',
                     'country' => $adr'country',
-                );
+                ;
             }
 
-            unset($contact'address:'.$type);
+            unset($contact'address:' . $type);
         }
 
         $contact'address' = $addresses;
@@ -1396,12 +1405,12 @@
         unset($contact'vcard');
 
         // add empty values for some fields which can be removed in the UI
-        return array_filter($contact) + array(
+        return array_filter($contact) + 
                 'nickname' => '',
                 'birthday' => '',
                 'anniversary' => '',
                 'freebusyurl' => '',
-                'photo' => $contact'photo' ?? null
-            );
+                'photo' => $contact'photo' ?? null,
+            ;
     }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts_driver.php Changed

@@ -33,7 +33,7 @@
         $this->plugin = $plugin;
         $this->rc     = rcube::get_instance();
     }
- 
+
     /**
      * List addressbook sources (folders)
      */
@@ -44,16 +44,6 @@
         // get all folders that have "contact" type
         $folders = kolab_storage::sort_folders(kolab_storage::get_folders('contact'));
 
-        if (PEAR::isError($folders)) {
-            rcube::raise_error(
-                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Failed to list contact folders from Kolab server:" . $folders->getMessage()
-                ,
-                true, false);
-
-            return ;
-        }
-
         // we need at least one folder to prevent from errors in Roundcube core
         // when there's also no sql nor ldap addressbook (Bug #2086)
         if (empty($folders)) {
@@ -90,12 +80,14 @@
         if ($folder && $folder->type == 'contact') {
             return new kolab_contacts($folder->name);
         }
+
+        return null;
     }
 
     /**
      * Delete address book folder
      *
-     * @param string $source Addressbook identifier
+     * @param string $folder Addressbook identifier
      *
      * @return bool
      */
@@ -105,7 +97,7 @@
         $folder   = kolab_storage::get_folder($folderId);
 
         if ($folder && kolab_storage::folder_delete($folder->name)) {
-            return $folderId;
+            return true;
         }
 
         return false;
@@ -132,8 +124,7 @@
             $path_imap = explode($delim, $folder);
             $name      = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
             $path_imap = implode($delim, $path_imap);
-        }
-        else { // create
+        } else { // create
             $path_imap = $folder;
             $name      = '';
             $folder    = '';
@@ -141,46 +132,44 @@
 
         // Store old name, get folder options
         if (strlen($folder)) {
-            $hidden_fields = array('name' => '_oldname', 'value' => $folder);
+            $hidden_fields = 'name' => '_oldname', 'value' => $folder;
 
             $options = $storage->folder_info($folder);
         }
 
-        $form = array();
+        $form = ;
 
         // General tab
-        $form'properties' = array(
+        $form'properties' = 
             'name'   => $rcube->gettext('properties'),
-            'fields' => array(),
-        );
+            'fields' => ,
+        ;
 
         if (!empty($options) && ($options'norename' || $options'protected')) {
             $foldername = rcube::Q(str_replace($delim, ' &raquo; ', kolab_storage::object_name($folder)));
-        }
-        else {
-            $foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
+        } else {
+            $foldername = new html_inputfield('name' => '_name', 'id' => '_name', 'size' => 30);
             $foldername = $foldername->show($name);
         }
 
-        $form'properties''fields''name' = array(
+        $form'properties''fields''name' = 
             'label' => $rcube->gettext('bookname', 'kolab_addressbook'),
             'value' => $foldername,
             'id'    => '_name',
-        );
+        ;
 
         if (!empty($options) && ($options'norename' || $options'protected')) {
             // prevent user from moving folder
-            $hidden_fields = array('name' => '_parent', 'value' => $path_imap);
-        }
-        else {
-            $prop   = array('name' => '_parent', 'id' => '_parent');
+            $hidden_fields = 'name' => '_parent', 'value' => $path_imap;
+        } else {
+            $prop   = 'name' => '_parent', 'id' => '_parent';
             $select = kolab_storage::folder_selector('contact', $prop, $folder);
 
-            $form'properties''fields''parent' = array(
+            $form'properties''fields''parent' = 
                 'label' => $rcube->gettext('parentbook', 'kolab_addressbook'),
                 'value' => $select->show(strlen($folder) ? $path_imap : ''),
                 'id'    => '_parent',
-            );
+            ;
         }
 
         return kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
@@ -200,24 +189,23 @@
         ;
 
         $result = $error = false;
+        $folder = null;
         $type = strlen($prop'oldname') ? 'update' : 'create';
-        $prop = $this->rc->plugins->exec_hook('addressbook_'.$type, $prop);
+        $prop = $this->rc->plugins->exec_hook('addressbook_' . $type, $prop);
 
         if (!$prop'abort') {
             if ($newfolder = kolab_storage::folder_update($prop)) {
                 $folder = $newfolder;
                 $result = true;
-            }
-            else {
+            } else {
                 $error = kolab_storage::$last_error;
             }
-        }
-        else {
+        } else {
             $result = $prop'result';
             $folder = $prop'name';
         }
 
-        if ($result) {
+        if ($result && $folder) {
             $kolab_folder = kolab_storage::get_folder($folder);
 
             // get folder/addressbook properties
@@ -225,12 +213,11 @@
             $props = $this->abook_prop(kolab_storage::folder_id($folder, true), $abook);
             $props'parent' = kolab_storage::folder_id($kolab_folder->get_parent(), true);
 
-            $this->rc->output->show_message('kolab_addressbook.book'.$type.'d', 'confirmation');
+            $this->rc->output->show_message('kolab_addressbook.book' . $type . 'd', 'confirmation');
             $this->rc->output->command('book_update', $props, kolab_storage::folder_id($prop'oldname', true));
-        }
-        else {
+        } else {
             if (!$error) {
-                $error = $plugin'message' ? $plugin'message' : 'kolab_addressbook.book'.$type.'error';
+                $error = !empty($prop'message') ? $prop'message' : 'kolab_addressbook.book' . $type . 'error';
             }
 
             $this->rc->output->show_message($error, 'error');
@@ -242,7 +229,7 @@
      */
     public function abook_prop($id, $abook)
     {
-        if (!empty($abook->virtual)) {
+        if ($abook instanceof kolab_storage_folder_virtual) {
             return 
                 'id'       => $id,
                 'name'     => $abook->get_name(),

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php Changed

@@ -34,22 +34,23 @@
     public $driver;
     public $bonnie_api = false;
 
+    private $folders;
     private $sources;
     private $rc;
     private $ui;
     private $recurrent = false;
 
-    const GLOBAL_FIRST = 0;
-    const PERSONAL_FIRST = 1;
-    const GLOBAL_ONLY = 2;
-    const PERSONAL_ONLY = 3;
+    public const GLOBAL_FIRST = 0;
+    public const PERSONAL_FIRST = 1;
+    public const GLOBAL_ONLY = 2;
+    public const PERSONAL_ONLY = 3;
 
     /**
      * Startup method of a Roundcube plugin
      */
     public function init()
     {
-        $this->rc = rcube::get_instance();
+        $this->rc = rcmail::get_instance();
 
         // load required plugin
         $this->require_plugin('libkolab');
@@ -65,29 +66,29 @@
         $this->driver = new $driver_class($this);
 
         // register hooks
-        $this->add_hook('addressbooks_list', array($this, 'address_sources'));
-        $this->add_hook('addressbook_get', array($this, 'get_address_book'));
-        $this->add_hook('config_get', array($this, 'config_get'));
+        $this->add_hook('addressbooks_list', $this, 'address_sources');
+        $this->add_hook('addressbook_get', $this, 'get_address_book');
+        $this->add_hook('config_get', $this, 'config_get');
 
         if ($this->rc->task == 'addressbook') {
             $this->add_texts('localization');
 
             if ($this->driver instanceof kolab_contacts_driver) {
-                $this->add_hook('contact_form', array($this, 'contact_form'));
-                $this->add_hook('contact_photo', array($this, 'contact_photo'));
+                $this->add_hook('contact_form', $this, 'contact_form');
+                $this->add_hook('contact_photo', $this, 'contact_photo');
             }
 
-            $this->add_hook('template_object_directorylist', array($this, 'directorylist_html'));
+            $this->add_hook('template_object_directorylist', $this, 'directorylist_html');
 
             // Plugin actions
-            $this->register_action('plugin.book', array($this, 'book_actions'));
-            $this->register_action('plugin.book-save', array($this, 'book_save'));
-            $this->register_action('plugin.book-search', array($this, 'book_search'));
-            $this->register_action('plugin.book-subscribe', array($this, 'book_subscribe'));
+            $this->register_action('plugin.book', $this, 'book_actions');
+            $this->register_action('plugin.book-save', $this, 'book_save');
+            $this->register_action('plugin.book-search', $this, 'book_search');
+            $this->register_action('plugin.book-subscribe', $this, 'book_subscribe');
 
-            $this->register_action('plugin.contact-changelog', array($this, 'contact_changelog'));
-            $this->register_action('plugin.contact-diff', array($this, 'contact_diff'));
-            $this->register_action('plugin.contact-restore', array($this, 'contact_restore'));
+            $this->register_action('plugin.contact-changelog', $this, 'contact_changelog');
+            $this->register_action('plugin.contact-diff', $this, 'contact_diff');
+            $this->register_action('plugin.contact-restore', $this, 'contact_restore');
 
             // get configuration for the Bonnie API
             $this->bonnie_api = libkolab::get_bonnie_api();
@@ -98,27 +99,26 @@
                 $this->ui = new kolab_addressbook_ui($this);
 
                 if ($this->bonnie_api) {
-                    $this->add_button(array(
+                    $this->add_button(
                         'command'    => 'contact-history-dialog',
                         'class'      => 'history contact-history disabled',
                         'classact'   => 'history contact-history active',
                         'innerclass' => 'icon inner',
                         'label'      => 'kolab_addressbook.showhistory',
-                        'type'       => 'link-menuitem'
-                    ), 'contactmenu');
+                        'type'       => 'link-menuitem',
+                    , 'contactmenu');
                 }
             }
-        }
-        else if ($this->rc->task == 'settings') {
+        } elseif ($this->rc->task == 'settings') {
             $this->add_texts('localization');
-            $this->add_hook('preferences_list', array($this, 'prefs_list'));
-            $this->add_hook('preferences_save', array($this, 'prefs_save'));
+            $this->add_hook('preferences_list', $this, 'prefs_list');
+            $this->add_hook('preferences_save', $this, 'prefs_save');
         }
 
         if ($this->driver instanceof kolab_contacts_driver) {
-            $this->add_hook('folder_delete', array($this, 'prefs_folder_delete'));
-            $this->add_hook('folder_rename', array($this, 'prefs_folder_rename'));
-            $this->add_hook('folder_update', array($this, 'prefs_folder_update'));
+            $this->add_hook('folder_delete', $this, 'prefs_folder_delete');
+            $this->add_hook('folder_rename', $this, 'prefs_folder_rename');
+            $this->add_hook('folder_update', $this, 'prefs_folder_update');
         }
     }
 
@@ -140,10 +140,10 @@
         // Disable all global address books
         // Assumes that all non-kolab_addressbook sources are global
         if ($abook_prio == self::PERSONAL_ONLY) {
-            $p'sources' = array();
+            $p'sources' = ;
         }
 
-        $sources = array();
+        $sources = ;
         foreach ($this->_list_sources() as $abook_id => $abook) {
             // register this address source
             $sources$abook_id = $this->driver->abook_prop($abook_id, $abook);
@@ -163,8 +163,7 @@
                 $sources$idx = $value;
             }
             $p'sources' = $sources;
-        }
-        else {
+        } else {
             // $p'sources' = array_merge($p'sources', $sources);
             foreach ($sources as $idx => $value) {
                 $p'sources'$idx = $value;
@@ -197,8 +196,7 @@
                 || (defined('rcube_addressbook::TYPE_TRUSTED_SENDER') && $source'id' == (string) rcube_addressbook::TYPE_TRUSTED_SENDER)
             ) {
                 $spec .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
-            }
-            else {
+            } else {
                 $out .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
             }
         }
@@ -211,9 +209,8 @@
             if ($tree && !empty($tree->children)) {
                 $kolab .= $this->folder_tree_html($tree, $sources, $jsdata);
             }
-        }
-        else {
-            $filter = function($source) { return !empty($source'kolab') && empty($source'hidden'); };
+        } else {
+            $filter = function ($source) { return !empty($source'kolab') && empty($source'hidden'); };
             foreach (array_filter($sources, $filter) as $j => $source) {
                 $id = strval(strlen($source'id') ? $source'id' : $j);
                 $kolab .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
@@ -222,8 +219,8 @@
 
         $out .= $kolab . $spec;
 
-        $this->rc->output->set_env('contactgroups', array_filter($jsdata, function($src){ return isset($src'type') && $src'type' == 'group'; }));
-        $this->rc->output->set_env('address_sources', array_filter($jsdata, function($src){ return !isset($src'type') || $src'type' != 'group'; }));
+        $this->rc->output->set_env('contactgroups', array_filter($jsdata, function ($src) { return isset($src'type') && $src'type' == 'group'; }));
+        $this->rc->output->set_env('address_sources', array_filter($jsdata, function ($src) { return !isset($src'type') || $src'type' != 'group'; }));
 
         $args'content' = html::tag('ul', $args, $out, html::$common_attrib);
         return $args;
@@ -238,12 +235,11 @@
         foreach ($node->children as $folder) {
             $id = $folder->id;
             $source = $data$id;
-            $is_collapsed = strpos($this->rc->config->get('collapsed_abooks',''), '&'.rawurlencode($id).'&') !== false;
+            $is_collapsed = strpos($this->rc->config->get('collapsed_abooks', ''), '&' . rawurlencode($id) . '&') !== false;
 
-            if (!empty($folder->virtual)) {
+            if ($folder instanceof kolab_storage_folder_virtual) {
                 $source = $this->driver->abook_prop($folder->id, $folder);
-            }
-            else if (empty($source)) {
+            } elseif (empty($source)) {
                 $this->sources$id = new kolab_contacts($folder->name);
                 $source = $this->driver->abook_prop($id, $this->sources$id);
             }
@@ -260,7 +256,7 @@
                 }
                 // ... and re-create the subtree
                 if (!empty($child_html)) {
-                    $content .= html::tag('ul', array('class' => 'groups', 'style' => ($is_collapsed ? "display:none;" : null)), $child_html);
+                    $content .= html::tag('ul', 'class' => 'groups', 'style' => ($is_collapsed ? "display:none;" : null), $child_html);
                 }
             }
 
@@ -283,69 +279,76 @@
         }
 
         // set class name(s)
-        $classes = array('addressbook');
-        if (!empty($source'group'))
+        $classes = 'addressbook';
+        if (!empty($source'group')) {
             $classes = $source'group';
-        if ($current === $id)
+        }
+        if ($current === $id) {
             $classes = 'selected';
-        if (!empty($source'readonly'))
+        }
+        if (!empty($source'readonly')) {
             $classes = 'readonly';
-        if (!empty($source'virtual'))
+        }
+        if (!empty($source'virtual')) {
             $classes = 'virtual';
-        if (!empty($source'class_name'))
+        }
+        if (!empty($source'class_name')) {
             $classes = $source'class_name';
+        }
 
         $name = !empty($source'listname') ? $source'listname' : (!empty($source'name') ? $source'name' : $id);
         $label_id = 'kabt:' . $id;
-        $inner = (!empty($source'virtual') ?
-            html::a(array('tabindex' => '0'), $name) :
-            html::a(array(
-                    'href' => $this->rc->url(array('_source' => $id)),
+        $inner = (
+            !empty($source'virtual') ?
+            html::a('tabindex' => '0', $name) :
+            html::a(
+                    'href' => $this->rc->url('_source' => $id),
                     'rel' => $source'id',
                     'id' => $label_id,
-                    'onclick' => "return " . rcmail_output::JS_OBJECT_NAME.".command('list','" . rcube::JQ($id) . "',this)",
-                ), $name)
+                    'onclick' => "return " . rcmail_output::JS_OBJECT_NAME . ".command('list','" . rcube::JQ($id) . "',this)",
+                , $name)
         );
 
         if ($this->driver instanceof kolab_contacts_driver && isset($source'subscribed')) {
-            $inner .= html::span(array(
+            $inner .= html::span(
                 'class' => 'subscribed',
                 'title' => $this->gettext('foldersubscribe'),
                 'role' => 'checkbox',
                 'aria-checked' => $source'subscribed' ? 'true' : 'false',
-            ), '');
+            , '');
         }
 
         // don't wrap in <li> but add a checkbox for search results listing
         if ($search_mode) {
-            $jsdata$id'group' = join(' ', $classes);
+            $jsdata$id'group' = implode(' ', $classes);
 
             if (!$source'virtual') {
-                $inner .= html::tag('input', array(
+                $inner .= html::tag('input', 
                     'type' => 'checkbox',
                     'name' => '_source',
                     'value' => $id,
                     'checked' => false,
                     'aria-labelledby' => $label_id,
-                ));
+                );
             }
             return html::div(null, $inner);
         }
 
-        $out = html::tag('li', array(
+        $out = html::tag(
+            'li',
+            
                 'id' => 'rcmli' . rcube_utils::html_identifier($id, true),
-                'class' => join(' ', $classes),
+                'class' => implode(' ', $classes),
                 'noclose' => true,
-            ),
+            ,
             html::div(!empty($source'subscribed') ? 'subscribed' : null, $inner)
         );
 
-        $groupdata = array('out' => '', 'jsdata' => $jsdata, 'source' => $id);
+        $groupdata = 'out' => '', 'jsdata' => $jsdata, 'source' => $id;
         if ($source'groups') {
             if (function_exists('rcmail_contact_groups')) {
                 $groupdata = rcmail_contact_groups($groupdata);
-            }
-            else {
+            } else {
                 // Roundcube >= 1.5
                 $groupdata = rcmail_action_contacts_index::contact_groups($groupdata);
             }
@@ -378,25 +381,25 @@
         // Disable all global address books
         // Assumes that all non-kolab_addressbook sources are global
         if ($abook_prio == self::PERSONAL_ONLY) {
-            $sources = array();
+            $sources = ;
         }
 
         if (!is_array($sources)) {
-            $sources = array();
+            $sources = ;
         }
 
-        $kolab_sources = array();
+        $kolab_sources = ;
         foreach (array_keys($this->_list_sources()) as $abook_id) {
-            if (!in_array($abook_id, $sources))
+            if (!in_array($abook_id, $sources)) {
                 $kolab_sources = $abook_id;
+            }
         }
 
         // Add personal address sources to the list
         if (!empty($kolab_sources)) {
             if ($abook_prio == self::PERSONAL_FIRST) {
                 $sources = array_merge($kolab_sources, $sources);
-            }
-            else {
+            } else {
                 $sources = array_merge($sources, $kolab_sources);
             }
         }
@@ -422,8 +425,7 @@
                 // flag source as writeable if 'i' right is given
                 if ($p'writeable' && $this->rc->action == 'save' && strpos($p'instance'->rights, 'i') !== false) {
                     $p'instance'->readonly = false;
-                }
-                else if ($this->rc->action == 'delete' && strpos($p'instance'->rights, 't') !== false) {
+                } elseif ($this->rc->action == 'delete' && strpos($p'instance'->rights, 't') !== false) {
                     $p'instance'->readonly = false;
                 }
             }
@@ -477,11 +479,11 @@
 
         // extend the list of contact fields to be displayed in the 'personal' section
         if (is_array($p'form''personal')) {
-            $p'form''personal''content''profession'    = array('size' => 40);
-            $p'form''personal''content''children'      = array('size' => 40);
-            $p'form''personal''content''freebusyurl'   = array('size' => 40);
-            $p'form''personal''content''pgppublickey'  = array('size' => 70);
-            $p'form''personal''content''pkcs7publickey' = array('size' => 70);
+            $p'form''personal''content''profession'    = 'size' => 40;
+            $p'form''personal''content''children'      = 'size' => 40;
+            $p'form''personal''content''freebusyurl'   = 'size' => 40;
+            $p'form''personal''content''pgppublickey'  = 'size' => 70;
+            $p'form''personal''content''pkcs7publickey' = 'size' => 70;
 
             // re-order fields according to the coltypes list
             $p'form''contact''content'  = $this->_sort_form_fields($p'form''contact''content', $GLOBALS'CONTACTS');
@@ -531,25 +533,24 @@
         $contact = rcube_utils::get_input_value('cid', rcube_utils::INPUT_POST, true);
         $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_POST);
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_contact_identity($contact, $source);
+        $uid, $mailbox, $msguid = $this->_resolve_contact_identity($contact, $source);
 
         $result = $uid && $mailbox ? $this->bonnie_api->changelog('contact', $uid, $mailbox, $msguid) : null;
         if (is_array($result) && $result'uid' == $uid) {
             if (is_array($result'changes')) {
                 $rcmail = $this->rc;
                 $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
-                array_walk($result'changes', function(&$change) use ($rcmail, $dtformat) {
-                  if ($change'date') {
-                      $dt = rcube_utils::anytodatetime($change'date');
-                      if ($dt instanceof DateTime) {
-                          $change'date' = $rcmail->format_date($dt, $dtformat);
-                      }
-                  }
+                array_walk($result'changes', function (&$change) use ($rcmail, $dtformat) {
+                    if ($change'date') {
+                        $dt = rcube_utils::anytodatetime($change'date');
+                        if ($dt instanceof DateTime) {
+                            $change'date' = $rcmail->format_date($dt, $dtformat);
+                        }
+                    }
                 });
             }
             $this->rc->output->command('contact_render_changelog', $result'changes');
-        }
-        else {
+        } else {
             $this->rc->output->command('contact_render_changelog', false);
         }
 
@@ -570,7 +571,7 @@
         $rev1 = rcube_utils::get_input_value('rev1', rcube_utils::INPUT_POST);
         $rev2 = rcube_utils::get_input_value('rev2', rcube_utils::INPUT_POST);
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_contact_identity($contact, $source);
+        $uid, $mailbox, $msguid = $this->_resolve_contact_identity($contact, $source);
 
         $result = $this->bonnie_api->diff('contact', $uid, $rev1, $rev2, $mailbox, $msguid);
         if (is_array($result) && $result'uid' == $uid) {
@@ -579,7 +580,7 @@
             $result'cid' = $contact;
 
             // convert some properties, similar to kolab_contacts::_to_rcube_contact()
-            $keymap = array(
+            $keymap = 
                 'lastmodified-date' => 'changed',
                 'additional' => 'middlename',
                 'fn' => 'name',
@@ -589,13 +590,13 @@
                 'note' => 'notes',
                 'role' => 'profession',
                 'title' => 'jobtitle',
-            );
+            ;
 
-            $propmap = array('email' => 'address', 'website' => 'url', 'phone' => 'number');
+            $propmap = 'email' => 'address', 'website' => 'url', 'phone' => 'number';
             $date_format = $this->rc->config->get('date_format', 'Y-m-d');
 
             // map kolab object properties to keys and values the client expects
-            array_walk($result'changes', function(&$change, $i) use ($keymap, $propmap, $date_format) {
+            array_walk($result'changes', function (&$change, $i) use ($keymap, $propmap, $date_format) {
                 if (array_key_exists($change'property', $keymap)) {
                     $change'property' = $keymap$change'property';
                 }
@@ -610,7 +611,7 @@
                     }
                 }
                 // format dates
-                else if ($change'property' == 'birthday' || $change'property' == 'anniversary') {
+                elseif ($change'property' == 'birthday' || $change'property' == 'anniversary') {
                     if ($old_ = rcube_utils::anytodatetime($change'old')) {
                         $change'old_' = $this->rc->format_date($old_, $date_format);
                     }
@@ -619,9 +620,9 @@
                     }
                 }
                 // convert email, website, phone values
-                else if (array_key_exists($change'property', $propmap)) {
+                elseif (array_key_exists($change'property', $propmap)) {
                     $propname = $propmap$change'property';
-                    foreach (array('old','new') as $k) {
+                    foreach ('old','new' as $k) {
                         $k_ = $k . '_';
                         if (!empty($change$k)) {
                             $change$k_ = html::quote($change$k$propname ?: '--');
@@ -634,14 +635,15 @@
                 }
                 // serialize address structs
                 if ($change'property' == 'address') {
-                    foreach (array('old','new') as $k) {
+                    foreach ('old','new' as $k) {
                         $k_ = $k . '_';
                         $change$k'zipcode' = $change$k'code';
-                        $template = $this->rc->config->get('address_template', '{'.join('} {', array_keys($change$k)).'}');
-                        $composite = array();
+                        $template = $this->rc->config->get('address_template', '{' . implode('} {', array_keys($change$k)) . '}');
+                        $composite = ;
                         foreach ($change$k as $p => $val) {
-                            if (strlen($val))
-                                $composite'{'.$p.'}' = $val;
+                            if (strlen($val)) {
+                                $composite'{' . $p . '}' = $val;
+                            }
                         }
                         $change$k_ = preg_replace('/\{\w+\}/', '', strtr($template, $composite));
                         if ($change$k'type') {
@@ -653,12 +655,16 @@
                     $change'diff_' = libkolab::html_diff($change'old_', $change'new_', true);
                 }
                 // localize gender values
-                else if ($change'property' == 'gender') {
-                    if ($change'old') $change'old_' = $this->rc->gettext($change'old');
-                    if ($change'new') $change'new_' = $this->rc->gettext($change'new');
+                elseif ($change'property' == 'gender') {
+                    if ($change'old') {
+                        $change'old_' = $this->rc->gettext($change'old');
+                    }
+                    if ($change'new') {
+                        $change'new_' = $this->rc->gettext($change'new');
+                    }
                 }
                 // translate 'key' entries in individual properties
-                else if ($change'property' == 'key') {
+                elseif ($change'property' == 'key') {
                     $p = $change'old' ?: $change'new';
                     $t = $p'type';
                     $change'property' = $t . 'publickey';
@@ -666,14 +672,13 @@
                     $change'new' = $change'new' ? $change'new''key' : '';
                 }
                 // compute a nice diff of notes
-                else if ($change'property' == 'notes') {
+                elseif ($change'property' == 'notes') {
                     $change'diff_' = libkolab::html_diff($change'old', $change'new', false);
                 }
             });
 
             $this->rc->output->command('contact_show_diff', $result);
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
         }
 
@@ -694,7 +699,7 @@
         $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_POST);
         $rev = rcube_utils::get_input_value('rev', rcube_utils::INPUT_POST);
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_contact_identity($contact, $source, $folder);
+        $uid, $mailbox, $msguid = $this->_resolve_contact_identity($contact, $source, $folder);
 
         if ($folder && ($raw_msg = $this->bonnie_api->rawdata('contact', $uid, $rev, $mailbox))) {
             $imap = $this->rc->get_storage();
@@ -706,15 +711,13 @@
                 // delete old revision from imap and cache
                 $imap->delete_message($msguid, $folder->name);
                 $folder->cache->set($msguid, false);
-                $this->cache = array();
             }
         }
 
         if ($success) {
-            $this->rc->output->command('display_message', $this->gettext(array('name' => 'objectrestoresuccess', 'vars' => array('rev' => $rev))), 'confirmation');
+            $this->rc->output->command('display_message', $this->gettext('name' => 'objectrestoresuccess', 'vars' => 'rev' => $rev), 'confirmation');
             $this->rc->output->command('close_contact_history_dialog', $contact);
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
         }
 
@@ -730,7 +733,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_contact_identity($cid, $source);
+        $uid, $mailbox, $msguid = $this->_resolve_contact_identity($cid, $source);
 
         // call Bonnie API
         $result = $this->bonnie_api->get('contact', $uid, $rev, $mailbox, $msguid);
@@ -757,13 +760,12 @@
     {
         $mailbox = $msguid = null;
 
-        $source = $this->get_address_book(array('id' => $abook));
+        $source = $this->get_address_book('id' => $abook);
         if ($source'instance') {
             $uid = $source'instance'->id2uid($id);
             $list = kolab_storage::id_decode($abook);
-        }
-        else {
-            return array(null, $mailbox, $msguid);
+        } else {
+            return null, $mailbox, $msguid;
         }
 
         // get resolve message UID and mailbox identifier
@@ -772,7 +774,7 @@
             $msguid = $folder->cache->uid2msguid($uid);
         }
 
-        return array($uid, $mailbox, $msguid);
+        return $uid, $mailbox, $msguid;
     }
 
     /**
@@ -812,7 +814,7 @@
         }
 
         // Check that configuration is not disabled
-        $dont_override = (array) $this->rc->config->get('dont_override', array());
+        $dont_override = (array) $this->rc->config->get('dont_override', );
         $prio          = $this->addressbook_prio();
 
         if (!in_array('kolab_addressbook_prio', $dont_override)) {
@@ -820,17 +822,17 @@
             $this->add_texts('localization');
 
             $field_id = '_kolab_addressbook_prio';
-            $select   = new html_select(array('name' => $field_id, 'id' => $field_id));
+            $select   = new html_select('name' => $field_id, 'id' => $field_id);
 
             $select->add($this->gettext('globalfirst'), self::GLOBAL_FIRST);
             $select->add($this->gettext('personalfirst'), self::PERSONAL_FIRST);
             $select->add($this->gettext('globalonly'), self::GLOBAL_ONLY);
             $select->add($this->gettext('personalonly'), self::PERSONAL_ONLY);
 
-            $args'blocks''main''options''kolab_addressbook_prio' = array(
+            $args'blocks''main''options''kolab_addressbook_prio' = 
                 'title' => html::label($field_id, rcube::Q($this->gettext('addressbookprio'))),
                 'content' => $select->show($prio),
-            );
+            ;
         }
 
         return $args;
@@ -850,11 +852,11 @@
         }
 
         // Check that configuration is not disabled
-        $dont_override = (array) $this->rc->config->get('dont_override', array());
+        $dont_override = (array) $this->rc->config->get('dont_override', );
         $key           = 'kolab_addressbook_prio';
 
-        if (!in_array('kolab_addressbook_prio', $dont_override) || !isset($_POST'_'.$key)) {
-            $args'prefs'$key = (int) rcube_utils::get_input_value('_'.$key, rcube_utils::INPUT_POST);
+        if (!in_array('kolab_addressbook_prio', $dont_override) || !isset($_POST'_' . $key)) {
+            $args'prefs'$key = (int) rcube_utils::get_input_value('_' . $key, rcube_utils::INPUT_POST);
         }
 
         return $args;
@@ -870,11 +872,9 @@
 
         if ($action == 'create') {
             $this->ui->book_edit();
-        }
-        else if ($action == 'edit') {
+        } elseif ($action == 'edit') {
             $this->ui->book_edit();
-        }
-        else if ($action == 'delete') {
+        } elseif ($action == 'delete') {
             $this->book_delete();
         }
     }
@@ -899,26 +899,27 @@
 
         kolab_storage::$encode_ids = true;
         $search_more_results = false;
-        $this->sources = array();
-        $this->folders = array();
+        $this->sources = ;
+        $this->folders = ;
 
         // find unsubscribed IMAP folders that have "event" type
         if ($source == 'folders') {
-            foreach ((array)kolab_storage::search_folders('contact', $query, array('other')) as $folder) {
+            foreach ((array)kolab_storage::search_folders('contact', $query, 'other') as $folder) {
                 $this->folders$folder->id = $folder;
                 $this->sources$folder->id = new kolab_contacts($folder->name);
             }
         }
         // search other user's namespace via LDAP
-        else if ($source == 'users') {
+        elseif ($source == 'users') {
             $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
-            foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
-                $folders = array();
+            foreach (kolab_storage::search_users($query, 0, , $limit * 10) as $user) {
+                $folders = ;
                 // search for contact folders shared by this user
                 foreach (kolab_storage::list_user_folders($user, 'contact', false) as $foldername) {
                     $folders = new kolab_storage_folder($foldername, 'contact');
                 }
 
+                $count = 0;
                 if (count($folders)) {
                     $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
                     $this->folders$userfolder->id = $userfolder;
@@ -926,7 +927,8 @@
 
                     foreach ($folders as $folder) {
                         $this->folders$folder->id = $folder;
-                        $this->sources$folder->id = new kolab_contacts($folder->name);;
+                        $this->sources$folder->id = new kolab_contacts($folder->name);
+                        ;
                         $count++;
                     }
                 }
@@ -947,13 +949,12 @@
 
             // find parent
             do {
-              array_pop($imap_path);
-              $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
-            }
-            while (count($imap_path) > 1 && !$this->folders$parent_id);
+                array_pop($imap_path);
+                $parent_id = kolab_storage::folder_id(implode($delim, $imap_path));
+            } while (count($imap_path) > 1 && empty($this->folders$parent_id));
 
             // restore "real" parent ID
-            if ($parent_id && !$this->folders$parent_id) {
+            if ($parent_id && empty($this->folders$parent_id)) {
                 $parent_id = kolab_storage::folder_id($folder->get_parent());
             }
 
@@ -985,10 +986,12 @@
         $id = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
 
         if ($id && ($folder = kolab_storage::get_folder(kolab_storage::id_decode($id)))) {
-            if (isset($_POST'_permanent'))
+            if (isset($_POST'_permanent')) {
                 $success |= $folder->subscribe(intval($_POST'_permanent'));
-            if (isset($_POST'_active'))
+            }
+            if (isset($_POST'_active')) {
                 $success |= $folder->activate(intval($_POST'_active'));
+            }
 
             // list groups for this address book
             if (!empty($_POST'_groups')) {
@@ -1004,8 +1007,7 @@
 
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
-        }
-        else {
+        } else {
             $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
         }
 
@@ -1020,7 +1022,7 @@
     {
         $source = trim(rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC, true));
 
-        if ($source && ($result = $this->driver->folder_delete($source))) {
+        if ($source && $this->driver->folder_delete($source)) {
             $storage   = $this->rc->get_storage();
             $delimiter = $storage->get_hierarchy_delimiter();
 
@@ -1030,8 +1032,7 @@
             $this->rc->output->command('set_env', 'delimiter', $delimiter);
             $this->rc->output->command('list_contacts_clear');
             $this->rc->output->command('book_delete_done', $source);
-        }
-        else {
+        } else {
             $this->rc->output->show_message('kolab_addressbook.bookdeleteerror', 'error');
         }
 
@@ -1060,7 +1061,7 @@
     /**
      * Hook for (contact) folder deletion
      */
-    function prefs_folder_delete($args)
+    public function prefs_folder_delete($args)
     {
         // ignore...
         if ($args'abort' && !$args'result') {
@@ -1073,7 +1074,7 @@
     /**
      * Hook for (contact) folder renaming
      */
-    function prefs_folder_rename($args)
+    public function prefs_folder_rename($args)
     {
         // ignore...
         if ($args'abort' && !$args'result') {
@@ -1086,7 +1087,7 @@
     /**
      * Hook for (contact) folder updates. Forward to folder_rename handler if name was changed
      */
-    function prefs_folder_update($args)
+    public function prefs_folder_update($args)
     {
         // ignore...
         if ($args'abort' && !$args'result') {
@@ -1109,12 +1110,11 @@
 
         foreach ($bday_addressbooks as $i => $id) {
             $folder_name = kolab_storage::id_decode($id);
-            if ($oldname === $folder_name || strpos($folder_name, $oldname.$delimiter) === 0) {
+            if ($oldname === $folder_name || strpos($folder_name, $oldname . $delimiter) === 0) {
                 if ($newname) {  // rename
                     $new_folder = $newname . substr($folder_name, strlen($oldname));
                     $bday_addressbooks$i = kolab_storage::id_encode($new_folder);
-                }
-                else {  // delete
+                } else {  // delete
                     unset($bday_addressbooks$i);
                 }
                 $update = true;

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php Changed

@@ -23,6 +23,7 @@
 class kolab_addressbook_ui
 {
     private $plugin;
+    /** @var rcmail */
     private $rc;
 
     /**
@@ -32,7 +33,7 @@
      */
     public function __construct($plugin)
     {
-        $this->rc     = rcube::get_instance();
+        $this->rc     = rcmail::get_instance();
         $this->plugin = $plugin;
 
         $this->init_ui();
@@ -52,7 +53,7 @@
 
         if (empty($this->rc->action)) {
             // Include stylesheet (for directorylist)
-            $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css');
+            $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/kolab_addressbook.css');
 
             // include kolab folderlist widget if available
             if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
@@ -73,12 +74,12 @@
 
                 // set CardDAV URI for specified ldap addressbook
                 if ($ldap_abook = $this->rc->config->get('kolab_addressbook_carddav_ldap')) {
-                    $dav_ldap_url = strtr($dav_url, array(
+                    $dav_ldap_url = strtr($dav_url, 
                         '%h' => $_SERVER'HTTP_HOST',
                         '%u' => urlencode($this->rc->get_user_name()),
                         '%i' => 'ldap-directory',
                         '%n' => '',
-                    ));
+                    );
                     $this->rc->output->set_env('kolab_addressbook_carddav_ldap', $ldap_abook);
                     $this->rc->output->set_env('kolab_addressbook_carddav_ldap_url', $dav_ldap_url);
                 }
@@ -86,21 +87,26 @@
 
             $idx = 0;
             foreach ($options as $command) {
-                $content = html::tag('li', $idx ? null : array('class' => 'separator_above'),
-                    $this->plugin->api->output->button(array(
-                        'label'    => 'kolab_addressbook.'.str_replace('-', '', $command),
+                $content = html::tag(
+                    'li',
+                    $idx ? null : 'class' => 'separator_above',
+                    $this->plugin->api->output->button(
+                        'label'    => 'kolab_addressbook.' . str_replace('-', '', $command),
                         'class'    => str_replace('-', ' ', $command) . ' disabled',
                         'classact' => str_replace('-', ' ', $command) . ' active',
                         'command'  => $command,
-                        'type'     => 'link'
-                )));
+                        'type'     => 'link',
+                )
+                );
                 $this->plugin->api->add_content($content, 'groupoptions');
                 $idx++;
             }
 
             // Link to Settings/Folders
             if ($this->plugin->driver instanceof kolab_contacts_driver) {
-                $content = html::tag('li', 'class' => 'separator_above',
+                $content = html::tag(
+                    'li',
+                    'class' => 'separator_above',
                     $this->plugin->api->output->button(
                             'label'    => 'managefolders',
                             'type'     => 'link',
@@ -108,7 +114,8 @@
                             'classact' => 'folders active',
                             'command'  => 'folders',
                             'task'     => 'settings',
-                    ));
+                    )
+                );
 
                 $this->plugin->api->add_content($content, 'groupoptions');
             }
@@ -146,13 +153,13 @@
                     'kolab_addressbook.revisionrestoreconfirm'
                 );
 
-                $this->plugin->add_hook('render_page', array($this, 'render_audittrail_page'));
-                $this->plugin->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
+                $this->plugin->add_hook('render_page', $this, 'render_audittrail_page');
+                $this->plugin->register_handler('plugin.object_changelog_table', 'libkolab', 'object_changelog_table');
             }
         }
         // include stylesheet for audit trail
-        else if ($this->rc->action == 'show' && $this->plugin->bonnie_api) {
-            $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css', true);
+        elseif ($this->rc->action == 'show' && $this->plugin->bonnie_api) {
+            $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/kolab_addressbook.css', true);
             $this->rc->output->add_label('kolab_addressbook.showhistory');
         }
     }
@@ -170,7 +177,7 @@
     /**
      * Handler for 'bookdetails' object returning form content for book create/edit
      *
-     * @param array $attr Object attributes
+     * @param array $attrib Object attributes
      *
      * @return string HTML output
      */

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/bg.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/bg_BG.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/ca_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/cs_CZ.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/da_DK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/de.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/de_CH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/de_DE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/el.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/es_AR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/es_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/et_EE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/fi_FI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/fr_FR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/he_IL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/hr_HR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/hu_HU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/it_IT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/ja_JP.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/ko_KR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/lv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/nl_NL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/pl.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/pl_PL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/pt_BR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/pt_PT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/ru_RU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/sk_SK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/sl_SI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/sv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/sv_SE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/th_TH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/uk_UA.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/vi_VN.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/zh_CN.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/localization/zh_TW.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_addressbook/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_auth/config.inc.php Changed

@@ -25,9 +25,9 @@
 // If the value array contains more than one field, first non-empty will be used
 // Note: These aren't LDAP attributes, but field names in config
 // Note: If there's more than one email address, as many identities will be created
-$config'kolab_auth_name'         = array('name', 'cn');
-$config'kolab_auth_email'        = array('email');
-$config'kolab_auth_organization' = array('organization');
+$config'kolab_auth_name'         = 'name', 'cn';
+$config'kolab_auth_email'        = 'email';
+$config'kolab_auth_organization' = 'organization';
 
 // Role field (from fieldmap configuration)
 $config'kolab_auth_role' = 'role';
@@ -48,24 +48,24 @@
 // The effective rights value refers to either entry level attribute level rights:
 //  * entry:read|add|delete
 //  * attrib:<attribute-name>:read|write|delete
-$config'kolab_auth_admin_rights' = array(
+$config'kolab_auth_admin_rights' = 
     // Roundcube task => required effective right
     'settings'        => 'entry:read',
     'mail'            => 'entry:delete',
     'addressbook'     => 'entry:delete',
     // or use a wildcard entry like this:
     '*'               => 'entry:read',
-);
+;
 
 // Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
 // is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role.
 //
 // Note that this does NOT mean the 'acl' plugin is disabled for other people.
-$config'kolab_auth_role_plugins' = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
+$config'kolab_auth_role_plugins' = 
+        'cn=professional-user,dc=mykolab,dc=ch' => 
                 'acl',
-            ),
-    );
+            ,
+    ;
 
 // Settings on a role-by-role basis. In this example, the 'htmleditor' setting
 // is enabled(1) for people with a 'cn=professional-user,dc=mykolab,dc=ch' role,
@@ -73,25 +73,23 @@
 // do not allow the setting to be controlled through the preferences, enable the
 // html editor for professional users and allow them to override the setting in
 // the preferences.
-$config'kolab_auth_role_settings' = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'htmleditor' => Array(
+$config'kolab_auth_role_settings' = 
+        'cn=professional-user,dc=mykolab,dc=ch' => 
+                'htmleditor' => 
                         'mode' => 'override',
                         'value' => 1,
-                        'allow_override' => true
-                    ),
-            ),
-    );
+                        'allow_override' => true,
+                    ,
+            ,
+    ;
 
 // List of LDAP addressbooks (keys of ldap_public configuration array)
 // for which base_dn variables (%dc, etc.) will be replaced according to authenticated user DN
 // Note: special name '*' for all LDAP addressbooks
-$config'kolab_auth_ldap_addressbooks' = array('*');
+$config'kolab_auth_ldap_addressbooks' = '*';
 
 // Enables storing/updating session tokens for free-busy token authentication
 // See httpauth.allow_token option in Free-Busy service config.
 // The option can be set to a number of seconds after which the token-session
 // expires or to true (to get the configured Roundcube session time)
 $config'freebusy_session_auth' = null;
-
-?>

roundcubemail-1.5.tar.gz/plugins/kolab_auth/config.inc.php.dist Changed

@@ -25,9 +25,9 @@
 // If the value array contains more than one field, first non-empty will be used
 // Note: These aren't LDAP attributes, but field names in config
 // Note: If there's more than one email address, as many identities will be created
-$config'kolab_auth_name'         = array('name', 'cn');
-$config'kolab_auth_email'        = array('email');
-$config'kolab_auth_organization' = array('organization');
+$config'kolab_auth_name'         = 'name', 'cn';
+$config'kolab_auth_email'        = 'email';
+$config'kolab_auth_organization' = 'organization';
 
 // Role field (from fieldmap configuration)
 $config'kolab_auth_role' = 'role';
@@ -48,24 +48,24 @@
 // The effective rights value refers to either entry level attribute level rights:
 //  * entry:read|add|delete
 //  * attrib:<attribute-name>:read|write|delete
-$config'kolab_auth_admin_rights' = array(
+$config'kolab_auth_admin_rights' = 
     // Roundcube task => required effective right
     'settings'        => 'entry:read',
     'mail'            => 'entry:delete',
     'addressbook'     => 'entry:delete',
     // or use a wildcard entry like this:
     '*'               => 'entry:read',
-);
+;
 
 // Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
 // is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role.
 //
 // Note that this does NOT mean the 'acl' plugin is disabled for other people.
-$config'kolab_auth_role_plugins' = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
+$config'kolab_auth_role_plugins' = 
+        'cn=professional-user,dc=mykolab,dc=ch' => 
                 'acl',
-            ),
-    );
+            ,
+    ;
 
 // Settings on a role-by-role basis. In this example, the 'htmleditor' setting
 // is enabled(1) for people with a 'cn=professional-user,dc=mykolab,dc=ch' role,
@@ -73,25 +73,23 @@
 // do not allow the setting to be controlled through the preferences, enable the
 // html editor for professional users and allow them to override the setting in
 // the preferences.
-$config'kolab_auth_role_settings' = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'htmleditor' => Array(
+$config'kolab_auth_role_settings' = 
+        'cn=professional-user,dc=mykolab,dc=ch' => 
+                'htmleditor' => 
                         'mode' => 'override',
                         'value' => 1,
-                        'allow_override' => true
-                    ),
-            ),
-    );
+                        'allow_override' => true,
+                    ,
+            ,
+    ;
 
 // List of LDAP addressbooks (keys of ldap_public configuration array)
 // for which base_dn variables (%dc, etc.) will be replaced according to authenticated user DN
 // Note: special name '*' for all LDAP addressbooks
-$config'kolab_auth_ldap_addressbooks' = array('*');
+$config'kolab_auth_ldap_addressbooks' = '*';
 
 // Enables storing/updating session tokens for free-busy token authentication
 // See httpauth.allow_token option in Free-Busy service config.
 // The option can be set to a number of seconds after which the token-session
 // expires or to true (to get the configured Roundcube session time)
 $config'freebusy_session_auth' = null;
-
-?>

roundcubemail-1.5.tar.gz/plugins/kolab_auth/kolab_auth.php Changed

@@ -30,9 +30,9 @@
 
 class kolab_auth extends rcube_plugin
 {
-    static $ldap;
+    public static $ldap;
     private $username;
-    private $data = array();
+    private $data = ;
 
     public function init()
     {
@@ -41,26 +41,26 @@
         $this->load_config();
         $this->require_plugin('libkolab');
 
-        $this->add_hook('authenticate', array($this, 'authenticate'));
-        $this->add_hook('startup', array($this, 'startup'));
-        $this->add_hook('ready', array($this, 'ready'));
-        $this->add_hook('user_create', array($this, 'user_create'));
+        $this->add_hook('authenticate', $this, 'authenticate');
+        $this->add_hook('startup', $this, 'startup');
+        $this->add_hook('ready', $this, 'ready');
+        $this->add_hook('user_create', $this, 'user_create');
 
         // Hook for password change
-        $this->add_hook('password_ldap_bind', array($this, 'password_ldap_bind'));
+        $this->add_hook('password_ldap_bind', $this, 'password_ldap_bind');
 
         // Hooks related to "Login As" feature
-        $this->add_hook('template_object_loginform', array($this, 'login_form'));
-        $this->add_hook('storage_connect', array($this, 'imap_connect'));
-        $this->add_hook('managesieve_connect', array($this, 'imap_connect'));
-        $this->add_hook('smtp_connect', array($this, 'smtp_connect'));
-        $this->add_hook('identity_form', array($this, 'identity_form'));
+        $this->add_hook('template_object_loginform', $this, 'login_form');
+        $this->add_hook('storage_connect', $this, 'imap_connect');
+        $this->add_hook('managesieve_connect', $this, 'imap_connect');
+        $this->add_hook('smtp_connect', $this, 'smtp_connect');
+        $this->add_hook('identity_form', $this, 'identity_form');
 
         // Hook to modify some configuration, e.g. ldap
-        $this->add_hook('config_get', array($this, 'config_get'));
+        $this->add_hook('config_get', $this, 'config_get');
 
         // Hook to modify logging directory
-        $this->add_hook('write_log', array($this, 'write_log'));
+        $this->add_hook('write_log', $this, 'write_log');
         $this->username = $_SESSION'username' ?? null;
 
         // Enable debug logs (per-user), when logged as another user
@@ -106,7 +106,7 @@
 
             if ($uniqueid) {
                 $uniqueid = md5($uniqueid);
-                $rcmail->user->save_prefs(array('kolab_uniqueid' => $uniqueid));
+                $rcmail->user->save_prefs('kolab_uniqueid' => $uniqueid);
             }
         }
 
@@ -134,7 +134,7 @@
                 // do it once in a 1/10 of the ttl
                 if ($value) {
                     $value = new DateTime($value);
-                    $value->sub(new DateInterval('PT' . intval($ttl * 9/10) . 'S'));
+                    $value->sub(new DateInterval('PT' . intval($ttl * 9 / 10) . 'S'));
                     if ($value > $deadline) {
                         return;
                     }
@@ -165,7 +165,7 @@
 
                 // add script that will remove disabled taskbar buttons
                 if (!in_array('*', $tasks)) {
-                    $this->add_hook('render_page', array($this, 'render_page'));
+                    $this->add_hook('render_page', $this, 'render_page');
                 }
             }
         }
@@ -192,8 +192,7 @@
                     $args'result'$name = $this->patch_ldap_config($config);
                 }
             }
-        }
-        else if ($args'name' == 'kolab_users_directory' && !empty($args'result')) {
+        } elseif ($args'name' == 'kolab_users_directory' && !empty($args'result')) {
             $args'result' = $this->patch_ldap_config($args'result');
         }
 
@@ -302,11 +301,10 @@
                     $dont_override = (array) $rcmail->config->get('dont_override');
 
                     if (empty($setting'allow_override')) {
-                        $rcmail->config->set('dont_override', array_merge($dont_override, array($setting_name)));
-                    }
-                    else {
+                        $rcmail->config->set('dont_override', array_merge($dont_override, $setting_name));
+                    } else {
                         if (in_array($setting_name, $dont_override)) {
-                            $_dont_override = array();
+                            $_dont_override = ;
                             foreach ($dont_override as $_setting) {
                                 if ($_setting != $setting_name) {
                                     $_dont_override = $_setting;
@@ -316,7 +314,7 @@
                         }
                     }
 
-                    if ($setting_name == 'skin') {
+                    if ($setting_name == 'skin' && $rcmail instanceof rcmail) {
                         if ($rcmail->output->type == 'html') {
                             $rcmail->output->set_skin($setting'value');
                             $rcmail->output->set_env('skin', $setting'value');
@@ -332,10 +330,11 @@
                     // Some plugins e.g. kolab_2fa use 'startup' hook to
                     // register other hooks, but when called on 'authenticate' hook
                     // we're already after 'startup', so we'll call it directly
-                    if ($loaded && $startup && $plugin == 'kolab_2fa'
+                    if ($loaded && $startup && $plugin == 'kolab_2fa' && $rcmail instanceof rcmail
                         && ($plugin = $this->api->get_plugin($plugin))
+                        && method_exists($plugin, 'startup')
                     ) {
-                        $plugin->startup(array('task' => $rcmail->task, 'action' => $rcmail->action));
+                        $plugin->startup('task' => $rcmail->task, 'action' => $rcmail->action);
                     }
                 }
             }
@@ -367,14 +366,13 @@
             }
         }
         // Define the user log directory if a username is provided
-        else if ($rcmail->config->get('per_user_logging') && !empty($this->username)
+        elseif ($rcmail->config->get('per_user_logging') && !empty($this->username)
             && !stripos($log_dir, '/' . $this->username) // maybe already set by syncroton, skip
         ) {
             $user_log_dir = $log_dir . '/' . strtolower($this->username);
             if (is_writable($user_log_dir)) {
                 $args'dir' = $user_log_dir;
-            }
-            else if (!in_array($args'name', array('errors', 'userlogins', 'sendmail'))) {
+            } elseif (!in_array($args'name', 'errors', 'userlogins', 'sendmail')) {
                 $args'abort' = true;  // don't log if unauthenticed or no per-user log dir
             }
         }
@@ -395,16 +393,15 @@
                 // add organization to the list
                 if (!empty($this->data'user_organization')) {
                     foreach ($email_list as $idx => $email) {
-                        $email_list$idx = array(
+                        $email_list$idx = 
                             'organization' => $this->data'user_organization',
                             'email'        => $email,
-                        );
+                        ;
                     }
                 }
 
                 $args'email_list' = $email_list;
-            }
-            else {
+            } else {
                 $args'user_email' = $this->data'user_email'0;
             }
         }
@@ -438,9 +435,11 @@
             return $args;
         }
 
-        $input = new html_inputfield(array('name' => '_loginas', 'id' => 'rcmloginas',
-            'type' => 'text', 'autocomplete' => 'off'));
-        $row = html::tag('tr', null,
+        $input = new html_inputfield('name' => '_loginas', 'id' => 'rcmloginas',
+            'type' => 'text', 'autocomplete' => 'off');
+        $row = html::tag(
+            'tr',
+            null,
             html::tag('td', 'title', html::label('rcmloginas', rcube::Q($this->gettext('loginas'))))
             . html::tag('td', 'input', $input->show(trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST))))
         );
@@ -528,7 +527,8 @@
             }
 
             $isadmin = false;
-            $admin_rights = $rcmail->config->get('kolab_auth_admin_rights', array());
+            $admin_rights = $rcmail->config->get('kolab_auth_admin_rights', );
+            $allowed_tasks = ;
 
             // @deprecated: fall-back to the old check if the original user has/belongs to administrative role/group
             if (empty($admin_rights)) {
@@ -556,8 +556,7 @@
                     $target_entry = $ldap->get_user_record($loginas, $host);
                     $allowed_tasks = $rcmail->config->get('kolab_auth_allowed_tasks');
                 }
-            }
-            else {
+            } else {
                 // get "login as" user credentials
                 $target_entry = $ldap->get_user_record($loginas, $host);
 
@@ -573,7 +572,7 @@
                         $effective_rights'entry'  = $effective_rights'entrylevelrights';
 
                         // compare the rights with the permissions mapping
-                        $allowed_tasks = array();
+                        $allowed_tasks = ;
                         foreach ($admin_rights as $task => $perms) {
                             $perms_ = explode(':', $perms);
                             $type   = array_shift($perms_);
@@ -583,9 +582,9 @@
                             if (array_key_exists($type, $effective_rights)) {
                                 if ($type == 'entry' && in_array($req, $effective_rights$type)) {
                                     $allowed_tasks = $task;
-                                }
-                                else if ($type == 'attrib' && array_key_exists($attrib, $effective_rights$type) &&
-                                        in_array($req, $effective_rights$type$attrib)) {
+                                } elseif ($type == 'attrib' && array_key_exists($attrib, $effective_rights$type)
+                                    && in_array($req, $effective_rights$type$attrib)
+                                ) {
                                     $allowed_tasks = $task;
                                 }
                             }
@@ -599,8 +598,7 @@
             // Save original user login for log (see below)
             if ($login_attr) {
                 $origname = is_array($record$login_attr) ? $record$login_attr0 : $record$login_attr;
-            }
-            else {
+            } else {
                 $origname = $user;
             }
 
@@ -608,10 +606,10 @@
                 $this->add_texts('localization/');
 
                 $args'abort' = true;
-                $args'error' = $this->gettext(array(
+                $args'error' = $this->gettext(
                     'name' => 'loginasnotallowed',
-                    'vars' => array('user' => rcube::Q($loginas)),
-                ));
+                    'vars' => 'user' => rcube::Q($loginas),
+                );
 
                 self::log_login_error($user, "No privileges to login as '" . $loginas . "'", $loginas);
 
@@ -680,8 +678,12 @@
 
         // Log "Login As" usage
         if (!empty($origname)) {
-            rcube::write_log('userlogins', sprintf('Admin login for %s by %s from %s',
-                $args'user', $origname, rcube_utils::remote_ip()));
+            rcube::write_log('userlogins', sprintf(
+                'Admin login for %s by %s from %s',
+                $args'user',
+                $origname,
+                rcube_utils::remote_ip()
+            ));
         }
 
         // load per-user settings/plugins
@@ -757,24 +759,25 @@
             return $args;
         }
 
-        $emails      = array();
+        $emails      = ;
         $user_record = $ldap->get_record($_SESSION'kolab_dn');
 
-        foreach ((array)$rcmail->config->get('kolab_auth_email', array()) as $col) {
+        foreach ((array)$rcmail->config->get('kolab_auth_email', ) as $col) {
             $values = rcube_addressbook::get_col_values($col, $user_record, true);
-            if (!empty($values))
+            if (!empty($values)) {
                 $emails = array_merge($emails, array_filter($values));
+            }
         }
 
         // kolab_delegation might want to modify this addresses list
-        $plugin = $rcmail->plugins->exec_hook('kolab_auth_emails', array('emails' => $emails));
+        $plugin = $rcmail->plugins->exec_hook('kolab_auth_emails', 'emails' => $emails);
         $emails = $plugin'emails';
 
         if (!empty($emails)) {
-            $args'form''addressing''content''email' = array(
+            $args'form''addressing''content''email' = 
                 'type' => 'select',
                 'options' => array_combine($emails, $emails),
-            );
+            ;
         }
 
         return $args;
@@ -786,7 +789,7 @@
      */
     public function render_page($args)
     {
-        $rcmail  = rcube::get_instance();
+        $rcmail  = rcmail::get_instance();
         $tasks   = (array)$_SESSION'kolab_auth_allowed_tasks';
         $tasks = 'logout';
 
@@ -810,7 +813,7 @@
         self::$ldap = kolab_storage::ldap('kolab_auth_addressbook');
 
         if (self::$ldap) {
-            self::$ldap->extend_fieldmap(array('uniqueid' => 'nsuniqueid'));
+            self::$ldap->extend_fieldmap('uniqueid' => 'nsuniqueid');
         }
 
         return self::$ldap;

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/bg_BG.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/cs_CZ.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/da_DK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/de.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/de_CH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/de_DE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/el.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/es_AR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/es_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/et_EE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/fi_FI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/fr_FR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/hu_HU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/it_IT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/ja_JP.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/nl_NL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/pl_PL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/pt_BR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/ru_RU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/sv_SE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/th_TH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/uk_UA.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/localization/zh_CN.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_auth/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_auth/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_chat/drivers/mattermost.php Changed

@@ -51,10 +51,9 @@
         $url = rtrim($this->rc->config->get('kolab_chat_url'), '/');
 
         if ($websocket) {
-            $url  = str_replace(array('http://', 'https://'), array('ws://', 'wss://'), $url);
+            $url  = str_replace('http://', 'https://', 'ws://', 'wss://', $url);
             $url .= '/api/v4/websocket';
-        }
-        else if ($this->rc->action == 'index' && $this->rc->task == 'kolab-chat') {
+        } elseif ($this->rc->action == 'index' && $this->rc->task == 'kolab-chat') {
             $channel = rcube_utils::get_input_value('_channel', rcube_utils::INPUT_GET);
             if (empty($channel)) {
                 $channel = $this->rc->config->get('kolab_chat_channel');
@@ -66,7 +65,7 @@
                     $team = $_channel'team_name';
                 }
 
-                if ($channel && $team) {
+                if ($team) {
                     $url .= '/' . urlencode($team) . '/channels/' . urlencode($channel);
                 }
             }
@@ -83,8 +82,7 @@
         if ($this->rc->task != 'kolab-chat') {
             $this->plugin->include_script("js/mattermost.js");
             $this->plugin->add_label('openchat', 'directmessage', 'mentionmessage');
-        }
-        else if ($this->get_token()) {
+        } elseif ($this->get_token()) {
             $this->setcookie('MMUSERID', $_SESSION'mattermost'0);
             $this->setcookie('MMAUTHTOKEN', $_SESSION'mattermost'1);
         }
@@ -95,11 +93,11 @@
      */
     public function action()
     {
-        $result = array(
+        $result = 
             'url'     => $this->url(true),
             'token'   => $this->get_token(),
             'user_id' => $this->get_user_id(),
-        );
+        ;
 
         echo rcube_output::json_serialize($result);
         exit;
@@ -117,7 +115,7 @@
 
         if (!isset($no_override'kolab_chat_channel')) {
             $field_id = 'rcmfd_kolab_chat_channel';
-            $select   = new html_select(array('name' => '_kolab_chat_channel', 'id' => $field_id));
+            $select   = new html_select('name' => '_kolab_chat_channel', 'id' => $field_id);
 
             $select->add('---', '');
             if ($channels = $this->get_channels_list()) {
@@ -128,10 +126,10 @@
                 }
             }
 
-            $p'blocks''main''options''kolab_chat_channel' = array(
+            $p'blocks''main''options''kolab_chat_channel' = 
                 'title'   => html::label($field_id, rcube::Q($this->plugin->gettext('defaultchannel'))),
                 'content' => $select->show($this->rc->config->get('kolab_chat_channel')),
-            );
+            ;
         }
     }
 
@@ -152,7 +150,7 @@
      * Returns the Mattermost session token
      * Note: This works only if the user/pass is the same in Kolab and Mattermost
      *
-     * @return string Session token
+     * @return string|null Session token
      */
     protected function get_token()
     {
@@ -178,8 +176,7 @@
                 if ($status != 200) {
                     $token = null;
                 }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 rcube::raise_error($e, true, false);
                 $token = null;
             }
@@ -188,10 +185,10 @@
         // Request a new session token
         if (empty($token)) {
             $request = $this->get_api_request('POST', '/users/login');
-            $request->setBody(json_encode(array(
+            $request->setBody(json_encode(
                     'login_id' => $user,
                     'password' => $pass,
-            )));
+            ));
 
             // send request to the API, get token and user ID
             try {
@@ -202,37 +199,38 @@
 
                 if ($status == 200) {
                     $user_id = $body'id';
-                }
-                else if (is_array($body) && $body'message') {
+                } elseif (is_array($body) && $body'message') {
                     throw new Exception($body'message');
-                }
-                else {
+                } else {
                     throw new Exception("Failed to authenticate the chat user ($user). Status: $status");
                 }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 rcube::raise_error($e, true, false);
             }
         }
 
-        if ($user_id && $token) {
+        if (!empty($user_id) && !empty($token)) {
             $this->token_valid = true;
-            $_SESSION'mattermost' = array($user_id, $token);
+            $_SESSION'mattermost' = $user_id, $token;
             return $token;
         }
+
+        return null;
     }
 
     /**
      * Returns the Mattermost user ID
      * Note: This works only if the user/pass is the same in Kolab and Mattermost
      *
-     * @return string User ID
+     * @return string|null User ID
      */
     protected function get_user_id()
     {
         if ($token = $this->get_token()) {
             return $_SESSION'mattermost'0;
         }
+
+        return null;
     }
 
     /**
@@ -249,9 +247,8 @@
 
         if ($extended && is_array($channel)) {
             if (!empty($channel'team_id')) {
-                 $team = $this->api_get('/teams/' . urlencode($channel'team_id'));
-            }
-            else if ($teams = $this->get_user_teams()) {
+                $team = $this->api_get('/teams/' . urlencode($channel'team_id'));
+            } elseif ($teams = $this->get_user_teams()) {
                 // if there's no team assigned to the channel, we'll get the user's team
                 // so we can build proper channel URL, there's no other way in the API
                 $team = $teams0;
@@ -269,7 +266,7 @@
     /**
      * Returns the Mattermost channels list for the user
      *
-     * @return array Channels list (id, name, display_name, etc.)
+     * @return array|false Channels list (id, name, display_name, etc.)
      */
     protected function get_channels_list()
     {
@@ -303,10 +300,10 @@
     protected function get_api_request($type, $path)
     {
         $url      = rtrim($this->rc->config->get('kolab_chat_url'), '/');
-        $defaults = array(
+        $defaults = 
             'store_body'       => true,
             'follow_redirects' => true,
-        );
+        ;
 
         $config = array_merge($defaults, (array) $this->rc->config->get('kolab_chat_http_request'));
 
@@ -330,8 +327,7 @@
                 if ($status == 200) {
                     return json_decode($body, true);
                 }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 rcube::raise_error($e, true, false);
             }
         }

roundcubemail-1.5.tar.gz/plugins/kolab_chat/kolab_chat.php Changed

@@ -33,7 +33,7 @@
     {
         $this->rc = rcube::get_instance();
 
-        $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('startup', $this, 'startup');
     }
 
     /**
@@ -65,14 +65,14 @@
 
         // Register UI end-points
         $this->register_task('kolab-chat');
-        $this->register_action('index', array($this, 'ui'));
-        $this->register_action('action', array($this, 'action'));
+        $this->register_action('index', $this, 'ui');
+        $this->register_action('action', $this, 'action');
 
         if ($this->rc->output->type == 'html' && !$this->rc->output->get_env('framed')) {
             $this->include_stylesheet($this->local_skin_path() . '/kolab_chat.css');
             $this->rc->output->set_env('kolab_chat_extwin', (bool) $extwin);
             $this->rc->output->add_script(
-"rcmail.addEventListener('beforeswitch-task', function(p) {
+                "rcmail.addEventListener('beforeswitch-task', function(p) {
     if (p == 'kolab-chat' && rcmail.env.kolab_chat_extwin) {
         rcmail.open_window('?_task=kolab-chat&redirect=1', false, false, true);
         return false;
@@ -81,23 +81,23 @@
                 'foot'
             );
 
-            $this->add_button(array(
+            $this->add_button(
                     'command'    => 'kolab-chat',
                     'class'      => 'button-chat',
                     'classsel'   => 'button-chat button-selected',
                     'innerclass' => 'button-inner',
                     'label'      => 'kolab_chat.chat',
                     'type'       => 'link',
-                ), 'taskbar');
+                , 'taskbar');
 
             $this->driver->ui();
         }
 
         if ($this->rc->output->type == 'html' && $args'task' == 'settings') {
             // add hooks for Chat settings
-            $this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
-            $this->add_hook('preferences_list', array($this, 'preferences_list'));
-            $this->add_hook('preferences_save', array($this, 'preferences_save')); 
+            $this->add_hook('preferences_sections_list', $this, 'preferences_sections_list');
+            $this->add_hook('preferences_list', $this, 'preferences_list');
+            $this->add_hook('preferences_save', $this, 'preferences_save');
         }
     }
 
@@ -105,7 +105,7 @@
      * Display chat iframe wrapped by Roundcube interface elements (taskmenu)
      * or a dummy page with redirect to the chat app.
      */
-    function ui()
+    public function ui()
     {
         $this->driver->ui();
 
@@ -116,8 +116,7 @@
                 . '<meta http-equiv="refresh" content="0; url=' . $url . '">'
                 . '</head><body></body></html>';
             exit;
-        }
-        else {
+        } else {
             $this->rc->output->add_script(
                 "rcmail.addEventListener('init', function() {"
                     . "rcmail.location_href('$url', rcmail.get_frame_window(rcmail.env.contentframe));"
@@ -132,7 +131,7 @@
     /**
      * Handler for driver specific actions
      */
-    function action()
+    public function action()
     {
         $this->driver->action();
     }
@@ -141,15 +140,15 @@
      * Handler for preferences_sections_list hook.
      * Adds Chat settings section into preferences sections list.
      *
-     * @param array Original parameters
+     * @param array $p Original parameters
      *
      * @return array Modified parameters
      */
-    function preferences_sections_list($p)
+    public function preferences_sections_list($p)
     {
-        $p'list''kolab-chat' = array(
-            'id' => 'kolab-chat', 'section' => $this->gettext('chat'), 'class' => 'chat'
-        );
+        $p'list''kolab-chat' = 
+            'id' => 'kolab-chat', 'section' => $this->gettext('chat'), 'class' => 'chat',
+        ;
 
         return $p;
     }
@@ -158,11 +157,11 @@
      * Handler for preferences_list hook.
      * Adds options blocks into Chat settings sections in Preferences.
      *
-     * @param array Original parameters
+     * @param array $p Original parameters
      *
      * @return array Modified parameters
      */
-    function preferences_list($p)
+    public function preferences_list($p)
     {
         if ($p'section' != 'kolab-chat') {
             return $p;
@@ -179,17 +178,17 @@
             }
 
             $field_id = 'rcmfd_kolab_chat_extwin';
-            $input    = new html_checkbox(array('name' => '_kolab_chat_extwin', 'id' => $field_id, 'value' => 1));
+            $input    = new html_checkbox('name' => '_kolab_chat_extwin', 'id' => $field_id, 'value' => 1);
 
-            $p'blocks''main''options''kolab_chat_extwin' = array(
+            $p'blocks''main''options''kolab_chat_extwin' = 
                 'title'   => html::label($field_id, rcube::Q($this->gettext('showinextwin'))),
                 'content' => $input->show($this->rc->config->get('kolab_chat_extwin') ? 1 : 0),
-            );
+            ;
         }
 
         if ($p'current') {
             // update env flag in the parent window
-            $this->rc->output->command('parent.set_env', array('kolab_chat_extwin' => (bool) $this->rc->config->get('kolab_chat_extwin')));
+            $this->rc->output->command('parent.set_env', 'kolab_chat_extwin' => (bool) $this->rc->config->get('kolab_chat_extwin'));
 
             // Add driver-specific options
             $this->driver->preferences_list($p);
@@ -202,16 +201,16 @@
      * Handler for preferences_save hook.
      * Executed on Chat settings form submit.
      *
-     * @param array Original parameters
+     * @param array $p Original parameters
      *
      * @return array Modified parameters
      */
-    function preferences_save($p)
+    public function preferences_save($p)
     {
         if ($p'section' == 'kolab-chat') {
-            $p'prefs' = array(
+            $p'prefs' = 
                 'kolab_chat_extwin' => isset($_POST'_kolab_chat_extwin'),
-            );
+            ;
 
             // Add driver-specific options
             $this->driver->preferences_save($p);

roundcubemail-1.5.tar.gz/plugins/kolab_chat/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_chat/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_config/kolab_config.php Changed

@@ -32,9 +32,9 @@
 
     private $config;
     private $loaded = false;
-    private $dicts = array();
+    private $dicts = ;
 
-    const O_TYPE = 'dictionary';
+    public const O_TYPE = 'dictionary';
 
     /**
      * Required startup method of a Roundcube plugin
@@ -45,16 +45,16 @@
 
         // Register spellchecker dictionary handlers
         if (strtolower($rcmail->config->get('spellcheck_dictionary')) != 'shared') {
-            $this->add_hook('spell_dictionary_save', array($this, 'dictionary_save'));
-            $this->add_hook('spell_dictionary_get', array($this, 'dictionary_get'));
+            $this->add_hook('spell_dictionary_save', $this, 'dictionary_save');
+            $this->add_hook('spell_dictionary_get', $this, 'dictionary_get');
         }
-/*
-        // Register addressbook saved searches handlers
-        $this->add_hook('saved_search_create', array($this, 'saved_search_create'));
-        $this->add_hook('saved_search_delete', array($this, 'saved_search_delete'));
-        $this->add_hook('saved_search_list', array($this, 'saved_search_list'));
-        $this->add_hook('saved_search_get', array($this, 'saved_search_get'));
-*/
+        /*
+                // Register addressbook saved searches handlers
+                $this->add_hook('saved_search_create', array($this, 'saved_search_create'));
+                $this->add_hook('saved_search_delete', array($this, 'saved_search_delete'));
+                $this->add_hook('saved_search_list', array($this, 'saved_search_list'));
+                $this->add_hook('saved_search_get', array($this, 'saved_search_get'));
+        */
 
         // @TODO: responses (snippets)
     }
@@ -98,8 +98,7 @@
         if (empty($dict'e')) {
             // Delete the object
             $this->config->delete($dict'uid');
-        }
-        else {
+        } else {
             // Update the object
             $this->config->save($dict, self::O_TYPE, $dict'uid');
         }
@@ -139,8 +138,8 @@
     /**
      * Load dictionary config objects from Kolab storage
      *
-     * @param string The language (2 chars) to load
-     * @param bool   Only load objects from default folder
+     * @param string $lang    The language (2 chars) to load
+     * @param bool   $default Only load objects from default folder
      *
      * @return array|null Dictionary object as hash array
      */
@@ -150,21 +149,22 @@
             return $this->dicts$lang;
         }
 
-        $query = array(array('type','=',self::O_TYPE), array('tags','=',$lang));
+        $query = 'type','=',self::O_TYPE, 'tags','=',$lang;
 
         foreach ($this->config->get_objects($query, $default, null, 100) as $object) {
             if ($object'language' == $lang || $object'language' == 'XX') {
-                if (isset($this->dicts$lang) && is_array($this->dicts$lang))
+                if (isset($this->dicts$lang) && is_array($this->dicts$lang)) {
                     $this->dicts$lang'e' = array_merge((array)$this->dicts$lang'e', $object'e');
-                else
-                    $this->dicts$lang = $object;
-/*
-                // make sure the default object is cached
-                if ($folder->default && $object'language' != 'XX') {
-                    $object'e' = $this->dicts$lang'e';
+                } else {
                     $this->dicts$lang = $object;
                 }
-*/
+                /*
+                                // make sure the default object is cached
+                                if ($folder->default && $object'language' != 'XX') {
+                                    $object'e' = $this->dicts$lang'e';
+                                    $this->dicts$lang = $object;
+                                }
+                */
             }
         }

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/kolab_delegation.php Changed

@@ -29,6 +29,7 @@
 
     private $rc;
     private $engine;
+    private $skin_path;
 
 
     /**
@@ -36,45 +37,45 @@
      */
     public function init()
     {
-        $this->rc = rcube::get_instance();
+        $this->rc = rcmail::get_instance();
 
         $this->require_plugin('libkolab');
         $this->require_plugin('kolab_auth');
 
         // on-login delegation initialization
-        $this->add_hook('login_after', array($this, 'login_hook'));
+        $this->add_hook('login_after', $this, 'login_hook');
         // on-check-recent delegation support
-        $this->add_hook('check_recent', array($this, 'check_recent_hook'));
+        $this->add_hook('check_recent', $this, 'check_recent_hook');
 
         // on-message-send delegation support
-        $this->add_hook('message_before_send', array($this, 'message_before_send'));
+        $this->add_hook('message_before_send', $this, 'message_before_send');
 
         // delegation support in Calendar and Tasklist plugins
-        $this->add_hook('message_load', array($this, 'message_load'));
-        $this->add_hook('calendar_user_emails', array($this, 'calendar_user_emails'));
-        $this->add_hook('calendar_list_filter', array($this, 'calendar_list_filter'));
-        $this->add_hook('calendar_load_itip', array($this, 'calendar_load_itip'));
-        $this->add_hook('tasklist_list_filter', array($this, 'tasklist_list_filter'));
+        $this->add_hook('message_load', $this, 'message_load');
+        $this->add_hook('calendar_user_emails', $this, 'calendar_user_emails');
+        $this->add_hook('calendar_list_filter', $this, 'calendar_list_filter');
+        $this->add_hook('calendar_load_itip', $this, 'calendar_load_itip');
+        $this->add_hook('tasklist_list_filter', $this, 'tasklist_list_filter');
 
         // delegation support in kolab_auth plugin
-        $this->add_hook('kolab_auth_emails', array($this, 'kolab_auth_emails'));
+        $this->add_hook('kolab_auth_emails', $this, 'kolab_auth_emails');
 
         // delegation support in Enigma plugin
-        $this->add_hook('enigma_user_identities', array($this, 'user_identities'));
+        $this->add_hook('enigma_user_identities', $this, 'user_identities');
 
         if ($this->rc->task == 'settings') {
             // delegation management interface
-            $this->register_action('plugin.delegation',              array($this, 'controller_ui'));
-            $this->register_action('plugin.delegation-delete',       array($this, 'controller_action'));
-            $this->register_action('plugin.delegation-save',         array($this, 'controller_action'));
-            $this->register_action('plugin.delegation-autocomplete', array($this, 'controller_action'));
+            $this->register_action('plugin.delegation', $this, 'controller_ui');
+            $this->register_action('plugin.delegation-delete', $this, 'controller_action');
+            $this->register_action('plugin.delegation-save', $this, 'controller_action');
+            $this->register_action('plugin.delegation-autocomplete', $this, 'controller_action');
 
-            $this->add_hook('settings_actions', array($this, 'settings_actions'));
+            $this->add_hook('settings_actions', $this, 'settings_actions');
 
             if ($this->rc->output->type == 'html'
                 && ($this->rc->action == 'plugin.delegation' || empty($_REQUEST'_framed'))
             ) {
-                $this->add_texts('localization/', array('deleteconfirm', 'savingdata', 'yes', 'no'));
+                $this->add_texts('localization/', 'deleteconfirm', 'savingdata', 'yes', 'no');
 
                 if ($this->rc->action == 'plugin.delegation') {
                     $this->include_script('kolab_delegation.js');
@@ -85,7 +86,7 @@
             }
         }
         // Calendar/Tasklist plugin UI bindings
-        else if (($this->rc->task == 'calendar' || $this->rc->task == 'tasks')
+        elseif (($this->rc->task == 'calendar' || $this->rc->task == 'tasks')
             && empty($_REQUEST'_framed')
         ) {
             if ($this->rc->output->type == 'html') {
@@ -97,15 +98,15 @@
     /**
      * Adds Delegation section in Settings
      */
-    function settings_actions($args)
+    public function settings_actions($args)
     {
-        $args'actions' = array(
+        $args'actions' = 
             'action' => 'plugin.delegation',
             'class'  => 'delegation',
             'label'  => 'tabtitle',
             'domain' => 'kolab_delegation',
             'title'  => 'delegationtitle',
-        );
+        ;
 
         return $args;
     }
@@ -325,7 +326,7 @@
         // Remove delegators' identities from the key generation form
 
         if (!empty($_SESSION'delegators')) {
-            $args'identities' = array_filter($args'identities', function($ident) {
+            $args'identities' = array_filter($args'identities', function ($ident) {
                 foreach ($_SESSION'delegators' as $emails) {
                     if (in_array($ident'email', $emails)) {
                         return false;
@@ -346,15 +347,15 @@
     {
         // main interface (delegates list)
         if (empty($_REQUEST'_framed')) {
-            $this->register_handler('plugin.delegatelist', array($this, 'delegate_list'));
+            $this->register_handler('plugin.delegatelist', $this, 'delegate_list');
 
             $this->rc->output->include_script('list.js');
             $this->rc->output->send('kolab_delegation.settings');
         }
         // delegate frame
         else {
-            $this->register_handler('plugin.delegateform', array($this, 'delegate_form'));
-            $this->register_handler('plugin.delegatefolders', array($this, 'delegate_folders'));
+            $this->register_handler('plugin.delegateform', $this, 'delegate_form');
+            $this->register_handler('plugin.delegatefolders', $this, 'delegate_folders');
 
             $this->rc->output->set_env('autocomplete_max', (int)$this->rc->config->get('autocomplete_max', 15));
             $this->rc->output->set_env('autocomplete_min_length', $this->rc->config->get('autocomplete_min_length'));
@@ -380,14 +381,13 @@
 
             if (!$error) {
                 $this->rc->output->show_message($this->gettext('deletesuccess'), 'confirmation');
-                $this->rc->output->command('plugin.delegate_save_complete', array('deleted' => $id));
-            }
-            else {
+                $this->rc->output->command('plugin.delegate_save_complete', 'deleted' => $id);
+            } else {
                 $this->rc->output->show_message($this->gettext($error), 'error');
             }
         }
         // Delegate add/update
-        else if ($this->rc->action == 'plugin.delegation-save') {
+        elseif ($this->rc->action == 'plugin.delegation-save') {
             $id  = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
             $acl = rcube_utils::get_input_value('folders', rcube_utils::INPUT_GPC);
 
@@ -398,9 +398,8 @@
 
                 if (!$error) {
                     $this->rc->output->show_message($this->gettext('updatesuccess'), 'confirmation');
-                    $this->rc->output->command('plugin.delegate_save_complete', array('updated' => $id));
-                }
-                else {
+                    $this->rc->output->command('plugin.delegate_save_complete', 'updated' => $id);
+                } else {
                     $this->rc->output->show_message($this->gettext($error), 'error');
                 }
             }
@@ -412,18 +411,17 @@
 
                 if (!$error) {
                     $this->rc->output->show_message($this->gettext('createsuccess'), 'confirmation');
-                    $this->rc->output->command('plugin.delegate_save_complete', array(
+                    $this->rc->output->command('plugin.delegate_save_complete', 
                         'created' => $delegate'ID',
                         'name'    => $delegate'name',
-                    ));
-                }
-                else {
+                    );
+                } else {
                     $this->rc->output->show_message($this->gettext($error), 'error');
                 }
             }
         }
         // Delegate autocompletion
-        else if ($this->rc->action == 'plugin.delegation-autocomplete') {
+        elseif ($this->rc->action == 'plugin.delegation-autocomplete') {
             $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
             $reqid  = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
             $users  = $engine->list_users($search);
@@ -437,9 +435,9 @@
     /**
      * Template object of delegates list
      */
-    public function delegate_list($attrib = array())
+    public function delegate_list($attrib = )
     {
-        $attrib += array('id' => 'delegate-list');
+        $attrib += 'id' => 'delegate-list';
 
         $engine = $this->engine();
         $list   = $engine->list_delegates();
@@ -449,7 +447,7 @@
         asort($list, SORT_LOCALE_STRING);
 
         foreach ($list as $id => $delegate) {
-            $table->add_row(array('id' => 'rcmrow' . $id));
+            $table->add_row('id' => 'rcmrow' . $id);
             $table->add(null, rcube::Q($delegate));
         }
 
@@ -462,10 +460,10 @@
     /**
      * Template object of delegate form
      */
-    public function delegate_form($attrib = array())
+    public function delegate_form($attrib = )
     {
         $engine   = $this->engine();
-        $table    = new html_table(array('cols' => 2));
+        $table    = new html_table('cols' => 2);
         $id       = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $field_id = 'delegate';
 
@@ -474,14 +472,13 @@
         }
 
         if (!empty($delegate)) {
-            $input = new html_hiddenfield(array('name' => $field_id, 'id' => $field_id, 'size' => 40));
-            $input = rcube::Q($delegate'name') . $input->show($id);
+            $input = new html_hiddenfield('name' => $field_id, 'id' => $field_id, 'size' => 40, 'value' => $id);
+            $input = rcube::Q($delegate'name') . $input->show();
 
             $this->rc->output->set_env('active_delegate', $id);
-            $this->rc->output->command('parent.enable_command','delegate-delete', true);
-        }
-        else {
-            $input = new html_inputfield(array('name' => $field_id, 'id' => $field_id, 'size' => 40));
+            $this->rc->output->command('parent.enable_command', 'delegate-delete', true);
+        } else {
+            $input = new html_inputfield('name' => $field_id, 'id' => $field_id, 'size' => 40);
             $input = $input->show();
         }
 
@@ -498,7 +495,7 @@
     /**
      * Template object of folders list
      */
-    public function delegate_folders($attrib = array())
+    public function delegate_folders($attrib = )
     {
         if (!$attrib'id') {
             $attrib'id' = 'delegatefolders';
@@ -513,8 +510,8 @@
 
         $folder_data   = $engine->list_folders(!empty($delegate) ? $delegate'uid' : null);
         $use_fieldsets = rcube_utils::get_boolean($attrib'use-fieldsets');
-        $rights        = array();
-        $folder_groups = array();
+        $rights        = ;
+        $folder_groups = ;
 
         foreach ($folder_data as $folder_name => $folder) {
             $folder_groups$folder'type' = $folder_name;
@@ -525,18 +522,13 @@
 
         // build block for every folder type
         foreach ($folder_groups as $type => $group) {
-            if (empty($group)) {
-                continue;
-            }
-
             $attrib'type' = $type;
             $table = $this->delegate_folders_block($group, $attrib, $rights);
             $label = $this->gettext($type);
 
             if ($use_fieldsets) {
                 $html .= html::tag('fieldset', 'foldersblock', html::tag('legend', $type, $label) . $table);
-            }
-            else {
+            } else {
                 $html .= html::div('foldersblock', html::tag('h3', $type, $label) . $table);
             }
         }
@@ -552,35 +544,35 @@
     private function delegate_folders_block($a_folders, $attrib, $rights)
     {
         $path      = 'plugins/kolab_delegation/' . $this->skin_path . '/';
-        $read_ico  = !empty($attrib'readicon') ? html::img(array('src' =>  $path . $attrib'readicon', 'title' => $this->gettext('read'))) : '';
-        $write_ico = !empty($attrib'writeicon') ? html::img(array('src' => $path . $attrib'writeicon', 'title' => $this->gettext('write'))) : '';
+        $read_ico  = !empty($attrib'readicon') ? html::img('src' =>  $path . $attrib'readicon', 'title' => $this->gettext('read')) : '';
+        $write_ico = !empty($attrib'writeicon') ? html::img('src' => $path . $attrib'writeicon', 'title' => $this->gettext('write')) : '';
 
-        $table = new html_table(array('cellspacing' => 0, 'class' => 'table-striped'));
-        $table->add_header(array('class' => 'read checkbox-cell', 'title' => $this->gettext('read'), 'tabindex' => 0), $read_ico);
-        $table->add_header(array('class' => 'write checkbox-cell', 'title' => $this->gettext('write'), 'tabindex' => 0), $write_ico);
+        $table = new html_table('cellspacing' => 0, 'class' => 'table-striped');
+        $table->add_header('class' => 'read checkbox-cell', 'title' => $this->gettext('read'), 'tabindex' => 0, $read_ico);
+        $table->add_header('class' => 'write checkbox-cell', 'title' => $this->gettext('write'), 'tabindex' => 0, $write_ico);
         $table->add_header('foldername', $this->rc->gettext('folder'));
 
-        $checkbox_read  = new html_checkbox(array('name' => 'read', 'class' => 'read'));
-        $checkbox_write = new html_checkbox(array('name' => 'write', 'class' => 'write'));
+        $checkbox_read  = new html_checkbox('name' => 'read', 'class' => 'read');
+        $checkbox_write = new html_checkbox('name' => 'write', 'class' => 'write');
 
-        $names = array();
+        $names = ;
         foreach ($a_folders as $folder) {
             $foldername = $origname = kolab_storage::object_prettyname($folder);
 
             // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
-            for ($i = count($names)-1; $i >= 0; $i--) {
-                if (strpos($foldername, $names$i.' &raquo; ') === 0) {
-                    $length = strlen($names$i.' &raquo; ');
+            for ($i = count($names) - 1; $i >= 0; $i--) {
+                if (strpos($foldername, $names$i . ' &raquo; ') === 0) {
+                    $length = strlen($names$i . ' &raquo; ');
                     $prefix = substr($foldername, 0, $length);
                     $count  = count(explode(' &raquo; ', $prefix));
-                    $foldername = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($foldername, $length);
+                    $foldername = str_repeat('&nbsp;&nbsp;', $count - 1) . '&raquo; ' . substr($foldername, $length);
                     break;
                 }
             }
 
             $folder_id = 'rcmf' . rcube_utils::html_identifier($folder);
             $names = $origname;
-            $classes = array('mailbox');
+            $classes = 'mailbox';
 
             if ($folder_class = $this->rc->folder_classname($folder)) {
                 if ($this->rc->text_exists($folder_class)) {
@@ -592,12 +584,14 @@
             $table->add_row();
             $table->add('read checkbox-cell', $checkbox_read->show(
                 $rights$folder >= kolab_delegation_engine::ACL_READ ? $folder : null,
-                array('value' => $folder)));
+                'value' => $folder
+            ));
             $table->add('write checkbox-cell', $checkbox_write->show(
                 $rights$folder >= kolab_delegation_engine::ACL_WRITE ? $folder : null,
-                array('value' => $folder, 'id' => $folder_id)));
+                'value' => $folder, 'id' => $folder_id
+            ));
 
-            $table->add(join(' ', $classes), html::label($folder_id, $foldername));
+            $table->add(implode(' ', $classes), html::label($folder_id, $foldername));
         }
 
         return $table->show();

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php Changed

@@ -36,12 +36,12 @@
     private $ldap_email_field;
     private $ldap_org_field;
     private $ldap_dn;
-    private $cache = array();
-    private $folder_types = array('mail', 'event', 'task');
+    private $cache = ;
+    private $folder_types = 'mail', 'event', 'task';
     private $supported;
 
-    const ACL_READ  = 1;
-    const ACL_WRITE = 2;
+    public const ACL_READ  = 1;
+    public const ACL_WRITE = 2;
 
     /**
      * Class constructor
@@ -80,7 +80,7 @@
 
         // add delegate to the list
         $list = $dn;
-        $list   = array_map(array('kolab_ldap', 'dn_decode'), $list);
+        $list   = array_map('kolab_ldap', 'dn_decode', $list);
 
         // update user record
         $result = $this->user_update_delegates($list);
@@ -99,21 +99,18 @@
      * @param string $uid    Delegate authentication identifier
      * @param array  $acl    List of folder->right map
      * @param bool   $update Update (remove) old rights
-     *
-     * @return string On error returns an error label, on success returns null
      */
     public function delegate_acl_update($uid, $acl, $update = false)
     {
         $storage     = $this->rc->get_storage();
         $right_types = $this->right_types();
-        $folders     = $update ? $this->list_folders($uid) : array();
+        $folders     = $update ? $this->list_folders($uid) : ;
 
         foreach ($acl as $folder_name => $rights) {
             $r = $right_types$rights ?? null;
             if ($r) {
                 $storage->set_acl($folder_name, $uid, $r);
-            }
-            else {
+            } else {
                 $storage->delete_acl($folder_name, $uid);
             }
 
@@ -150,7 +147,7 @@
         // remove delegate from the list
         unset($list$dn);
         $list = array_keys($list);
-        $list = array_map(array('kolab_ldap', 'dn_decode'), $list);
+        $list = array_map('kolab_ldap', 'dn_decode', $list);
         $user$this->ldap_delegate_field = $list;
 
         // update user record
@@ -158,7 +155,7 @@
 
         // remove ACL
         if ($result && $acl_del) {
-            $this->delegate_acl_update($delegate'uid', array(), true);
+            $this->delegate_acl_update($delegate'uid', , true);
         }
 
         return $result ? null : 'deleteerror';
@@ -178,14 +175,14 @@
             $ldap = $this->ldap();
 
             if (!$ldap || empty($dn)) {
-                return array();
+                return ;
             }
 
             // Get delegate
             $user = $ldap->get_record(kolab_ldap::dn_decode($dn));
 
             if (empty($user)) {
-                return array();
+                return ;
             }
 
             $delegate = $this->parse_ldap_record($user);
@@ -209,7 +206,7 @@
         $ldap = $this->ldap();
 
         if (!$ldap || empty($login)) {
-            return array();
+            return ;
         }
 
         $list = $ldap->dosearch($this->ldap_login_field, $login, 1);
@@ -220,6 +217,8 @@
 
             return $this->parse_ldap_record($user, $dn);
         }
+
+        return ;
     }
 
     /**
@@ -254,7 +253,7 @@
         $this->ldap_org_field = $this->rc->config->get('kolab_delegation_organization_field', $this->rc->config->get('kolab_auth_organization'));
 
         $this->ldap->set_filter($this->ldap_filter);
-        $this->ldap->extend_fieldmap(array($this->ldap_delegate_field => $this->ldap_delegate_field));
+        $this->ldap->extend_fieldmap($this->ldap_delegate_field => $this->ldap_delegate_field);
 
         return $this->ldap;
     }
@@ -264,12 +263,12 @@
      */
     public function list_delegates()
     {
-        $result = array();
+        $result = ;
         $ldap   = $this->ldap();
         $user   = $this->user();
 
         if (empty($ldap) || empty($user)) {
-            return array();
+            return ;
         }
 
         // Get delegates of current user
@@ -296,11 +295,11 @@
      */
     public function list_delegators()
     {
-        $result = array();
+        $result = ;
         $ldap   = $this->ldap();
 
         if (empty($ldap) || empty($this->ldap_dn)) {
-            return array();
+            return ;
         }
 
         $list = $ldap->dosearch($this->ldap_delegate_field, $this->ldap_dn, 1);
@@ -321,7 +320,7 @@
     public function list_delegators_js()
     {
         $list   = $this->list_delegators();
-        $result = array();
+        $result = ;
 
         foreach ($list as $delegator) {
             $name = $delegator'name';
@@ -329,11 +328,11 @@
                 $name = trim(substr($name, 0, $pos));
             }
 
-            $result$delegator'imap_uid' = array(
+            $result$delegator'imap_uid' = 
                 'emails' => ';' . implode(';', $delegator'email'),
                 'email'  => $delegator'email'0,
                 'name'   => $name,
-            );
+            ;
         }
 
         return $result;
@@ -370,7 +369,7 @@
         $storage  = $this->rc->get_storage();
         $folders  = $storage->list_folders();
         $metadata = kolab_storage::folders_typedata();
-        $result   = array();
+        $result   = ;
 
         if (!is_array($metadata)) {
             return $result;
@@ -389,7 +388,7 @@
 
             $rights = null;
             $type   = !empty($metadata$folder) ? $metadata$folder : 'mail';
-            list($class, $subclass) = strpos($type, '.') ? explode('.', $type) : $type, '';
+            $class, $subclass = strpos($type, '.') ? explode('.', $type) : $type, '';
 
             if (!in_array($class, $this->folder_types)) {
                 continue;
@@ -402,20 +401,18 @@
                 if (!empty($imap_acl) && (($acl = ($imap_acl$delegate ?? null)) || ($acl = ($imap_acl$delegate_lc ?? null)))) {
                     if ($this->acl_compare($acl, $right_typesself::ACL_WRITE)) {
                         $rights = self::ACL_WRITE;
-                    }
-                    else if ($this->acl_compare($acl, $right_typesself::ACL_READ)) {
+                    } elseif ($this->acl_compare($acl, $right_typesself::ACL_READ)) {
                         $rights = self::ACL_READ;
                     }
                 }
-            }
-            else if ($folder == 'INBOX' || $subclass == 'default' || $subclass == 'inbox') {
+            } elseif ($folder == 'INBOX' || $subclass == 'default' || $subclass == 'inbox') {
                 $rights = self::ACL_WRITE;
             }
 
-            $result$folder = array(
+            $result$folder = 
                 'type'   => $class,
                 'rights' => $rights,
-            );
+            ;
         }
 
         return $result;
@@ -433,14 +430,14 @@
         $ldap = $this->ldap();
 
         if (empty($ldap) || $search === '' || $search === null) {
-            return array();
+            return ;
         }
 
         $max    = (int) $this->rc->config->get('autocomplete_max', 15);
         $mode   = (int) $this->rc->config->get('addressbook_search_mode');
         $fields = array_unique(array_filter(array_merge((array)$this->ldap_name_field, (array)$this->ldap_login_field)));
-        $users  = array();
-        $keys   = array();
+        $users  = ;
+        $keys   = ;
 
         $result = $ldap->dosearch($fields, $search, $mode, (array)$this->ldap_login_field, $max);
 
@@ -452,11 +449,11 @@
 
             $user = $this->parse_ldap_record($record);
 
-            if ($user'uid') {
+            if ($uid = $user'uid') {
                 $display = rcube_addressbook::compose_search_name($record);
-                $user    = array('name' => $user'uid', 'display' => $display);
+                $user    = 'name' => $uid, 'display' => $display;
                 $users = $user;
-                $keys  = $display ?: $user'uid';
+                $keys  = $display ?: $uid;
             }
         }
 
@@ -478,8 +475,9 @@
      */
     private function parse_ldap_record($data, $dn = null)
     {
-        $email = array();
+        $email = ;
         $uid   = $data$this->ldap_login_field;
+        $name  = '';
 
         if (is_array($uid)) {
             $uid = array_filter($uid);
@@ -513,8 +511,7 @@
         $realname = $name;
         if ($uid && $name) {
             $name .= ' (' . $uid . ')';
-        }
-        else {
+        } else {
             $name = $uid;
         }
 
@@ -524,7 +521,7 @@
             $imap_uid = substr($imap_uid, 0, $pos);
         }
 
-        return array(
+        return 
             'ID'       => kolab_ldap::dn_encode($dn),
             'uid'      => $uid,
             'name'     => $name,
@@ -532,7 +529,7 @@
             'imap_uid' => $imap_uid,
             'email'    => $email,
             'organization' => $organization ?? null,
-        );
+        ;
     }
 
     /**
@@ -546,7 +543,7 @@
             $ldap = $this->ldap();
 
             if (!$ldap) {
-                return array();
+                return ;
             }
 
             // Get current user record
@@ -559,7 +556,7 @@
     /**
      * Update LDAP record of current user
      *
-     * @param array List of delegates
+     * @param array $list List of delegates
      */
     public function user_update_delegates($list)
     {
@@ -599,12 +596,12 @@
         $delegators = $this->list_delegators();
         $use_subs   = $this->rc->config->get('kolab_use_subscriptions');
         $identities = $this->rc->user->list_emails();
-        $emails     = array();
-        $uids       = array();
+        $emails     = ;
+        $uids       = ;
 
         if (!empty($delegators)) {
             $storage  = $this->rc->get_storage();
-            $other_ns = $storage->get_namespace('other') ?: array();
+            $other_ns = $storage->get_namespace('other') ?: ;
             $folders  = $storage->list_folders();
         }
 
@@ -612,9 +609,9 @@
         foreach ($identities as $idx => $ident) {
             // get user name from default identity
             if (!$idx) {
-                $default = array(
+                $default = 
                     'name' => $ident'name',
-                );
+                ;
             }
             $emails$ident'identity_id' = $ident'email';
         }
@@ -773,7 +770,7 @@
             $args'abort'  = true;
         }
         // return only user addresses (exclude all delegators addresses)
-        else if (!empty($_SESSION'delegators')) {
+        elseif (!empty($_SESSION'delegators')) {
             $identities = $this->rc->user->list_emails();
             $emails   = $this->rc->user->get_username();
 
@@ -804,7 +801,7 @@
         }
 
         $storage  = $this->rc->get_storage();
-        $other_ns = $storage->get_namespace('other') ?: array();
+        $other_ns = $storage->get_namespace('other') ?: ;
         $delim    = $storage->get_hierarchy_delimiter();
 
         if ($mode == 'calendars') {
@@ -812,15 +809,14 @@
             $active   = $args'filter' & calendar_driver::FILTER_ACTIVE;
             $personal = $args'filter' & calendar_driver::FILTER_PERSONAL;
             $shared   = $args'filter' & calendar_driver::FILTER_SHARED;
-        }
-        else {
+        } else {
             $editable = $args'filter' & tasklist_driver::FILTER_WRITEABLE;
             $active   = $args'filter' & tasklist_driver::FILTER_ACTIVE;
             $personal = $args'filter' & tasklist_driver::FILTER_PERSONAL;
             $shared   = $args'filter' & tasklist_driver::FILTER_SHARED;
         }
 
-        $folders = array();
+        $folders = ;
 
         foreach ($args'list' as $folder) {
             if (isset($folder->ready) && !$folder->ready) {
@@ -840,8 +836,7 @@
 
                 if ($personal && $ns == 'personal') {
                     continue;
-                }
-                else if ($personal && $ns == 'other') {
+                } elseif ($personal && $ns == 'other') {
                     $found = false;
                     foreach ($other_ns as $ns) {
                         $c_folder = $ns0 . $context . $delim;
@@ -853,8 +848,7 @@
                     if (!$found) {
                         continue;
                     }
-                }
-                else if (!$shared || $ns != 'shared') {
+                } elseif (!$shared || $ns != 'shared') {
                     continue;
                 }
             }
@@ -895,7 +889,7 @@
                 $identity = $this->rc->user->get_identity();
                 $sender   = format_email_recipient($identity'email', $identity'name');
 
-                $message->headers(array('Sender' => $sender), false, true);
+                $message->headers('Sender' => $sender, false, true);
             }
         }
     }
@@ -906,12 +900,16 @@
      * @param array $acl1 ACL rights array (or string)
      * @param array $acl2 ACL rights array (or string)
      *
-     * @param bool True if $acl1 contains all rights from $acl2
+     * @return bool True if $acl1 contains all rights from $acl2
      */
-    function acl_compare($acl1, $acl2)
+    public function acl_compare($acl1, $acl2)
     {
-        if (!is_array($acl1)) $acl1 = str_split($acl1);
-        if (!is_array($acl2)) $acl2 = str_split($acl2);
+        if (!is_array($acl1)) {
+            $acl1 = str_split($acl1);
+        }
+        if (!is_array($acl2)) {
+            $acl2 = str_split($acl2);
+        }
 
         $rights = $this->rights_supported();
 
@@ -922,9 +920,7 @@
         $cnt1 = count($res);
         $cnt2 = count($acl2);
 
-        if ($cnt1 >= $cnt2) {
-            return true;
-        }
+        return $cnt1 >= $cnt2;
     }
 
     /**
@@ -945,8 +941,7 @@
 
         if (is_array($capa)) {
             $rights = strtolower($capa0);
-        }
-        else {
+        } else {
             $rights = 'cd';
         }
 
@@ -959,11 +954,11 @@
         $supported = $this->rights_supported();
 
         // depending on server capability either use 'te' or 'd' for deleting msgs
-        $deleteright = implode(array_intersect(str_split('ted'), $supported));
+        $deleteright = implode('', array_intersect(str_split('ted'), $supported));
 
-        return array(
+        return 
             self::ACL_READ  => 'lrs',
-            self::ACL_WRITE => 'lrswi'.$deleteright,
-        );
+            self::ACL_WRITE => 'lrswi' . $deleteright,
+        ;
     }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/bg.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/bg_BG.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/ca_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/cs_CZ.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/da_DK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/de.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/de_CH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/de_DE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/el.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/es_AR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/es_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/et_EE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/fi_FI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/fr_FR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/hr_HR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/hu_HU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/it_IT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/ja_JP.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/ko_KR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/lv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/nl_NL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/pl.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/pl_PL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/pt_BR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/pt_PT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/ru_RU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/sk_SK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/sl_SI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/sv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/sv_SE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/th_TH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/uk_UA.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/localization/zh_CN.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_files/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_files/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/kolab_files/kolab_files.php Changed

@@ -27,7 +27,7 @@
     // all task excluding 'login' and 'logout'
     public $task = '?(?!login|logout).*';
 
-    public $allowed_prefs = array('kolab_files_collapsed_folders');
+    public $allowed_prefs = 'kolab_files_collapsed_folders';
     public $rc;
     public $home;
     private $engine;
@@ -37,30 +37,30 @@
         $this->rc = rcube::get_instance();
 
         // Register hooks
-        $this->add_hook('refresh', array($this, 'refresh'));
+        $this->add_hook('refresh', $this, 'refresh');
 
         // Plugin actions for other tasks
-        $this->register_action('plugin.kolab_files', array($this, 'actions'));
+        $this->register_action('plugin.kolab_files', $this, 'actions');
 
         // Register task
         $this->register_task('files');
 
         // Register plugin task actions
-        $this->register_action('index', array($this, 'actions'));
-        $this->register_action('prefs', array($this, 'actions'));
-        $this->register_action('open',  array($this, 'actions'));
-        $this->register_action('edit',  array($this, 'actions'));
-        $this->register_action('share',  array($this, 'actions'));
-        $this->register_action('reset',  array($this, 'actions'));
-        $this->register_action('autocomplete', array($this, 'autocomplete'));
+        $this->register_action('index', $this, 'actions');
+        $this->register_action('prefs', $this, 'actions');
+        $this->register_action('open', $this, 'actions');
+        $this->register_action('edit', $this, 'actions');
+        $this->register_action('share', $this, 'actions');
+        $this->register_action('reset', $this, 'actions');
+        $this->register_action('autocomplete', $this, 'autocomplete');
 
         // we use libkolab::http_request() from libkolab with its configuration
         $this->require_plugin('libkolab');
 
         // Load UI from startup hook
-        $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('startup', $this, 'startup');
 
-        $this->add_hook('preferences_save', array($this, 'preferences_save'));
+        $this->add_hook('preferences_save', $this, 'preferences_save');
     }
 
     /**
@@ -142,13 +142,13 @@
     /**
      * Handler for user autocomplete request
      */
-    function autocomplete()
+    public function autocomplete()
     {
         $this->load_config();
 
         require_once $this->home . '/lib/kolab_files_autocomplete.php';
 
-        new kolab_files_autocomplete($this);
+        new kolab_files_autocomplete();
     }
 
     /**
@@ -158,9 +158,9 @@
     {
         if ($props'section' == 'general') {
             $dont_override = (array) $this->rc->config->get('dont_override');
-            $prefs         = array();
+            $prefs         = ;
 
-            foreach (array('timezone', 'date_long') as $idx) {
+            foreach ('timezone', 'date_long' as $idx) {
                 if (isset($props'prefs'$idx) && !in_array($idx, $dont_override)) {
                     $prefs$idx = $props'prefs'$idx;
                 }

roundcubemail-1.5.tar.gz/plugins/kolab_files/lib/kolab_files_autocomplete.php Changed

@@ -24,22 +24,21 @@
 
 class kolab_files_autocomplete
 {
-    private $plugin;
+    private $ldap;
     private $rc;
 
 
     /**
      * Class constructor
      */
-    public function __construct($plugin)
+    public function __construct()
     {
-        $this->plugin = $plugin;
-        $this->rc     = rcube::get_instance();
+        $this->rc = rcmail::get_instance();
 
         $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
         $reqid  = rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC);
-        $users  = array();
-        $keys   = array();
+        $users  = ;
+        $keys   = ;
 
         if ($this->init_ldap()) {
             $max  = (int) $this->rc->config->get('autocomplete_max', 15);
@@ -63,28 +62,28 @@
 
                 if ($user) {
                     $display = rcube_addressbook::compose_search_name($record);
-                    $user    = array('name' => $user, 'display' => $display);
+                    $user    = 'name' => $user, 'display' => $display;
                     $users = $user;
                     $keys  = $display ?: $user'name';
                 }
             }
-/*
-            if ($this->rc->config->get('kolab_files_groups')) {
-                $prefix      = $this->rc->config->get('kolab_files_group_prefix');
-                $group_field = $this->rc->config->get('kolab_files_group_field', 'name');
-                $result      = $this->ldap->list_groups($search, $mode);
-
-                foreach ($result as $record) {
-                    $group    = $record'name';
-                    $group_id = is_array($record$group_field) ? $record$group_field0 : $record$group_field;
-
-                    if ($group) {
-                        $users = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
-                        $keys  = $group;
-                    }
-                }
-            }
-*/
+            /*
+                        if ($this->rc->config->get('kolab_files_groups')) {
+                            $prefix      = $this->rc->config->get('kolab_files_group_prefix');
+                            $group_field = $this->rc->config->get('kolab_files_group_field', 'name');
+                            $result      = $this->ldap->list_groups($search, $mode);
+
+                            foreach ($result as $record) {
+                                $group    = $record'name';
+                                $group_id = is_array($record$group_field) ? $record$group_field0 : $record$group_field;
+
+                                if ($group) {
+                                    $users = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
+                                    $keys  = $group;
+                                }
+                            }
+                        }
+            */
         }
 
         if (count($users)) {
@@ -148,10 +147,10 @@
         // search in UID and name fields
         // $name_field can be in a form of <field>:<modifier> (#1490591)
         $name_field = preg_replace('/:.*$/', '', $name_field);
-        $search     = array_unique(array($name_field, $uid_field));
+        $search     = array_unique($name_field, $uid_field);
 
         $config'search_fields'   = $search;
-        $config'required_fields' = array($uid_field);
+        $config'required_fields' = $uid_field;
 
         // set search filter
         if ($filter) {

roundcubemail-1.5.tar.gz/plugins/kolab_files/lib/kolab_files_engine.php Changed

@@ -30,11 +30,13 @@
     private $url_srv;
     private $filetypes_style;
     private $timeout = 600;
-    private $files_sort_cols    = array('name', 'mtime', 'size');
-    private $sessions_sort_cols = array('name');
+    private $file_data;
+    private $files_sort_cols    = 'name', 'mtime', 'size';
+    private $request;
+    private $sessions_sort_cols = 'name';
     private $mimetypes = null;
 
-    const API_VERSION = 4;
+    public const API_VERSION = 4;
 
 
     /**
@@ -56,20 +58,20 @@
     {
         $this->plugin->add_texts('localization/');
 
-        $templates = array();
+        $templates = ;
         $list_widget = false;
 
         // set templates of Files UI and widgets
         if ($this->rc->task == 'mail') {
-            if (in_array($this->rc->action, array('', 'show', 'compose'))) {
+            if (in_array($this->rc->action, '', 'show', 'compose')) {
                 $templates = 'compose_plugin';
             }
-            if (in_array($this->rc->action, array('show', 'preview', 'get'))) {
+            if (in_array($this->rc->action, 'show', 'preview', 'get')) {
                 $templates = 'message_plugin';
 
                 if ($this->rc->action == 'get') {
                     // add "Save as" button into attachment toolbar
-                    $this->plugin->add_button(array(
+                    $this->plugin->add_button(
                         'id'         => 'saveas',
                         'name'       => 'saveas',
                         'type'       => 'link',
@@ -78,11 +80,10 @@
                         'classact'   => 'button saveas',
                         'label'      => 'kolab_files.save',
                         'title'      => 'kolab_files.saveto',
-                        ), 'toolbar');
-                }
-                else {
+                        , 'toolbar');
+                } else {
                     // add "Save as" button into attachment menu
-                    $this->plugin->add_button(array(
+                    $this->plugin->add_button(
                         'id'         => 'attachmenusaveas',
                         'name'       => 'attachmenusaveas',
                         'type'       => 'link',
@@ -92,17 +93,15 @@
                         'classact'   => 'icon active saveas',
                         'innerclass' => 'icon active saveas',
                         'label'      => 'kolab_files.saveto',
-                        ), 'attachmentmenu');
+                        , 'attachmentmenu');
                 }
             }
 
             $list_widget = true;
-        }
-        else if (!$this->rc->action && in_array($this->rc->task, array('calendar', 'tasks'))) {
+        } elseif (!$this->rc->action && in_array($this->rc->task, 'calendar', 'tasks')) {
             $list_widget = true;
             $templates = 'compose_plugin';
-        }
-        else if ($this->rc->task == 'files') {
+        } elseif ($this->rc->task == 'files') {
             $templates = 'files';
 
             // get list of external sources
@@ -115,28 +114,39 @@
         if ($list_widget) {
             $this->folder_list_env();
 
-            $this->plugin->add_label('save', 'cancel', 'saveto',
-                'saveall', 'fromcloud', 'attachsel', 'selectfiles', 'attaching',
-                'collection_audio', 'collection_video', 'collection_image', 'collection_document',
-                'folderauthtitle', 'authenticating'
+            $this->plugin->add_label(
+                'save',
+                'cancel',
+                'saveto',
+                'saveall',
+                'fromcloud',
+                'attachsel',
+                'selectfiles',
+                'attaching',
+                'collection_audio',
+                'collection_video',
+                'collection_image',
+                'collection_document',
+                'folderauthtitle',
+                'authenticating'
             );
         }
 
         // add taskbar button
         if (empty($_REQUEST'framed')) {
-            $this->plugin->add_button(array(
+            $this->plugin->add_button(
                 'command'    => 'files',
                 'class'      => 'button-files',
                 'classsel'   => 'button-files button-selected',
                 'innerclass' => 'button-inner',
                 'label'      => 'kolab_files.files',
-                'type'       => 'link'
-                ), 'taskbar');
+                'type'       => 'link',
+                , 'taskbar');
         }
 
         $caps = $this->capabilities();
 
-        $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
+        $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/style.css');
         $this->plugin->include_script($this->url . '/js/files_api.js');
         $this->plugin->include_script('kolab_files.js');
 
@@ -147,12 +157,34 @@
         $this->rc->output->set_env('files_user', $this->rc->get_user_name());
 
         if (!empty($caps'DOCEDIT')) {
-            $this->plugin->add_label('declinednotice', 'invitednotice', 'acceptedownernotice',
-                'declinedownernotice', 'requestednotice', 'acceptednotice', 'declinednotice',
-                'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
-                'statusaccepted', 'statusinvited', 'statusdeclined', 'statusrequested',
-                'invitationaccepting', 'invitationdeclining', 'invitationrequesting',
-                'close', 'invitationtitle', 'sessions', 'saving');
+            $this->plugin->add_label(
+                'declinednotice',
+                'invitednotice',
+                'acceptedownernotice',
+                'declinedownernotice',
+                'requestednotice',
+                'acceptednotice',
+                'declinednotice',
+                'more',
+                'accept',
+                'decline',
+                'join',
+                'status',
+                'when',
+                'file',
+                'comment',
+                'statusaccepted',
+                'statusinvited',
+                'statusdeclined',
+                'statusrequested',
+                'invitationaccepting',
+                'invitationdeclining',
+                'invitationrequesting',
+                'close',
+                'invitationtitle',
+                'sessions',
+                'saving'
+            );
         }
 
         if (!empty($templates)) {
@@ -162,27 +194,28 @@
             $this->rc->output->set_env('kolab_files_collapsed_folders', $collapsed_folders);
 
             // register template objects for dialogs (and main interface)
-            $this->rc->output->add_handlers(array(
-                'folder-create-form' => array($this, 'folder_create_form'),
-                'folder-edit-form'   => array($this, 'folder_edit_form'),
-                'folder-mount-form'  => array($this, 'folder_mount_form'),
-                'folder-auth-options'=> array($this, 'folder_auth_options'),
-                'file-search-form'   => array($this, 'file_search_form'),
-                'file-rename-form'   => array($this, 'file_rename_form'),
-                'file-create-form'   => array($this, 'file_create_form'),
-                'file-edit-dialog'   => array($this, 'file_edit_dialog'),
-                'file-session-dialog' => array($this, 'file_session_dialog'),
-                'filelist'           => array($this, 'file_list'),
-                'sessionslist'       => array($this, 'sessions_list'),
-                'filequotadisplay'   => array($this, 'quota_display'),
-                'document-editors-dialog' => array($this, 'document_editors_dialog'),
-            ));
+            $this->rc->output->add_handlers(
+                'folder-create-form' => $this, 'folder_create_form',
+                'folder-edit-form'   => $this, 'folder_edit_form',
+                'folder-mount-form'  => $this, 'folder_mount_form',
+                'folder-auth-options' => $this, 'folder_auth_options',
+                'file-search-form'   => $this, 'file_search_form',
+                'file-rename-form'   => $this, 'file_rename_form',
+                'file-create-form'   => $this, 'file_create_form',
+                'file-edit-dialog'   => $this, 'file_edit_dialog',
+                'file-session-dialog' => $this, 'file_session_dialog',
+                'filelist'           => $this, 'file_list',
+                'sessionslist'       => $this, 'sessions_list',
+                'filequotadisplay'   => $this, 'quota_display',
+                'document-editors-dialog' => $this, 'document_editors_dialog',
+            );
 
             if ($this->rc->task != 'files') {
                 // add dialog(s) content at the end of page body
                 foreach ($templates as $template) {
                     $this->rc->output->add_footer(
-                        $this->rc->output->parse('kolab_files.' . $template, false, false));
+                        $this->rc->output->parse('kolab_files.' . $template, false, false)
+                    );
                 }
             }
         }
@@ -195,11 +228,9 @@
     {
         if ($this->rc->task == 'files' && $this->rc->action) {
             $action = $this->rc->action;
-        }
-        else if ($this->rc->task != 'files' && $_POST'act') {
+        } elseif ($this->rc->task != 'files' && $_POST'act') {
             $action = $_POST'act';
-        }
-        else {
+        } else {
             $action = 'index';
         }
 
@@ -221,9 +252,9 @@
             $attrib'id' = 'folder-create-form';
         }
 
-        $input_name    = new html_inputfield(array('id' => 'folder-name', 'name' => 'name', 'size' => 30));
-        $select_parent = new html_select(array('id' => 'folder-parent', 'name' => 'parent'));
-        $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
+        $input_name    = new html_inputfield('id' => 'folder-name', 'name' => 'name', 'size' => 30);
+        $select_parent = new html_select('id' => 'folder-parent', 'name' => 'parent');
+        $table         = new html_table('cols' => 2, 'class' => 'propform');
 
         $table->add('title', html::label('folder-name', rcube::Q($this->plugin->gettext('foldername'))));
         $table->add(null, $input_name->show());
@@ -253,9 +284,9 @@
             $attrib'id' = 'folder-edit-form';
         }
 
-        $input_name    = new html_inputfield(array('id' => 'folder-edit-name', 'name' => 'name', 'size' => 30));
-        $select_parent = new html_select(array('id' => 'folder-edit-parent', 'name' => 'parent'));
-        $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
+        $input_name    = new html_inputfield('id' => 'folder-edit-name', 'name' => 'name', 'size' => 30);
+        $select_parent = new html_select('id' => 'folder-edit-parent', 'name' => 'parent');
+        $table         = new html_table('cols' => 2, 'class' => 'propform');
 
         $table->add('title', html::label('folder-edit-name', rcube::Q($this->plugin->gettext('foldername'))));
         $table->add(null, $input_name->show());
@@ -292,49 +323,57 @@
         }
 
         // build form content
-        $table        = new html_table(array('cols' => 2, 'class' => 'propform'));
-        $input_name   = new html_inputfield(array('id' => 'folder-mount-name', 'name' => 'name', 'size' => 30));
-        $input_driver = new html_radiobutton(array('name' => 'driver', 'size' => 30));
+        $table        = new html_table('cols' => 2, 'class' => 'propform');
+        $input_name   = new html_inputfield('id' => 'folder-mount-name', 'name' => 'name', 'size' => 30);
+        $input_driver = new html_radiobutton('name' => 'driver', 'size' => 30);
 
         $table->add('title', html::label('folder-mount-name', rcube::Q($this->plugin->gettext('name'))));
         $table->add(null, $input_name->show());
 
         foreach ($sources as $key => $source) {
             $id    = 'source-' . $key;
-            $form  = new html_table(array('cols' => 2, 'class' => 'propform driverform'));
+            $form  = new html_table('cols' => 2, 'class' => 'propform driverform');
 
             foreach ((array) $source'form' as $idx => $label) {
                 $iid = $id . '-' . $idx;
                 $type  = stripos($idx, 'pass') !== false ? 'html_passwordfield' : 'html_inputfield';
-                $input = new $type(array('size' => 30));
+                $input = new $type('size' => 30);
 
                 $form->add('title', html::label($iid, rcube::Q($label)));
-                $form->add(null, $input->show('', array(
+                $form->add(null, $input->show('', 
                         'id'   => $iid,
-                        'name' => $key . '' . $idx . ''
-                )));
+                        'name' => $key . '' . $idx . '',
+                ));
             }
 
-            $row = $input_driver->show(null, array('value' => $key))
-                . html::img(array('src' => $source'image', 'alt' => $key, 'title' => $source'name'))
-                . html::div(null, html::span('name', rcube::Q($source'name'))
+            $row = $input_driver->show(null, 'value' => $key)
+                . html::img('src' => $source'image', 'alt' => $key, 'title' => $source'name')
+                . html::div(
+                    null,
+                    html::span('name', rcube::Q($source'name'))
                     . html::br()
                     . html::span('description hint', rcube::Q($source'description'))
                     . $form->show()
                 );
 
-            $table->add(array('id' => $id, 'colspan' => 2, 'class' => 'source'), $row);
+            $table->add('id' => $id, 'colspan' => 2, 'class' => 'source', $row);
         }
 
-        $out = $table->show() . $this->folder_auth_options(array('suffix' => '-form'));
+        $out = $table->show() . $this->folder_auth_options('suffix' => '-form');
 
         // add form tag around text field
         if (empty($attrib'form')) {
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('foldermounting', 'foldermountnotice', 'foldermount',
-            'save', 'cancel', 'folderauthtitle', 'authenticating'
+        $this->plugin->add_label(
+            'foldermounting',
+            'foldermountnotice',
+            'foldermount',
+            'save',
+            'cancel',
+            'folderauthtitle',
+            'authenticating'
         );
         $this->rc->output->add_gui_object('folder-mount-form', $attrib'id');
 
@@ -346,13 +385,14 @@
      */
     public function folder_auth_options($attrib)
     {
-        $checkbox = new html_checkbox(array(
+        $checkbox = new html_checkbox(
             'name'  => 'store_passwords',
             'value' => '1',
             'class' => 'pretty-checkbox',
-        ));
+        );
 
-        return html::div('auth-options',
+        return html::div(
+            'auth-options',
             html::label(null, $checkbox->show() . ' ' . $this->plugin->gettext('storepasswords'))
             . html::p('description hint', $this->plugin->gettext('storepasswordsdesc'))
         );
@@ -369,7 +409,7 @@
 
         if (empty($info) || empty($info'form')) {
             $msg = $this->plugin->gettext($info === false ? 'sharepermissionerror' : 'sharestorageerror');
-            return html::div(array('class' => 'boxerror', 'id' => 'share-notice'), rcube::Q($msg));
+            return html::div('class' => 'boxerror', 'id' => 'share-notice', rcube::Q($msg));
         }
 
         if (empty($attrib'id')) {
@@ -379,20 +419,19 @@
         $out = '';
 
         foreach ($info'form' as $mode => $tab) {
-            $table  = new html_table(array(
+            $table  = new html_table(
                     'cols'        => ($tab'list_column' ? 1 : count($tab'form')) + 1,
                     'data-mode'   => $mode,
                     'data-single' => $tab'single' ? 1 : 0,
-            ));
-            $submit = new html_button(array('class' => 'btn btn-secondary submit'));
-            $delete = new html_button(array('class' => 'btn btn-secondary btn-danger delete'));
-            $fields = array();
+            );
+            $submit = new html_button('class' => 'btn btn-secondary submit');
+            $delete = new html_button('class' => 'btn btn-secondary btn-danger delete');
+            $fields = ;
 
             // Table header
             if (!empty($tab'list_column')) {
                 $table->add_header(null, rcube::Q($tab'list_column_label'));
-            }
-            else {
+            } else {
                 foreach ($tab'form' as $field) {
                     $table->add_header(null, rcube::Q($field'title'));
                 }
@@ -404,34 +443,31 @@
             foreach ($tab'form' as $index => $field) {
                 $add = '';
                 if ($field'type' == 'select') {
-                    $ff = new html_select(array('name' => $index));
+                    $ff = new html_select('name' => $index);
                     foreach ($field'options' as $opt_idx => $opt) {
                         $ff->add($opt, $opt_idx);
                     }
-                }
-                else if ($field'type' == 'password') {
-                    $ff = new html_passwordfield(array(
+                } elseif ($field'type' == 'password') {
+                    $ff = new html_passwordfield(
                             'name'        => $index,
                             'placeholder' => $this->rc->gettext('password'),
-                    ));
-                    $add = new html_passwordfield(array(
+                    );
+                    $add = new html_passwordfield(
                             'name'        => $index . 'confirm',
                             'placeholder' => $this->plugin->gettext('confirmpassword'),
-                    ));
+                    );
                     $add = $add->show();
-                }
-                else {
-                    $ff = new html_inputfield(array(
+                } else {
+                    $ff = new html_inputfield(
                             'name'              => $index,
                             'data-autocomplete' => $field'autocomplete',
                             'placeholder'       => $field'placeholder',
-                    ));
+                    );
                 }
 
                 if (!empty($tab'list_column')) {
                     $record .= $ff->show() . $add;
-                }
-                else {
+                } else {
                     $table->add(null, $ff->show() . $add);
                 }
                 $fields$index = $ff;
@@ -443,7 +479,7 @@
 
             $hidden = '';
             foreach ((array) $tab'extra_fields' as $key => $default) {
-                $h = new html_hiddenfield(array('name' => $key, 'value' => $default));
+                $h = new html_hiddenfield('name' => $key, 'value' => $default);
                 $hidden .= $h->show();
             }
 
@@ -453,15 +489,13 @@
             foreach ((array) $info'rights' as $entry) {
                 if ($entry'mode' == $mode) {
                     if (!empty($tab'list_column')) {
-                        $table->add(null, html::span(array('title' => $entry'title', 'class' => 'name'), rcube::Q($entry$tab'list_column')));
-                    }
-                    else {
+                        $table->add(null, html::span('title' => $entry'title', 'class' => 'name', rcube::Q($entry$tab'list_column')));
+                    } else {
                         foreach ($tab'form' as $index => $field) {
                             if ($fields$index instanceof html_select) {
                                 $table->add(null, $fields$index->show($entry$index));
-                            }
-                            else if ($fields$index instanceof html_inputfield) {
-                                $table->add(null, html::span(array('title' => $entry'title', 'class' => 'name'), rcube::Q($entry$index)));
+                            } elseif ($fields$index instanceof html_inputfield) {
+                                $table->add(null, html::span('title' => $entry'title', 'class' => 'name', rcube::Q($entry$index)));
                             }
                         }
                     }
@@ -469,7 +503,7 @@
                     $hidden = '';
                     foreach ((array) $tab'extra_fields' as $key => $default) {
                         if (isset($entry$key)) {
-                            $h = new html_hiddenfield(array('name' => $key, 'value' => $entry$key));
+                            $h = new html_hiddenfield('name' => $key, 'value' => $entry$key);
                             $hidden .= $h->show();
                         }
                     }
@@ -498,8 +532,18 @@
      */
     public function file_edit_dialog($attrib)
     {
-        $this->plugin->add_label('select', 'create', 'cancel', 'editfiledialog', 'editfilesessions',
-            'newsession', 'ownedsession', 'invitedsession', 'joinsession', 'editfilero', 'editfilerotitle',
+        $this->plugin->add_label(
+            'select',
+            'create',
+            'cancel',
+            'editfiledialog',
+            'editfilesessions',
+            'newsession',
+            'ownedsession',
+            'invitedsession',
+            'joinsession',
+            'editfilero',
+            'editfilerotitle',
             'newsessionro'
         );
 
@@ -511,8 +555,15 @@
      */
     public function file_session_dialog($attrib)
     {
-        $this->plugin->add_label('join', 'open', 'close', 'request', 'cancel',
-            'sessiondialog', 'sessiondialogcontent');
+        $this->plugin->add_label(
+            'join',
+            'open',
+            'close',
+            'request',
+            'cancel',
+            'sessiondialog',
+            'sessiondialogcontent'
+        );
 
         return '<div></div>';
     }
@@ -522,27 +573,32 @@
      */
     public function document_editors_dialog($attrib)
     {
-        $table = new html_table($attrib + array('cols' => 3, 'border' => 0, 'cellpadding' => 0));
+        $table = new html_table($attrib + 'cols' => 3, 'border' => 0, 'cellpadding' => 0);
 
         $table->add_header('username', $this->plugin->gettext('participant'));
         $table->add_header('status', $this->plugin->gettext('status'));
         $table->add_header('options', null);
 
-        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30, 'class' => 'form-control'));
-        $textarea = new html_textarea(array('name' => 'comment', 'id' => 'invitation-comment',
-            'rows' => 4, 'cols' => 55, 'class' => 'form-control', 'title' => $this->plugin->gettext('invitationtexttitle')));
-        $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add',
-            'value' => $this->plugin->gettext('addparticipant')));
+        $input    = new html_inputfield('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30, 'class' => 'form-control');
+        $textarea = new html_textarea('name' => 'comment', 'id' => 'invitation-comment',
+            'rows' => 4, 'cols' => 55, 'class' => 'form-control', 'title' => $this->plugin->gettext('invitationtexttitle'));
+        $button   = new html_inputfield('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add',
+            'value' => $this->plugin->gettext('addparticipant'));
 
         $this->plugin->add_label('manageeditors', 'statusorganizer', 'addparticipant');
 
         // initialize attendees autocompletion
         $this->rc->autocomplete_init();
 
-        return html::div(null, $table->show() . html::div(null,
+        return html::div(null, $table->show() . html::div(
+            null,
             html::div('form-searchbar', $input->show() . " " . $button->show())
-            . html::p('attendees-commentbox', html::label(null,
-                $this->plugin->gettext('invitationtextlabel') . $textarea->show())
+            . html::p(
+                'attendees-commentbox',
+                html::label(
+                    null,
+                    $this->plugin->gettext('invitationtextlabel') . $textarea->show()
+                )
             )
         ));
     }
@@ -557,8 +613,8 @@
             $attrib'id' = 'file-rename-form';
         }
 
-        $input_name = new html_inputfield(array('id' => 'file-rename-name', 'name' => 'name', 'size' => 50));
-        $table      = new html_table(array('cols' => 2, 'class' => 'propform'));
+        $input_name = new html_inputfield('id' => 'file-rename-name', 'name' => 'name', 'size' => 50);
+        $table      = new html_table('cols' => 2, 'class' => 'propform');
 
         $table->add('title', html::label('file-rename-name', rcube::Q($this->plugin->gettext('filename'))));
         $table->add(null, $input_name->show());
@@ -586,12 +642,12 @@
             $attrib'id' = 'file-create-form';
         }
 
-        $input_name    = new html_inputfield(array('id' => 'file-create-name', 'name' => 'name', 'size' => 30));
-        $select_parent = new html_select(array('id' => 'file-create-parent', 'name' => 'parent'));
-        $select_type   = new html_select(array('id' => 'file-create-type', 'name' => 'type'));
-        $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
+        $input_name    = new html_inputfield('id' => 'file-create-name', 'name' => 'name', 'size' => 30);
+        $select_parent = new html_select('id' => 'file-create-parent', 'name' => 'parent');
+        $select_type   = new html_select('id' => 'file-create-type', 'name' => 'type');
+        $table         = new html_table('cols' => 2, 'class' => 'propform');
 
-        $types = array();
+        $types = ;
 
         foreach ($this->get_mimetypes('edit') as $type => $mimetype) {
             $types$type = $mimetype'ext';
@@ -612,8 +668,15 @@
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('create', 'cancel', 'filecreating', 'createfile', 'createandedit',
-            'copyfile', 'copyandedit');
+        $this->plugin->add_label(
+            'create',
+            'cancel',
+            'filecreating',
+            'createfile',
+            'createandedit',
+            'copyfile',
+            'copyandedit'
+        );
         $this->rc->output->add_gui_object('file-create-form', $attrib'id');
         $this->rc->output->set_env('file_extensions', $types);
 
@@ -625,13 +688,13 @@
      */
     public function file_search_form($attrib)
     {
-        $attrib += array(
+        $attrib += 
             'name'          => '_q',
             'gui-object'    => 'filesearchbox',
             'form-name'     => 'filesearchform',
             'command'       => 'files-search',
             'reset-command' => 'files-search-reset',
-        );
+        ;
 
         // add form tag around text field
         return $this->rc->output->search_form($attrib);
@@ -665,11 +728,10 @@
         if (empty($attrib'columns')) {
             $list_cols     = $this->rc->config->get($c_prefix . 'list_cols');
             $dont_override = $this->rc->config->get('dont_override');
-            $a_show_cols = is_array($list_cols) ? $list_cols : array('name');
+            $a_show_cols = is_array($list_cols) ? $list_cols : 'name';
             $this->rc->output->set_env($type . '_col_movable', !in_array($c_prefix . 'list_cols', (array)$dont_override));
-        }
-        else {
-            $columns     = str_replace(array("'", '"'), '', $attrib'columns');
+        } else {
+            $columns     = str_replace("'", '"', '', $attrib'columns');
             $a_show_cols = preg_split('/\s,;+/', $columns);
         }
 
@@ -692,10 +754,12 @@
         }
 
         // set default sort col/order to session
-        if (!isset($_SESSION$prefix . 'sort_col'))
+        if (!isset($_SESSION$prefix . 'sort_col')) {
             $_SESSION$prefix . 'sort_col' = $this->rc->config->get($c_prefix . 'sort_col') ?: 'name';
-        if (!isset($_SESSION$prefix . 'sort_order'))
+        }
+        if (!isset($_SESSION$prefix . 'sort_order')) {
             $_SESSION$prefix . 'sort_order' = strtoupper($this->rc->config->get($c_prefix . 'sort_order') ?: 'asc');
+        }
 
         // set client env
         $this->rc->output->add_gui_object($type . 'list', $attrib'id');
@@ -715,12 +779,15 @@
 
         $thead = '';
         foreach ($this->list_head($attrib, $a_show_cols, $type) as $cell) {
-            $thead .= html::tag('th', array('class' => $cell'className', 'id' => $cell'id'), $cell'html');
+            $thead .= html::tag('th', 'class' => $cell'className', 'id' => $cell'id', $cell'html');
         }
 
-        return html::tag('table', $attrib,
+        return html::tag(
+            'table',
+            $attrib,
             html::tag('thead', null, html::tag('tr', null, $thead)) . html::tag('tbody', null, ''),
-            array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
+            'style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'
+        );
     }
 
     /**
@@ -744,61 +811,60 @@
         $this->rc->output->set_env($prefix . 'disabled_sort_order', $disabled_order);
 
         // define sortable columns
-        if ($disabled_sort)
-            $a_sort_cols = $sort_col && !$disabled_order ? array($sort_col) : array();
-        else
+        if ($disabled_sort) {
+            $a_sort_cols = $sort_col && !$disabled_order ? $sort_col : ;
+        } else {
             $a_sort_cols = $this->{$type . '_sort_cols'};
+        }
 
         if (!empty($attrib'optionsmenuicon')) {
             $onclick = 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('menu-open', '{$type}listmenu', this, event)";
             $inner   = $this->rc->gettext('listoptions');
 
             if (is_string($attrib'optionsmenuicon') && $attrib'optionsmenuicon' != 'true') {
-                $inner = html::img(array('src' => $skin_path . $attrib'optionsmenuicon', 'alt' => $this->rc->gettext('listoptions')));
+                $inner = html::img('src' => $skin_path . $attrib'optionsmenuicon', 'alt' => $this->rc->gettext('listoptions'));
             }
 
-            $list_menu = html::a(array(
+            $list_menu = html::a(
                 'href'     => '#list-options',
                 'onclick'  => $onclick,
                 'class'    => 'listmenu',
                 'id'       => $type . 'listmenulink',
                 'title'    => $this->rc->gettext('listoptions'),
                 'tabindex' => '0',
-            ), $inner);
-        }
-        else {
+            , $inner);
+        } else {
             $list_menu = '';
         }
 
-        $cells = array();
+        $cells = ;
 
         foreach ($a_show_cols as $col) {
             // get column name
             switch ($col) {
-            case 'options':
-                $col_name = $list_menu;
-                break;
-            default:
-                $col_name = rcube::Q($this->plugin->gettext($col));
+                case 'options':
+                    $col_name = $list_menu;
+                    break;
+                default:
+                    $col_name = rcube::Q($this->plugin->gettext($col));
             }
 
             // make sort links
             if (in_array($col, $a_sort_cols)) {
-                $col_name = html::a(array(
+                $col_name = html::a(
                         'href'    => "#sort",
                         'onclick' => 'return ' . rcmail_output::JS_OBJECT_NAME . ".command('$type-sort','$col',this)",
-                        'title'   => $this->plugin->gettext('sortby')
-                    ), $col_name);
-            }
-            else if (empty($col_name) || $col_name0 != '<') {
-                $col_name = '<span class="' . $col .'">' . $col_name . '</span>';
+                        'title'   => $this->plugin->gettext('sortby'),
+                    , $col_name);
+            } elseif (empty($col_name) || $col_name0 != '<') {
+                $col_name = '<span class="' . $col . '">' . $col_name . '</span>';
             }
 
             $sort_class = $col == $sort_col && !$disabled_order ? " sorted$sort_order" : '';
-            $class_name = $col.$sort_class;
+            $class_name = $col . $sort_class;
 
             // put it all together
-            $cells = array('className' => $class_name, 'id' => "rcm$col", 'html' => $col_name);
+            $cells = 'className' => $class_name, 'id' => "rcm$col", 'html' => $col_name;
         }
 
         return $cells;
@@ -822,7 +888,7 @@
         $head        = '';
 
         foreach ($this->list_head($attrib, $a_show_cols, $type) as $cell) {
-            $head .= html::tag('th', array('class' => $cell'className', 'id' => $cell'id'), $cell'html');
+            $head .= html::tag('th', 'class' => $cell'className', 'id' => $cell'id', $cell'html');
         }
 
         $head = html::tag('tr', null, $head);
@@ -837,23 +903,23 @@
     public function file_info_box($attrib)
     {
         // print_r($this->file_data, true);
-        $table = new html_table(array('cols' => 2, 'class' => $attrib'class'));
+        $table = new html_table('cols' => 2, 'class' => $attrib'class');
 
         // file name
-        $table->add('title', $this->plugin->gettext('name').':');
+        $table->add('title', $this->plugin->gettext('name') . ':');
         $table->add('data filename', $this->file_data'name');
 
         // file type
         // @TODO: human-readable type name
-        $table->add('title', $this->plugin->gettext('type').':');
+        $table->add('title', $this->plugin->gettext('type') . ':');
         $table->add('data filetype', $this->file_data'type');
 
         // file size
-        $table->add('title', $this->plugin->gettext('size').':');
+        $table->add('title', $this->plugin->gettext('size') . ':');
         $table->add('data filesize', $this->rc->show_bytes($this->file_data'size'));
 
         // file modification time
-        $table->add('title', $this->plugin->gettext('mtime').':');
+        $table->add('title', $this->plugin->gettext('mtime') . ':');
         $table->add('data filemtime', $this->file_data'mtime');
 
         // @TODO: for images: width, height, color depth, etc.
@@ -875,15 +941,12 @@
             return $frame;
         }
 
-        if ($href = $this->file_data'viewer''href') {
+        if ($href = ($this->file_data'viewer''href' ?? null)) {
             // file href attribute must be an absolute URL (Bug #2063)
-            if (!empty($href)) {
-                if (!preg_match('|^https?://|', $href)) {
-                    $href = $this->url . '/api/' . $href;
-                }
+            if (!preg_match('|^https?://|', $href)) {
+                $href = $this->url . '/api/' . $href;
             }
-        }
-        else {
+        } else {
             $token = $this->get_api_token();
             $href  = $this->url . '/api/?method=file_get'
                 . '&file=' . urlencode($this->file_data'filename')
@@ -903,19 +966,19 @@
             $attrib'src' = 'program/resources/blank.gif';
 
             $form_content = new html_hiddenfield();
-            $form_attrib  = array(
+            $form_attrib  = 
                 'action' => $href,
                 'id'     => $attrib'id' . '-form',
                 'target' => $attrib'name',
                 'method' => 'post',
-            );
+            ;
 
             foreach ($this->file_data'viewer''post' as $name => $value) {
-                $form_content->add(array('name' => $name, 'value' => $value));
+                $form_content->add('name' => $name, 'value' => $value);
             }
 
             $form = html::tag('form', $form_attrib, $form_content->show())
-                . html::script(array(), "\$('#{$attrib'id'}-form').submit()");
+                . html::script(, "\$('#{$attrib'id'}-form').submit()");
         }
 
         return html::iframe($attrib) . $form;
@@ -937,7 +1000,7 @@
 
         // get quota
         $token   = $this->get_api_token();
-        $request = $this->get_request(array('method' => 'quota'), $token);
+        $request = $this->get_request('method' => 'quota', $token);
 
         // send request to the API
         try {
@@ -947,14 +1010,12 @@
 
             if ($status == 200 && $body'status' == 'OK') {
                 $quota = $body'result';
-            }
-            else {
+            } else {
                 throw new Exception($body'reason' ?: "Failed to get quota. Status: $status");
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, false);
-            $quota = array('total' => 0, 'percent' => 0);
+            $quota = 'total' => 0, 'percent' => 0;
         }
 
         $quota = rcube_output::json_serialize($quota);
@@ -978,14 +1039,14 @@
             }
         }
 
-        $request = $this->get_request(array('method' => 'ping'), $token);
+        $request = $this->get_request('method' => 'ping', $token);
 
         try {
             $url = $request->getUrl();
 
             // Send ping request
             if ($token) {
-                $url->setQueryVariables(array('method' => 'ping'));
+                $url->setQueryVariables('method' => 'ping');
                 $request->setUrl($url);
                 $response = $request->send();
                 $status   = $response->getStatus();
@@ -999,12 +1060,12 @@
             }
 
             // Go with authenticate request
-            $url->setQueryVariables(array('method' => 'authenticate', 'version' => self::API_VERSION));
+            $url->setQueryVariables('method' => 'authenticate', 'version' => self::API_VERSION);
             $request->setUrl($url);
             $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION'password'));
 
             // Allow plugins (e.g. kolab_sso) to modify the request
-            $this->rc->plugins->exec_hook('chwala_authenticate', array('request' => $request));
+            $this->rc->plugins->exec_hook('chwala_authenticate', 'request' => $request);
 
             $response = $request->send();
             $status   = $response->getStatus();
@@ -1017,8 +1078,7 @@
                     $_SESSION'kolab_files_time'  = time();
                     $_SESSION'kolab_files_caps'  = $body'result''capabilities';
                 }
-            }
-            else {
+            } else {
                 throw new Exception(sprintf("Authenticate error (Status: %d)", $status));
             }
 
@@ -1026,8 +1086,7 @@
             if ($configure && $token) {
                 $this->configure($token);
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, false);
         }
 
@@ -1040,7 +1099,7 @@
             $token = $this->get_api_token();
 
             if (empty($_SESSION'kolab_files_caps')) {
-                $request = $this->get_request(array('method' => 'capabilities'), $token);
+                $request = $this->get_request('method' => 'capabilities', $token);
 
                 // send request to the API
                 try {
@@ -1050,14 +1109,12 @@
 
                     if ($status == 200 && $body'status' == 'OK') {
                         $_SESSION'kolab_files_caps' = $body'result';
-                    }
-                    else {
+                    } else {
                         throw new Exception($body'reason' ?: "Failed to get capabilities. Status: $status");
                     }
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     rcube::raise_error($e, true, false);
-                    return array();
+                    return ;
                 }
             }
         }
@@ -1068,7 +1125,7 @@
         }
 
         if (!empty($_SESSION'kolab_files_caps') && !isset($_SESSION'kolab_files_caps''MOUNTPOINTS')) {
-            $_SESSION'kolab_files_caps''MOUNTPOINTS' = array();
+            $_SESSION'kolab_files_caps''MOUNTPOINTS' = ;
         }
 
         return $_SESSION'kolab_files_caps';
@@ -1082,21 +1139,19 @@
         $url = $this->url_srv . '/api/';
 
         if (empty($this->request)) {
-            $config = array(
+            $config = 
                 'store_body'       => true,
                 'follow_redirects' => true,
-            );
+            ;
 
             $this->request = libkolab::http_request($url, 'GET', $config);
-        }
-        else {
+        } else {
             // cleanup
             try {
                 $this->request->setBody('');
                 $this->request->setUrl($url);
                 $this->request->setMethod(HTTP_Request2::METHOD_GET);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 rcube::raise_error($e, true, true);
             }
         }
@@ -1128,7 +1183,7 @@
     /**
      * Configure chwala session
      */
-    public function configure($token = null, $prefs = array())
+    public function configure($token = null, $prefs = )
     {
         if (!$token) {
             $token = $this->get_api_token(false);
@@ -1136,11 +1191,11 @@
 
         try {
             // Configure session
-            $query = array(
+            $query = 
                 'method'      => 'configure',
                 'timezone'    => $prefs'timezone' ?? $this->rc->config->get('timezone'),
                 'date_format' => $prefs'date_long' ?? $this->rc->config->get('date_long', 'Y-m-d H:i'),
-            );
+            ;
 
             $request  = $this->get_request($query, $token);
             $response = $request->send();
@@ -1149,8 +1204,7 @@
             if ($status != 200) {
                 throw new Exception(sprintf("Failed to configure chwala session (Status: %d)", $status));
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, false);
         }
     }
@@ -1161,10 +1215,21 @@
     protected function action_index()
     {
         $this->plugin->add_label(
-            'uploading', 'attaching', 'uploadsizeerror',
-            'filedeleting', 'filedeletenotice', 'filedeleteconfirm',
-            'filemoving', 'filemovenotice', 'filemoveconfirm', 'filecopying', 'filecopynotice',
-            'fileskip', 'fileskipall', 'fileoverwrite', 'fileoverwriteall'
+            'uploading',
+            'attaching',
+            'uploadsizeerror',
+            'filedeleting',
+            'filedeletenotice',
+            'filedeleteconfirm',
+            'filemoving',
+            'filemovenotice',
+            'filemoveconfirm',
+            'filecopying',
+            'filecopynotice',
+            'fileskip',
+            'fileskipall',
+            'fileoverwrite',
+            'fileoverwriteall'
         );
 
         $this->folder_list_env();
@@ -1179,8 +1244,8 @@
         $this->rc->output->add_label('uploadprogress', 'GB', 'MB', 'KB', 'B');
         $this->rc->output->set_pagetitle($this->plugin->gettext('files'));
         $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
-        $this->rc->output->set_env('files_quota', $caps'QUOTA');
-        $this->rc->output->set_env('files_max_upload', $caps'MAX_UPLOAD');
+        $this->rc->output->set_env('files_quota', $caps'QUOTA' ?? null);
+        $this->rc->output->set_env('files_max_upload', $caps'MAX_UPLOAD' ?? null);
         $this->rc->output->set_env('files_progress_name', $caps'PROGRESS_NAME' ?? null);
         $this->rc->output->set_env('files_progress_time', $caps'PROGRESS_TIME' ?? null);
         $this->rc->output->send('kolab_files.files');
@@ -1192,7 +1257,8 @@
     protected function action_reset()
     {
         $this->rc->session->remove('kolab_files_caps');
-        if (($caps = $this->capabilities()) && !empty($caps)) {
+        $caps = $this->capabilities();
+        if (!empty($caps)) {
             $this->rc->output->set_env('files_caps', $caps);
         }
     }
@@ -1203,13 +1269,13 @@
     protected function action_prefs()
     {
         $dont_override = (array)$this->rc->config->get('dont_override');
-        $prefs = array();
+        $prefs = ;
         $type  = rcube_utils::get_input_value('type', rcube_utils::INPUT_POST);
-        $opts  = array(
+        $opts  = 
             'kolab_files_sort_col'   => true,
             'kolab_files_sort_order' => true,
             'kolab_files_list_cols'  => false,
-        );
+        ;
 
         foreach ($opts as $o => $sess) {
             if (isset($_POST$o)) {
@@ -1263,8 +1329,15 @@
      */
     protected function action_edit()
     {
-        $this->plugin->add_label('sessionterminating', 'unsavedchanges', 'documentinviting',
-            'documentcancelling', 'removeparticipant', 'sessionterminated', 'sessionterminatedtitle');
+        $this->plugin->add_label(
+            'sessionterminating',
+            'unsavedchanges',
+            'documentinviting',
+            'documentcancelling',
+            'removeparticipant',
+            'sessionterminated',
+            'sessionterminatedtitle'
+        );
 
         $this->file_opener(intval($_GET'_viewer'));
     }
@@ -1274,7 +1347,7 @@
      */
     protected function action_share()
     {
-        $this->rc->output->add_handler('share-form', array($this, 'folder_share_form'));
+        $this->rc->output->add_handler('share-form', $this, 'folder_share_form');
 
         $this->rc->output->send('kolab_files.share');
     }
@@ -1284,7 +1357,7 @@
      */
     protected function action_save_file()
     {
-//        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_POST);
+        //        $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_POST);
         $uid    = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
         $dest   = rcube_utils::get_input_value('dest', rcube_utils::INPUT_POST);
         $id     = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
@@ -1294,18 +1367,18 @@
         $message  = new rcube_message($uid);
         $request  = $this->get_request();
         $url      = $request->getUrl();
-        $files    = array();
-        $errors   = array();
-        $attachments = array();
+        $files    = ;
+        $errors   = ;
+        $attachments = ;
 
         $request->setMethod(HTTP_Request2::METHOD_POST);
         $request->setHeader('X-Session-Token', $this->get_api_token());
-        $url->setQueryVariables(array('method' => 'file_upload', 'folder' => $dest));
+        $url->setQueryVariables('method' => 'file_upload', 'folder' => $dest);
         $request->setUrl($url);
 
         foreach ($message->attachments as $attach_prop) {
             if (empty($id) || $id == $attach_prop->mime_id) {
-                $filename = strlen($name) ? $name : rcmail_attachment_name($attach_prop, true);
+                $filename = strlen($name) ? $name : rcmail_action_mail_index::attachment_name($attach_prop, true);
                 $attachments$filename = $attach_prop;
             }
         }
@@ -1319,13 +1392,15 @@
             // save attachment to file
             if ($fp = fopen($path, 'w+')) {
                 $message->get_part_body($attach_prop->mime_id, false, 0, $fp);
-            }
-            else {
+            } else {
                 $errors = true;
-                rcube::raise_error(array(
+                rcube::raise_error(
+                    
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "Unable to save attachment into file $path"),
-                    true, false);
+                    'message' => "Unable to save attachment into file $path",
+                    true,
+                    false
+                );
                 continue;
             }
 
@@ -1341,18 +1416,19 @@
 
                 if ($status == 200 && $body'status' == 'OK') {
                     $files = $attach_name;
-                }
-                else {
+                } else {
                     throw new Exception($body'reason' ?: "Failed to post file_upload. Status: $status");
                 }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 unlink($path);
                 $errors = $e->getMessage();
-                rcube::raise_error(array(
+                rcube::raise_error(
+                    
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                    'message' => $e->getMessage()),
-                    true, false);
+                    'message' => $e->getMessage(),
+                    true,
+                    false
+                );
                 continue;
             }
 
@@ -1362,11 +1438,11 @@
         }
 
         if ($count = count($files)) {
-            $msg = $this->plugin->gettext(array('name' => 'saveallnotice', 'vars' => array('n' => $count)));
+            $msg = $this->plugin->gettext('name' => 'saveallnotice', 'vars' => 'n' => $count);
             $this->rc->output->show_message($msg, 'confirmation');
         }
         if ($count = count($errors)) {
-            $msg = $this->plugin->gettext(array('name' => 'saveallerror', 'vars' => array('n' => $count)));
+            $msg = $this->plugin->gettext('name' => 'saveallerror', 'vars' => 'n' => $count);
             $this->rc->output->show_message($msg, 'error');
         }
 
@@ -1384,12 +1460,12 @@
         $uploadid    = rcube_utils::get_input_value('uploadid', rcube_utils::INPUT_POST);
         $COMPOSE_ID  = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
         $COMPOSE     = null;
-        $errors      = array();
-        $attachments = array();
+        $errors      = ;
+        $attachments = ;
 
         if ($this->rc->task == 'mail') {
-            if ($COMPOSE_ID && $_SESSION'compose_data_'.$COMPOSE_ID) {
-                $COMPOSE =& $_SESSION'compose_data_'.$COMPOSE_ID;
+            if ($COMPOSE_ID && $_SESSION'compose_data_' . $COMPOSE_ID) {
+                $COMPOSE = & $_SESSION'compose_data_' . $COMPOSE_ID;
             }
 
             if (!$COMPOSE) {
@@ -1398,7 +1474,7 @@
 
             // attachment upload action
             if (!is_array($COMPOSE'attachments')) {
-                $COMPOSE'attachments' = array();
+                $COMPOSE'attachments' = ;
             }
         }
 
@@ -1422,7 +1498,7 @@
 
             // get file information
             try {
-                $url->setQueryVariables(array('method' => 'file_info', 'file' => $file));
+                $url->setQueryVariables('method' => 'file_info', 'file' => $file);
                 $request->setUrl($url);
                 $response = $request->send();
                 $status   = $response->getStatus();
@@ -1430,17 +1506,18 @@
 
                 if ($status == 200 && $body'status' == 'OK') {
                     $file_params = $body'result';
-                }
-                else {
+                } else {
                     throw new Exception($body'reason' ?: "Failed to get file_info. Status: $status");
                 }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $errors = $e->getMessage();
-                rcube::raise_error(array(
+                rcube::raise_error(
+                    
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                    'message' => $e->getMessage()),
-                    true, false);
+                    'message' => $e->getMessage(),
+                    true,
+                    false
+                );
                 continue;
             }
 
@@ -1450,7 +1527,7 @@
 
             // download file
             try {
-                $url->setQueryVariables(array('method' => 'file_get', 'file' => $file));
+                $url->setQueryVariables('method' => 'file_get', 'file' => $file);
                 $request->setUrl($url);
                 $request->attach($observer);
                 $response = $request->send();
@@ -1461,23 +1538,25 @@
                 if ($status != 200 || !file_exists($path)) {
                     throw new Exception("Unable to save file");
                 }
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $errors = $e->getMessage();
-                rcube::raise_error(array(
+                rcube::raise_error(
+                    
                     'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                    'message' => $e->getMessage()),
-                    true, false);
+                    'message' => $e->getMessage(),
+                    true,
+                    false
+                );
                 continue;
             }
 
-            $attachment = array(
+            $attachment = 
                 'path'     => $path,
                 'size'     => $file_params'size',
                 'name'     => $file_params'name',
                 'mimetype' => $file_params'type',
                 'group'    => $COMPOSE_ID,
-            );
+            ;
 
             if ($this->rc->task != 'mail') {
                 $attachments = $attachment;
@@ -1488,11 +1567,9 @@
 
             if ($attachment'status' && !$attachment'abort') {
                 $this->compose_attach_success($attachment, $COMPOSE, $COMPOSE_ID, $uploadid);
-            }
-            else if ($attachment'error') {
+            } elseif ($attachment'error') {
                 $errors = $attachment'error';
-            }
-            else {
+            } else {
                 $errors = $this->plugin->gettext('attacherror');
             }
         }
@@ -1500,15 +1577,14 @@
         if (!empty($errors)) {
             $this->rc->output->command('display_message', $this->plugin->gettext('attacherror'), 'error');
             $this->rc->output->command('remove_from_attachment_list', $uploadid);
-        }
-        else if ($this->rc->task == 'calendar' || $this->rc->task == 'tasks') {
+        } elseif ($this->rc->task == 'calendar' || $this->rc->task == 'tasks') {
             // for uploads in events/tasks we'll use its standard upload handler,
             // for this we have to fake $_FILES and some other POST args
             foreach ($attachments as $attach) {
-                $_FILES'_attachments''tmp_name' = $attachment'path';
-                $_FILES'_attachments''name'     = $attachment'name';
-                $_FILES'_attachments''size'     = $attachment'size';
-                $_FILES'_attachments''type'     = $attachment'mimetype';
+                $_FILES'_attachments''tmp_name' = $attach'path';
+                $_FILES'_attachments''name'     = $attach'name';
+                $_FILES'_attachments''size'     = $attach'size';
+                $_FILES'_attachments''type'     = $attach'mimetype';
                 $_FILES'_attachments''error'    = null;
             }
 
@@ -1516,15 +1592,15 @@
             $_GET'_id'       = $COMPOSE_ID;
 
             switch ($this->rc->task) {
-            case 'tasks':
-                $handler = new kolab_attachments_handler();
-                $handler->attachment_upload(tasklist::SESSION_KEY);
-                break;
-
-            case 'calendar':
-                $handler = new kolab_attachments_handler();
-                $handler->attachment_upload(calendar::SESSION_KEY, 'cal-');
-                break;
+                case 'tasks':
+                    $handler = new kolab_attachments_handler();
+                    $handler->attachment_upload(tasklist::SESSION_KEY);
+                    break;
+
+                case 'calendar':
+                    $handler = new kolab_attachments_handler();
+                    $handler->attachment_upload(calendar::SESSION_KEY, 'cal-');
+                    break;
             }
         }
 
@@ -1535,6 +1611,10 @@
 
     protected function compose_attach_success($attachment, $COMPOSE, $COMPOSE_ID, $uploadid)
     {
+        if (empty($attachment'id')) {
+            return;
+        }
+
         $id = $attachment'id';
 
         // store new attachment in session
@@ -1542,55 +1622,55 @@
         $this->rc->session->append('compose_data_' . $COMPOSE_ID . '.attachments', $id, $attachment);
 
         if (($icon = $COMPOSE'deleteicon') && is_file($icon)) {
-            $button = html::img(array(
+            $button = html::img(
                 'src' => $icon,
-                'alt' => $this->rc->gettext('delete')
-            ));
-        }
-        else if ($COMPOSE'textbuttons') {
+                'alt' => $this->rc->gettext('delete'),
+            );
+        } elseif ($COMPOSE'textbuttons') {
             $button = rcube::Q($this->rc->gettext('delete'));
-        }
-        else {
+        } else {
             $button = '';
         }
 
         if (version_compare(version_parse(RCMAIL_VERSION), '1.3.0', '>=')) {
-            $link_content = sprintf('%s <span class="attachment-size"> (%s)</span>',
-                rcube::Q($attachment'name'), $this->rc->show_bytes($attachment'size'));
+            $link_content = sprintf(
+                '%s <span class="attachment-size"> (%s)</span>',
+                rcube::Q($attachment'name'),
+                $this->rc->show_bytes($attachment'size')
+            );
 
-            $content_link = html::a(array(
+            $content_link = html::a(
                     'href'    => "#load",
                     'class'   => 'filename',
                     'onclick' => sprintf("return %s.command('load-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
-                ), $link_content);
+                , $link_content);
 
-            $delete_link = html::a(array(
+            $delete_link = html::a(
                     'href'    => "#delete",
                     'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
                     'title'   => $this->rc->gettext('delete'),
                     'class'   => 'delete',
                     'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment'name',
-                ), $button);
+                , $button);
 
-            $content = $COMPOSE'icon_pos' == 'left' ? $delete_link.$content_link : $content_link.$delete_link;
-        }
-        else {
-            $content = html::a(array(
+            $content = $COMPOSE'icon_pos' == 'left' ? $delete_link . $content_link : $content_link . $delete_link;
+        } else {
+            $content = html::a(
                     'href'    => "#delete",
                     'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
                     'title'   => $this->rc->gettext('delete'),
                     'class'   => 'delete',
-            ), $button);
+            , $button);
 
             $content .= rcube::Q($attachment'name');
         }
 
-        $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
+        $this->rc->output->command('add2attachment_list', "rcmfile$id", 
             'html'      => $content,
             'name'      => $attachment'name',
             'mimetype'  => $attachment'mimetype',
             'classname' => rcube_utils::file2class($attachment'mimetype', $attachment'name'),
-            'complete'  => true), $uploadid);
+            'complete'  => true, $uploadid);
     }
 
     /**
@@ -1603,12 +1683,12 @@
 
         // get file info
         $token   = $this->get_api_token();
-        $request = $this->get_request(array(
+        $request = $this->get_request(
             'method'  => 'file_info',
             'file'    => $file,
             'viewer'  => $viewer,
             'session' => $session,
-            ), $token);
+            , $token);
 
         // send request to the API
         try {
@@ -1618,16 +1698,17 @@
 
             if ($status == 200 && $body'status' == 'OK') {
                 $this->file_data = $body'result';
-            }
-            else {
+            } else {
                 throw new Exception($body'reason' ?: "Failed to get file_info. Status: $status");
             }
-        }
-        catch (Exception $e) {
-            rcube::raise_error(array(
+        } catch (Exception $e) {
+            rcube::raise_error(
+                
                 'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                'message' => $e->getMessage()),
-                true, true);
+                'message' => $e->getMessage(),
+                true,
+                true
+            );
         }
 
         if ($file === null || $file === '') {
@@ -1639,10 +1720,10 @@
         $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice', 'terminate');
 
         // register template objects for dialogs (and main interface)
-        $this->rc->output->add_handlers(array(
-            'fileinfobox'      => array($this, 'file_info_box'),
-            'filepreviewframe' => array($this, 'file_preview_frame'),
-        ));
+        $this->rc->output->add_handlers(
+            'fileinfobox'      => $this, 'file_info_box',
+            'filepreviewframe' => $this, 'file_preview_frame',
+        );
 
         $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
 
@@ -1651,8 +1732,7 @@
         if (!empty($this->file_data'viewer''wopi')) {
             $editor_type = 'wopi';
             $got_editor  = ($viewer & 4);
-        }
-        else if (!empty($this->file_data'viewer''manticore')) {
+        } elseif (!empty($this->file_data'viewer''manticore')) {
             $editor_type = 'manticore';
             $got_editor = ($viewer & 4);
         }
@@ -1674,7 +1754,7 @@
      */
     protected function get_mimetypes($type = 'view')
     {
-        $mimetypes = array();
+        $mimetypes = ;
 
         // send request to the API
         try {
@@ -1683,15 +1763,14 @@
 
                 $token    = $this->get_api_token();
                 $caps     = $this->capabilities();
-                $request  = $this->get_request(array('method' => 'mimetypes'), $token);
+                $request  = $this->get_request('method' => 'mimetypes', $token);
                 $response = $request->send();
                 $status   = $response->getStatus();
                 $body     = @json_decode($response->getBody(), true);
 
                 if ($status == 200 && $body'status' == 'OK') {
                     $this->mimetypes = $body'result';
-                }
-                else {
+                } else {
                     throw new Exception($body'reason' ?: "Failed to get mimetypes. Status: $status");
                 }
             }
@@ -1701,34 +1780,35 @@
                     $mimetypes = $this->mimetypes$type;
                 }
                 // fallback to static definition if old Chwala is used
-                else if ($type == 'edit') {
-                    $mimetypes = array(
+                elseif ($type == 'edit') {
+                    $mimetypes = 
                         'text/plain' => 'txt',
                         'text/html'  => 'html',
-                    );
+                    ;
                     if (!empty($caps'MANTICORE')) {
-                        $mimetypes = array_merge(array('application/vnd.oasis.opendocument.text' => 'odt'), $mimetypes);
+                        $mimetypes = array_merge('application/vnd.oasis.opendocument.text' => 'odt', $mimetypes);
                     }
 
                     foreach (array_keys($mimetypes) as $type) {
-                        list ($app, $label) = explode('/', $type);
+                        $app, $label = explode('/', $type);
                         $label = preg_replace('/^a-z/', '', $label);
-                        $mimetypes$type = array(
+                        $mimetypes$type = 
                             'ext'   => $mimetypes$type,
                             'label' => $this->plugin->gettext('type.' . $label),
-                        );
+                        ;
                     }
-                }
-                else {
+                } else {
                     $mimetypes = $this->mimetypes;
                 }
             }
-        }
-        catch (Exception $e) {
-            rcube::raise_error(array(
+        } catch (Exception $e) {
+            rcube::raise_error(
+                
                 'code' => 500, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__,
-                'message' => $e->getMessage()),
-                true, false);
+                'message' => $e->getMessage(),
+                true,
+                false
+            );
         }
 
         return $mimetypes;
@@ -1741,7 +1821,7 @@
     {
         // first get configured sources from Chwala
         $token   = $this->get_api_token();
-        $request = $this->get_request(array('method' => 'folder_types'), $token);
+        $request = $this->get_request('method' => 'folder_types', $token);
 
         // send request to the API
         try {
@@ -1751,12 +1831,10 @@
 
             if ($status == 200 && $body'status' == 'OK') {
                 $sources = $body'result';
-            }
-            else {
+            } else {
                 throw new Exception($body'reason' ?: "Failed to get folder_types. Status: $status");
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, false);
             return;
         }
@@ -1771,7 +1849,7 @@
     {
         // first get configured sources from Chwala
         $token   = $this->get_api_token();
-        $request = $this->get_request(array('method' => 'sharing', 'folder' => $folder), $token);
+        $request = $this->get_request('method' => 'sharing', 'folder' => $folder, $token);
 
         // send request to the API
         try {
@@ -1781,15 +1859,12 @@
 
             if ($status == 200 && $body'status' == 'OK') {
                 $info = $body'result';
-            }
-            else if ($body'code' == 530) {
+            } elseif ($body'code' == 530) {
                 return false;
-            }
-            else {
+            } else {
                 throw new Exception($body'reason' ?: "Failed to get sharing form information. Status: $status");
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, false);
             return;
         }
@@ -1804,12 +1879,23 @@
     {
         // folder list and actions
         $this->plugin->add_label(
-            'folderdeleting', 'folderdeleteconfirm', 'folderdeletenotice',
-            'collection_audio', 'collection_video', 'collection_image', 'collection_document',
-            'additionalfolders', 'listpermanent', 'storageautherror'
+            'folderdeleting',
+            'folderdeleteconfirm',
+            'folderdeletenotice',
+            'collection_audio',
+            'collection_video',
+            'collection_image',
+            'collection_document',
+            'additionalfolders',
+            'listpermanent',
+            'storageautherror'
         );
-        $this->rc->output->add_label('foldersubscribing', 'foldersubscribed',
-            'folderunsubscribing', 'folderunsubscribed', 'searching'
+        $this->rc->output->add_label(
+            'foldersubscribing',
+            'foldersubscribed',
+            'folderunsubscribing',
+            'folderunsubscribed',
+            'searching'
         );
     }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_files/lib/kolab_files_observer.php Changed

@@ -13,25 +13,26 @@
         $this->file = $file;
     }
 
-    public function update(SplSubject $subject)
+    public function update(SplSubject $subject): void
     {
+        /** @var HTTP_Request2 $subject */
         $event = $subject->getLastEvent();
 
         switch ($event'name') {
-        case 'receivedHeaders':
-            if (!$this->file || !($this->fp = @fopen($this->file, 'wb'))) {
-                throw new Exception("Cannot open target file '{$this->file}'");
-            }
-            break;
+            case 'receivedHeaders':
+                if (!$this->file || !($this->fp = @fopen($this->file, 'wb'))) {
+                    throw new Exception("Cannot open target file '{$this->file}'");
+                }
+                break;
 
-        case 'receivedBodyPart':
-        case 'receivedEncodedBodyPart':
-            fwrite($this->fp, $event'data');
-            break;
+            case 'receivedBodyPart':
+            case 'receivedEncodedBodyPart':
+                fwrite($this->fp, $event'data');
+                break;
 
-        case 'receivedBody':
-            fclose($this->fp);
-            break;
+            case 'receivedBody':
+                fclose($this->fp);
+                break;
         }
     }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_files/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_files/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_folders/kolab_folders.php Changed

@@ -25,19 +25,19 @@
 {
     public $task = '?(?!login).*';
 
-    public $types      = array('mail', 'event', 'journal', 'task', 'note', 'contact', 'configuration', 'file', 'freebusy');
-    public $subtypes   = array(
-        'mail'          => array('inbox', 'drafts', 'sentitems', 'outbox', 'wastebasket', 'junkemail'),
-        'event'         => array('default'),
-        'task'          => array('default'),
-        'journal'       => array('default'),
-        'note'          => array('default'),
-        'contact'       => array('default'),
-        'configuration' => array('default'),
-        'file'          => array('default'),
-        'freebusy'      => array('default'),
-    );
-    public $act_types  = array('event', 'task');
+    public $types      = 'mail', 'event', 'journal', 'task', 'note', 'contact', 'configuration', 'file', 'freebusy';
+    public $subtypes   = 
+        'mail'          => 'inbox', 'drafts', 'sentitems', 'outbox', 'wastebasket', 'junkemail',
+        'event'         => 'default',
+        'task'          => 'default',
+        'journal'       => 'default',
+        'note'          => 'default',
+        'contact'       => 'default',
+        'configuration' => 'default',
+        'file'          => 'default',
+        'freebusy'      => 'default',
+    ;
+    public $act_types  = 'event', 'task';
 
     private $rc;
     private static $instance;
@@ -48,7 +48,7 @@
     /**
      * Plugin initialization.
      */
-    function init()
+    public function init()
     {
         self::$instance = $this;
         $this->rc = rcube::get_instance();
@@ -57,33 +57,33 @@
         $this->require_plugin('libkolab');
 
         // Folder listing hooks
-        $this->add_hook('storage_folders', array($this, 'mailboxes_list'));
+        $this->add_hook('storage_folders', $this, 'mailboxes_list');
 
         // Folder manager hooks
-        $this->add_hook('folder_form', array($this, 'folder_form'));
-        $this->add_hook('folder_update', array($this, 'folder_save'));
-        $this->add_hook('folder_create', array($this, 'folder_save'));
-        $this->add_hook('folder_delete', array($this, 'folder_save'));
-        $this->add_hook('folder_rename', array($this, 'folder_save'));
-        $this->add_hook('folders_list', array($this, 'folders_list'));
+        $this->add_hook('folder_form', $this, 'folder_form');
+        $this->add_hook('folder_update', $this, 'folder_save');
+        $this->add_hook('folder_create', $this, 'folder_save');
+        $this->add_hook('folder_delete', $this, 'folder_save');
+        $this->add_hook('folder_rename', $this, 'folder_save');
+        $this->add_hook('folders_list', $this, 'folders_list');
 
         // Special folders setting
-        $this->add_hook('preferences_save', array($this, 'prefs_save'));
+        $this->add_hook('preferences_save', $this, 'prefs_save');
 
         // ACL plugin hooks
-        $this->add_hook('acl_rights_simple', array($this, 'acl_rights_simple'));
-        $this->add_hook('acl_rights_supported', array($this, 'acl_rights_supported'));
+        $this->add_hook('acl_rights_simple', $this, 'acl_rights_simple');
+        $this->add_hook('acl_rights_supported', $this, 'acl_rights_supported');
 
         // Resolving other user folder names
-        $this->add_hook('render_mailboxlist', array($this, 'render_folderlist'));
-        $this->add_hook('render_folder_selector', array($this, 'render_folderlist'));
-        $this->add_hook('folders_list', array($this, 'render_folderlist'));
+        $this->add_hook('render_mailboxlist', $this, 'render_folderlist');
+        $this->add_hook('render_folder_selector', $this, 'render_folderlist');
+        $this->add_hook('folders_list', $this, 'render_folderlist');
     }
 
     /**
      * Handler for mailboxes_list hook. Enables type-aware lists filtering.
      */
-    function mailboxes_list($args)
+    public function mailboxes_list($args)
     {
         // infinite loop prevention
         if ($this->is_processing) {
@@ -106,7 +106,7 @@
         }
 
         // Create default folders
-        if ($args'root' == '' && $args'name' = '*') {
+        if ($args'root' == '' && $args'name' == '*') {
             $this->create_default_folders($folders, $args'filter', $folderdata, $args'mode' == 'LSUB');
         }
 
@@ -118,7 +118,7 @@
     /**
      * Handler for folders_list hook. Add css classes to folder rows.
      */
-    function folders_list($args)
+    public function folders_list($args)
     {
         if (!$this->metadata_support()) {
             return $args;
@@ -136,7 +136,7 @@
         }
 
         $skip_namespace = $this->rc->config->get('kolab_skip_namespace');
-        $skip_roots     = array();
+        $skip_roots     = ;
 
         if (!empty($skip_namespace)) {
             $storage = $this->rc->get_storage();
@@ -162,7 +162,7 @@
         if (!empty($args'table')) {
             $table = $args'table';
 
-            for ($i=1, $cnt=$table->size(); $i<=$cnt; $i++) {
+            for ($i = 1, $cnt = $table->size(); $i <= $cnt; $i++) {
                 $attrib = $table->get_row_attribs($i);
                 $folder = $attrib'foldername'; // UTF7-IMAP
                 $type   = $folderdata$folder;
@@ -199,7 +199,7 @@
      * Handler for folder info/edit form (folder_form hook).
      * Adds folder type selector.
      */
-    function folder_form($args)
+    public function folder_form($args)
     {
         if (!$this->metadata_support()) {
             return $args;
@@ -209,10 +209,10 @@
 
         // INBOX folder is of type mail.inbox and this cannot be changed
         if ($args'name' == 'INBOX') {
-            $args'form''props''fieldsets''settings''content''foldertype' = array(
+            $args'form''props''fieldsets''settings''content''foldertype' = 
                 'label' => $this->gettext('folderctype'),
                 'value' => sprintf('%s (%s)', $this->gettext('foldertypemail'), $this->gettext('inbox')),
-            );
+            ;
 
             $this->add_expire_input($args'form', 'INBOX');
 
@@ -233,7 +233,7 @@
         // Get type of the folder or the parent
         $subtype = '';
         if (strlen($mbox)) {
-            list($ctype, $subtype) = $this->get_folder_type($mbox);
+            $ctype, $subtype = $this->get_folder_type($mbox);
             if (isset($args'parent_name') && strlen($args'parent_name') && $subtype == 'default') {
                 $subtype = ''; // there can be only one
             }
@@ -250,19 +250,18 @@
             $options = $storage->folder_info($mbox);
             if ($options'namespace' != 'personal' && !in_array('a', (array)$options'rights')) {
                 if (in_array($ctype, $this->types)) {
-                    $value = $this->gettext('foldertype'.$ctype);
-                }
-                else {
+                    $value = $this->gettext('foldertype' . $ctype);
+                } else {
                     $value = $ctype;
                 }
                 if ($subtype) {
-                    $value .= ' ('. ($subtype == 'default' ? $this->gettext('default') : $subtype) .')';
+                    $value .= ' (' . ($subtype == 'default' ? $this->gettext('default') : $subtype) . ')';
                 }
 
-                $args'form''props''fieldsets''settings''content''foldertype' = array(
+                $args'form''props''fieldsets''settings''content''foldertype' = 
                     'label' => $this->gettext('folderctype'),
                     'value' => $value,
-                );
+                ;
 
                 return $args;
             }
@@ -272,23 +271,23 @@
         $this->include_script('kolab_folders.js');
 
         // build type SELECT fields
-        $type_select = new html_select(array('name' => '_ctype', 'id' => '_folderctype',
-            'onchange' => "\$('name=\"_expire\"').attr('disabled', \$(this).val() != 'mail')"
-        ));
-        $sub_select  = new html_select(array('name' => '_subtype', 'id' => '_subtype'));
+        $type_select = new html_select('name' => '_ctype', 'id' => '_folderctype',
+            'onchange' => "\$('name=\"_expire\"').attr('disabled', \$(this).val() != 'mail')",
+        );
+        $sub_select  = new html_select('name' => '_subtype', 'id' => '_subtype');
         $sub_select->add('', '');
 
         foreach ($this->types as $type) {
-            $type_select->add($this->gettext('foldertype'.$type), $type);
+            $type_select->add($this->gettext('foldertype' . $type), $type);
         }
         // add non-supported type
         if (!in_array($ctype, $this->types)) {
             $type_select->add($ctype, $ctype);
         }
 
-        $sub_types = array();
+        $sub_types = ;
         foreach ($this->subtypes as $ftype => $subtypes) {
-            $sub_types$ftype = array_combine($subtypes, array_map(array($this, 'gettext'), $subtypes));
+            $sub_types$ftype = array_combine($subtypes, array_map($this, 'gettext', $subtypes));
 
             // fill options for the current folder type
             if ($ftype == $ctype || (isset($new_ctype) && $ftype == $new_ctype)) {
@@ -296,13 +295,14 @@
             }
         }
 
-        $args'form''props''fieldsets''settings''content''folderctype' = array(
+        $args'form''props''fieldsets''settings''content''folderctype' = 
             'label' => $this->gettext('folderctype'),
-            'value' => html::div('input-group',
+            'value' => html::div(
+                'input-group',
                 $type_select->show($new_ctype ?? $ctype)
                 . $sub_select->show($new_subtype ?? $subtype)
             ),
-        );
+        ;
 
         $this->rc->output->set_env('kolab_folder_subtypes', $sub_types);
         $this->rc->output->set_env('kolab_folder_subtype', $new_subtype ?? $subtype);
@@ -315,7 +315,7 @@
     /**
      * Handler for folder update/create action (folder_update/folder_create hook).
      */
-    function folder_save($args)
+    public function folder_save($args)
     {
         // Folder actions from folders list
         if (empty($args'record')) {
@@ -352,11 +352,11 @@
             }
         }
         // Subtype sanity-checks
-        else if ($subtype && (!($subtypes = $this->subtypes$ctype) || !in_array($subtype, $subtypes))) {
+        elseif ($subtype && (!($subtypes = $this->subtypes$ctype) || !in_array($subtype, $subtypes))) {
             $subtype = '';
         }
 
-        $ctype .= $subtype ? '.'.$subtype : '';
+        $ctype .= $subtype ? '.' . $subtype : '';
 
         $storage = $this->rc->get_storage();
 
@@ -373,14 +373,13 @@
         else {
             if ($old_mbox != $mbox) {
                 $result = $storage->rename_folder($old_mbox, $mbox);
-            }
-            else {
+            } else {
                 $result = true;
             }
 
             if ($result) {
-                list($oldtype, $oldsubtype) = $this->get_folder_type($mbox);
-                $oldtype .= $oldsubtype ? '.'.$oldsubtype : '';
+                $oldtype, $oldsubtype = $this->get_folder_type($mbox);
+                $oldtype .= $oldsubtype ? '.' . $oldsubtype : '';
 
                 if ($ctype != $oldtype) {
                     $this->set_folder_type($mbox, $ctype);
@@ -393,7 +392,7 @@
             $expire = trim(rcube_utils::get_input_value('_expire', rcube_utils::INPUT_POST));
             $expire = intval($expire) && preg_match('/^mail/', $ctype) ? intval($expire) : null;
 
-            $storage->set_metadata($mbox, array($this->expire_annotation => $expire));
+            $storage->set_metadata($mbox, $this->expire_annotation => $expire);
         }
 
         $args'record''class'     = self::folder_class_name($ctype);
@@ -416,15 +415,15 @@
             return $args;
         }
 
-        $dont_override = (array) $this->rc->config->get('dont_override', array());
+        $dont_override = (array) $this->rc->config->get('dont_override', );
 
         // map config option name to kolab folder type annotation
-        $opts = array(
+        $opts = 
             'drafts_mbox' => 'mail.drafts',
             'sent_mbox'   => 'mail.sentitems',
             'junk_mbox'   => 'mail.junkemail',
             'trash_mbox'  => 'mail.wastebasket',
-        );
+        ;
 
         // check if any of special folders has been changed
         foreach ($opts as $opt_name => $type) {
@@ -442,14 +441,14 @@
         $folderdata = kolab_storage::folders_typedata();
 
         if (!is_array($folderdata)) {
-             return $args;
+            return $args;
         }
 
         foreach ($opts as $opt_name => $type) {
             $foldername = $args'prefs'$opt_name;
 
             // get all folders of specified type
-            $folders = array_intersect($folderdata, array($type));
+            $folders = array_intersect($folderdata, $type);
 
             // folder already annotated with specified type
             if (!empty($folders$foldername)) {
@@ -460,7 +459,7 @@
             $this->set_folder_type($foldername, $type);
 
             // unset old folder(s) type annotation
-            list($maintype, $subtype) = explode('.', $type);
+            $maintype, $subtype = explode('.', $type);
             foreach (array_keys($folders) as $folder) {
                 $this->set_folder_type($folder, $maintype);
             }
@@ -482,7 +481,7 @@
     public function acl_rights_simple($args)
     {
         if ($args'folder') {
-            list($type,) = $this->get_folder_type($args'folder');
+            $type,  = $this->get_folder_type($args'folder');
 
             // we're dealing with a groupware folder here...
             if ($type && $type !== 'mail') {
@@ -494,12 +493,12 @@
                     $args'rights''other' = preg_replace("/$rw_perms/", '', $args'rights''other');
 
                     // add localized labels and titles for the altered items
-                    $args'labels' = array(
-                        'other'  => $this->rc->gettext('shortacla','acl'),
-                    );
-                    $args'titles' = array(
-                        'other'  => $this->rc->gettext('longaclother','acl'),
-                    );
+                    $args'labels' = 
+                        'other'  => $this->rc->gettext('shortacla', 'acl'),
+                    ;
+                    $args'titles' = 
+                        'other'  => $this->rc->gettext('longaclother', 'acl'),
+                    ;
                 }
             }
         }
@@ -517,12 +516,12 @@
     public function acl_rights_supported($args)
     {
         if ($args'folder') {
-            list($type,) = $this->get_folder_type($args'folder');
+            $type,  = $this->get_folder_type($args'folder');
 
             // we're dealing with a groupware folder here...
             if ($type && $type !== 'mail') {
                 // remove some irrelevant (for groupware objects) rights
-                $args'rights' = str_split(preg_replace('/p/', '', join('', $args'rights')));
+                $args'rights' = str_split(preg_replace('/p/', '', implode('', $args'rights')));
             }
         }
 
@@ -534,7 +533,7 @@
      *
      * @return bool
      */
-    function metadata_support()
+    public function metadata_support()
     {
         $storage = $this->rc->get_storage();
 
@@ -550,7 +549,7 @@
      *
      * @return array Folder content-type
      */
-    function get_folder_type($folder)
+    public function get_folder_type($folder)
     {
         $type = explode('.', (string)kolab_storage::folder_type($folder));
 
@@ -569,7 +568,7 @@
      *
      * @return bool True on success
      */
-    function set_folder_type($folder, $type = 'mail')
+    public function set_folder_type($folder, $type = 'mail')
     {
         return kolab_storage::set_folder_type($folder, $type);
     }
@@ -579,9 +578,9 @@
      *
      * @param string $type Folder type
      *
-     * @return string Folder name
+     * @return ?string Folder name
      */
-    function get_default_folder($type)
+    public function get_default_folder($type)
     {
         $folderdata = kolab_storage::folders_typedata();
 
@@ -590,7 +589,7 @@
         }
 
         // get all folders of specified type
-        $folderdata = array_intersect($folderdata, array($type.'.default'));
+        $folderdata = array_intersect($folderdata, $type . '.default');
 
         return key($folderdata);
     }
@@ -602,10 +601,10 @@
      *
      * @return string Class name
      */
-    static function folder_class_name($type)
+    public static function folder_class_name($type)
     {
         if ($type && strpos($type, '.')) {
-            list($ctype, $subtype) = explode('.', $type);
+            $ctype, $subtype = explode('.', $type);
 
             return 'type-' . $ctype . ' subtype-' . $subtype;
         }
@@ -620,7 +619,7 @@
     {
         $storage     = $this->rc->get_storage();
         $namespace   = $storage->get_namespace();
-        $defaults    = array();
+        $defaults    = ;
         $prefix      = '';
 
         // Find personal namespace prefix
@@ -661,28 +660,27 @@
         // find default folders
         foreach ($defaults as $type => $foldername) {
             // get all folders of specified type
-            $_folders = array_intersect($folderdata, array($type));
+            $_folders = array_intersect($folderdata, $type);
 
             // default folder found
             if (!empty($_folders)) {
                 continue;
             }
 
-            list($type1, $type2) = explode('.', $type);
+            $type1, $type2 = explode('.', $type);
 
             $activate = in_array($type1, $this->act_types);
             $exists   = false;
             $result   = false;
+            $subscribed = false;
 
             // check if folder exists
             if (!empty($folderdata$foldername) || $foldername == 'INBOX') {
                 $exists = true;
-            }
-            else if ((!$filter || $filter == $type1) && in_array($foldername, $folders)) {
+            } elseif ((!$filter || $filter == $type1) && in_array($foldername, $folders)) {
                 // this assumes also that subscribed folder exists
                 $exists = true;
-            }
-            else {
+            } else {
                 $exists = $storage->folder_exists($foldername);
             }
 
@@ -698,14 +696,13 @@
                     if ((!$filter || $filter == $type1) && $lsub && in_array($foldername, $folders)) {
                         // already subscribed
                         $subscribed = true;
-                    }
-                    else {
+                    } else {
                         $subscribed = $storage->subscribe($foldername);
                     }
 
                     // activate folder
                     if ($activate) {
-                        kolab_storage::folder_activate($foldername, true);
+                        kolab_storage::folder_activate($foldername);
                     }
                 }
             }
@@ -766,12 +763,12 @@
             $post    = trim(rcube_utils::get_input_value('_expire', rcube_utils::INPUT_POST));
             $is_mail = empty($type) || preg_match('/^mail/i', $type);
             $label   = $this->gettext('xdays');
-            $input   = new html_inputfield(array(
+            $input   = new html_inputfield(
                     'id'       => '_kolabexpire',
                     'name'     => '_expire',
                     'size'     => 3,
-                    'disabled' => !$is_mail
-            ));
+                    'disabled' => !$is_mail,
+            );
 
             if ($post && $is_mail) {
                 $expire = (int) $post;
@@ -781,17 +778,16 @@
                 $label = str_replace('$x', '', $label);
                 $html  = $input->show($expire ?: '')
                     . html::span('input-group-append', html::span('input-group-text', rcube::Q($label)));
-            }
-            else {
+            } else {
                 $label = str_replace('$x', '', $label);
                 $html  = html::span('input-group-prepend', html::span('input-group-text', rcube::Q($label)))
                     . $input->show($expire ?: '');
             }
 
-            $form'props''fieldsets''settings''content''kolabexpire' = array(
+            $form'props''fieldsets''settings''content''kolabexpire' = 
                 'label' => $this->gettext('folderexpire'),
                 'value' => html::div('input-group', $html),
-            );
+            ;
         }
     }
 
@@ -820,8 +816,8 @@
             // folders_list hook mode
             if ($is_fl) {
                 foreach ((array) $args'list' as $folder_name => $folder) {
-                    if (strpos($folder_name, $root0) === 0 && !substr_count($folder_name, $root1, $length+1)) {
-                        if ($name = kolab_storage::folder_id2user(substr($folder_name, $length+1), true)) {
+                    if (strpos($folder_name, $root0) === 0 && !substr_count($folder_name, $root1, $length + 1)) {
+                        if ($name = kolab_storage::folder_id2user(substr($folder_name, $length + 1), true)) {
                             $old     = $args'list'$folder_name'display';
                             $content = $args'list'$folder_name'content';
 
@@ -837,8 +833,8 @@
                 // TODO: Re-sort the list
             }
             // render_* hooks mode
-            else if (!empty($args'list'$prefix) && !empty($args'list'$prefix'folders')) {
-                $map = array();
+            elseif (!empty($args'list'$prefix) && !empty($args'list'$prefix'folders')) {
+                $map = ;
                 foreach ($args'list'$prefix'folders' as $folder_name => $folder) {
                     if ($name = kolab_storage::folder_id2user($folder_name, true)) {
                         $args'list'$prefix'folders'$folder_name'name' = $name;

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/bg.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/bg_BG.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/ca_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/cs_CZ.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/da_DK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/de.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/de_CH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/de_DE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/el.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/es_AR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/es_ES.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/et_EE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/fi_FI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/fr_FR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/hr_HR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/hu_HU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/it_IT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/ja_JP.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/ko_KR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/lv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/nl_NL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/pl.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/pl_PL.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/pt_BR.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/pt_PT.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/ru_RU.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/sk_SK.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/sl_SI.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/sv.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/sv_SE.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/th_TH.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/uk_UA.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/localization/zh_CN.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_folders/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_notes/kolab_notes.php Changed

@@ -27,15 +27,17 @@
 class kolab_notes extends rcube_plugin
 {
     public $task = '?(?!login|logout).*';
-    public $allowed_prefs = array('kolab_notes_sort_col');
+    public $allowed_prefs = 'kolab_notes_sort_col';
     public $rc;
 
     private $ui;
     private $lists;
     private $folders;
-    private $cache = array();
-    private $message_notes = array();
+    private $cache = ;
+    private $message_notes = ;
+    private $note;
     private $bonnie_api = false;
+    private $search_more_results = false;
 
     /**
      * Required startup method of a Roundcube plugin
@@ -47,7 +49,7 @@
         $this->rc = rcube::get_instance();
 
         // proceed initialization in startup hook
-        $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('startup', $this, 'startup');
     }
 
     /**
@@ -67,45 +69,49 @@
 
         // load localizations
         $this->add_texts('localization/', $args'task' == 'notes' && (!$args'action' || $args'action' == 'dialog-ui'));
-        $this->rc->load_language($_SESSION'language', array('notes.notes' => $this->gettext('navtitle')));  // add label for task title
+        $this->rc->load_language($_SESSION'language', 'notes.notes' => $this->gettext('navtitle'));  // add label for task title
 
         if ($args'task' == 'notes') {
-            $this->add_hook('storage_init', array($this, 'storage_init'));
+            $this->add_hook('storage_init', $this, 'storage_init');
 
             // register task actions
-            $this->register_action('index', array($this, 'notes_view'));
-            $this->register_action('fetch', array($this, 'notes_fetch'));
-            $this->register_action('get',   array($this, 'note_record'));
-            $this->register_action('action', array($this, 'note_action'));
-            $this->register_action('list',  array($this, 'list_action'));
-            $this->register_action('dialog-ui', array($this, 'dialog_view'));
-            $this->register_action('print', array($this, 'print_note'));
-
-            if (!$this->rc->output->ajax_call && in_array($args'action', array('dialog-ui', 'list'))) {
+            $this->register_action('index', $this, 'notes_view');
+            $this->register_action('fetch', $this, 'notes_fetch');
+            $this->register_action('get', $this, 'note_record');
+            $this->register_action('action', $this, 'note_action');
+            $this->register_action('list', $this, 'list_action');
+            $this->register_action('dialog-ui', $this, 'dialog_view');
+            $this->register_action('print', $this, 'print_note');
+
+            if (!$this->rc->output->ajax_call && in_array($args'action', 'dialog-ui', 'list')) {
                 $this->load_ui();
             }
-        }
-        else if ($args'task' == 'mail') {
-            $this->add_hook('storage_init', array($this, 'storage_init'));
-            $this->add_hook('message_compose', array($this, 'mail_message_compose'));
+        } elseif ($args'task' == 'mail') {
+            $this->add_hook('storage_init', $this, 'storage_init');
+            $this->add_hook('message_compose', $this, 'mail_message_compose');
 
-            if (in_array($args'action', array('show', 'preview', 'print'))) {
-                $this->add_hook('message_load', array($this, 'mail_message_load'));
-                $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
+            if (in_array($args'action', 'show', 'preview', 'print')) {
+                $this->add_hook('message_load', $this, 'mail_message_load');
+                $this->add_hook('template_object_messagebody', $this, 'mail_messagebody_html');
             }
 
             // add 'Append note' item to message menu
             if ($this->api->output->type == 'html' && ($_REQUEST'_rel' ?? null) != 'note') {
-                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
-                    $this->api->output->button(array(
-                      'command'  => 'append-kolab-note',
-                      'label'    => 'kolab_notes.appendnote',
-                      'type'     => 'link',
-                      'classact' => 'icon appendnote active',
-                      'class'    => 'icon appendnote disabled',
-                      'innerclass' => 'icon note',
-                    ))),
-                    'messagemenu');
+                $this->api->add_content(
+                    html::tag(
+                        'li',
+                        'role' => 'menuitem',
+                        $this->api->output->button(
+                          'command'  => 'append-kolab-note',
+                          'label'    => 'kolab_notes.appendnote',
+                          'type'     => 'link',
+                          'classact' => 'icon appendnote active',
+                          'class'    => 'icon appendnote disabled',
+                          'innerclass' => 'icon note',
+                        )
+                    ),
+                    'messagemenu'
+                );
 
                 $this->api->output->add_label('kolab_notes.appendnote', 'kolab_notes.editnote', 'kolab_notes.deletenotesconfirm', 'kolab_notes.entertitle', 'save', 'delete', 'cancel', 'close');
                 $this->include_script('notes_mail.js');
@@ -150,18 +156,20 @@
     private function _read_lists($force = false)
     {
         // already read sources
-        if (isset($this->lists) && !$force)
+        if (isset($this->lists) && !$force) {
             return $this->lists;
+        }
 
         // get all folders that have type "task"
         $folders = kolab_storage::sort_folders(kolab_storage::get_folders('note'));
-        $this->lists = $this->folders = array();
+        $this->lists = $this->folders = ;
 
         // find default folder
         $default_index = 0;
         foreach ($folders as $i => $folder) {
-            if ($folder->default)
+            if ($folder->default) {
                 $default_index = $i;
+            }
         }
 
         // put default folder on top of the list
@@ -188,13 +196,13 @@
 
         // attempt to create a default folder for this user
         if (empty($this->lists)) {
-            $folder = array('name' => 'Notes', 'type' => 'note', 'default' => true, 'subscribed' => true);
+            $folder = 'name' => 'Notes', 'type' => 'note', 'default' => true, 'subscribed' => true;
             if (kolab_storage::folder_update($folder)) {
                 $this->_read_lists(true);
             }
         }
 
-        $folders = array();
+        $folders = ;
         foreach ($this->lists as $id => $list) {
             if (!empty($this->folders$id)) {
                 $folders = $this->folders$id;
@@ -208,20 +216,19 @@
 
         $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
 
-        $lists = array();
+        $lists = ;
         foreach ($folders as $folder) {
             $list_id = $folder->id;
             $imap_path = explode($delim, $folder->name);
 
             // find parent
             do {
-              array_pop($imap_path);
-              $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
-            }
-            while (count($imap_path) > 1 && !$this->folders$parent_id);
+                array_pop($imap_path);
+                $parent_id = kolab_storage::folder_id(implode($delim, $imap_path));
+            } while (count($imap_path) > 1 && empty($this->folders$parent_id));
 
             // restore "real" parent ID
-            if ($parent_id && !$this->folders$parent_id) {
+            if ($parent_id && empty($this->folders$parent_id)) {
                 $parent_id = kolab_storage::folder_id($folder->get_parent());
             }
 
@@ -230,7 +237,7 @@
 
             // special handling for virtual folders
             if ($folder instanceof kolab_storage_folder_user) {
-                $lists$list_id = array(
+                $lists$list_id = 
                     'id'       => $list_id,
                     'name'     => $fullname,
                     'listname' => $listname,
@@ -241,10 +248,9 @@
                     'group'    => 'other virtual',
                     'class'    => 'user',
                     'parent'   => $parent_id,
-                );
-            }
-            else if (!empty($folder->virtual)) {
-                $lists$list_id = array(
+                ;
+            } elseif ($folder instanceof kolab_storage_folder_virtual) {
+                $lists$list_id = 
                     'id'       => $list_id,
                     'name'     => $fullname,
                     'listname' => $listname,
@@ -253,9 +259,8 @@
                     'rights'   => 'l',
                     'group'    => $folder->get_namespace(),
                     'parent'   => $parent_id,
-                );
-            }
-            else {
+                ;
+            } else {
                 if (!$this->lists$list_id) {
                     $this->lists$list_id = $this->folder_props($folder);
                     $this->folders$list_id = $folder;
@@ -271,36 +276,38 @@
     /**
      * Search for shared or otherwise not listed folders the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
+     *
      * @return array List of notes folders
      */
     protected function search_lists($query, $source)
     {
         if (!kolab_storage::setup()) {
-            return array();
+            return ;
         }
 
         $this->search_more_results = false;
-        $this->lists = $this->folders = array();
+        $this->lists = $this->folders = ;
 
         // find unsubscribed IMAP folders that have "event" type
         if ($source == 'folders') {
-            foreach ((array)kolab_storage::search_folders('note', $query, array('other')) as $folder) {
+            foreach ((array)kolab_storage::search_folders('note', $query, 'other') as $folder) {
                 $this->folders$folder->id = $folder;
                 $this->lists$folder->id = $this->folder_props($folder);
             }
         }
         // search other user's namespace via LDAP
-        else if ($source == 'users') {
+        elseif ($source == 'users') {
             $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
-            foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
-                $folders = array();
+            foreach (kolab_storage::search_users($query, 0, , $limit * 10) as $user) {
+                $folders = ;
                 // search for note folders shared by this user
                 foreach (kolab_storage::list_user_folders($user, 'note', false) as $foldername) {
                     $folders = new kolab_storage_folder($foldername, 'note');
                 }
 
+                $count = 0;
                 if (count($folders)) {
                     $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
                     $this->folders$userfolder->id = $userfolder;
@@ -334,22 +341,22 @@
             $editable = true;
             $rights = 'lrswikxtea';
             $alarms = true;
-        }
-        else {
+        } else {
             $alarms = false;
             $rights = 'lr';
             $editable = false;
             if (($myrights = $folder->get_myrights()) && !PEAR::isError($myrights)) {
                 $rights = $myrights;
-                if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false)
+                if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
                     $editable = strpos($rights, 'i');
+                }
             }
             $info = $folder->get_folder_info();
-            $norename = $readonly || $info'norename' || $info'protected';
+            $norename = !$editable || $info'norename' || $info'protected';
         }
 
         $list_id = $folder->id;
-        return array(
+        return 
             'id' => $list_id,
             'name' => $folder->get_name(),
             'listname' => $folder->get_foldername(),
@@ -362,19 +369,20 @@
             'default'  => $folder->default,
             'group'    => $folder->default ? 'default' : $folder->get_namespace(),
             'class'    => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
-        );
+        ;
     }
 
     /**
      * Get the kolab_calendar instance for the given calendar ID
      *
-     * @param string List identifier (encoded imap folder name)
-     * @return object kolab_storage_folder Object nor null if list doesn't exist
+     * @param string $id List identifier (encoded imap folder name)
+     *
+     * @return ?kolab_storage_folder Object nor null if list doesn't exist
      */
     public function get_folder($id)
     {
         // create list and folder instance if necesary
-        if (!$this->lists$id) {
+        if (empty($this->lists$id)) {
             $folder = kolab_storage::get_folder(kolab_storage::id_decode($id));
             if ($folder->type) {
                 $this->folders$id = $folder;
@@ -382,7 +390,7 @@
             }
         }
 
-        return $this->folders$id;
+        return $this->folders$id ?? null;
     }
 
     /*******  UI functions  ********/
@@ -406,16 +414,16 @@
         // resolve message reference
         if ($msgref = rcube_utils::get_input_value('_msg', rcube_utils::INPUT_GPC, true)) {
             $storage = $this->rc->get_storage();
-            list($uid, $folder) = explode('-', $msgref, 2);
+            $uid, $folder = explode('-', $msgref, 2);
             if ($message = $storage->get_message_headers($msgref)) {
-                $this->rc->output->set_env('kolab_notes_template', array(
+                $this->rc->output->set_env('kolab_notes_template', 
                     '_from_mail' => true,
                     'title' => $message->get('subject'),
-                    'links' => array(kolab_storage_config::get_message_reference(
+                    'links' => kolab_storage_config::get_message_reference(
                         kolab_storage_config::get_message_uri($message, $folder),
                         'note'
-                    )),
-                ));
+                    ),
+                );
             }
         }
 
@@ -433,12 +441,12 @@
 
         $data = $this->notes_data($this->list_notes($list, $search), $tags);
 
-        $this->rc->output->command('plugin.data_ready', array(
+        $this->rc->output->command('plugin.data_ready', 
                 'list'   => $list,
                 'search' => $search,
                 'data'   => $data,
-                'tags'   => array_values($tags)
-        ));
+                'tags'   => array_values($tags),
+        );
     }
 
     /**
@@ -463,17 +471,17 @@
      */
     protected function list_notes($list_id, $search = null)
     {
-        $results = array();
+        $results = ;
 
         // query Kolab storage
-        $query = array();
+        $query = ;
 
         // full text search (only works with cache enabled)
         if (strlen($search)) {
             $words = array_filter(rcube_utils::normalize_string(mb_strtolower($search), true));
             foreach ($words as $word) {
                 if (strlen($word) > 2) {  // only words > 3 chars are stored in DB
-                    $query = array('words', '~', $word);
+                    $query = 'words', '~', $word;
                 }
             }
         }
@@ -511,10 +519,10 @@
      */
     public function note_record()
     {
-        $data = $this->get_note(array(
+        $data = $this->get_note(
             'uid'  => rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC),
             'list' => rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC),
-        ));
+        );
 
         // encode for client use
         if (is_array($data)) {
@@ -532,21 +540,19 @@
         if (is_array($note)) {
             $uid = $note'uid' ?: $note'id';
             $list_id = $note'list';
-        }
-        else {
+        } else {
             $uid = $note;
         }
 
         // deliver from in-memory cache
-        $key = $list_id . ':' . $uid;
-        if (!empty($this->cache$key)) {
-            return $this->cache$key;
+        if (!empty($list_id) && !empty($this->cache"$list_id:$uid")) {
+            return $this->cache"$list_id:$uid";
         }
 
         $result = false;
 
         $this->_read_lists();
-        if ($list_id) {
+        if (!empty($list_id)) {
             if ($folder = $this->get_folder($list_id)) {
                 $result = $folder->get_object($uid);
             }
@@ -582,9 +588,9 @@
             }
         }
 
-        foreach (array('created','changed') as $key) {
+        foreach ('created','changed' as $key) {
             if (is_object($note$key) && $note$key instanceof DateTime) {
-                $note$key.'_' = $note$key->format('U');
+                $note$key . '_' = $note$key->format('U');
                 $note$key = $this->rc->format_date($note$key);
             }
         }
@@ -650,17 +656,16 @@
                 if (is_array($data) && !empty($data)) {
                     $rcmail = $this->rc;
                     $dtformat = $rcmail->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
-                    array_walk($data, function(&$change) use ($lib, $rcmail, $dtformat) {
-                      if ($change'date') {
-                          $dt = rcube_utils::anytodatetime($change'date');
-                          if ($dt instanceof DateTime) {
-                              $change'date' = $rcmail->format_date($dt, $dtformat);
-                          }
-                      }
+                    array_walk($data, function (&$change) use ($rcmail, $dtformat) {
+                        if ($change'date') {
+                            $dt = rcube_utils::anytodatetime($change'date');
+                            if ($dt instanceof DateTime) {
+                                $change'date' = $rcmail->format_date($dt, $dtformat);
+                            }
+                        }
                     });
                     $this->rc->output->command('plugin.note_render_changelog', $data);
-                }
-                else {
+                } else {
                     $this->rc->output->command('plugin.note_render_changelog', false);
                 }
                 $silent = true;
@@ -671,8 +676,7 @@
                 $data = $this->get_diff($note, $note'rev1', $note'rev2');
                 if (is_array($data)) {
                     $this->rc->output->command('plugin.note_show_diff', $data);
-                }
-                else {
+                } else {
                     $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
                 }
                 break;
@@ -680,8 +684,7 @@
             case 'show':
                 if ($rec = $this->get_revison($note, $note'rev')) {
                     $this->rc->output->command('plugin.note_show_revision', $this->_client_encode($rec));
-                }
-                else {
+                } else {
                     $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
                 }
                 $silent = true;
@@ -690,10 +693,9 @@
             case 'restore':
                 if ($this->restore_revision($note, $note'rev')) {
                     $refresh = $this->get_note($note);
-                    $this->rc->output->command('display_message', $this->gettext(array('name' => 'objectrestoresuccess', 'vars' => array('rev' => $note'rev'))), 'confirmation');
+                    $this->rc->output->command('display_message', $this->gettext('name' => 'objectrestoresuccess', 'vars' => 'rev' => $note'rev'), 'confirmation');
                     $this->rc->output->command('plugin.close_history_dialog');
-                }
-                else {
+                } else {
                     $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
                 }
                 $silent = true;
@@ -703,8 +705,7 @@
         // show confirmation/error message
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
-        }
-        else if (!$silent) {
+        } elseif (!$silent) {
             $this->rc->output->show_message('errorsaving', 'error');
         }
 
@@ -719,21 +720,24 @@
     /**
      * Update an note record with the given data
      *
-     * @param array Hash array with note properties (id, list)
-     * @return boolean True on success, False on error
+     * @param array $note Hash array with note properties (id, list)
+     *
+     * @return bool True on success, False on error
      */
     private function save_note(&$note)
     {
         $this->_read_lists();
 
         $list_id = $note'list';
-        if (!$list_id || !($folder = $this->get_folder($list_id)))
+        if (!$list_id || !($folder = $this->get_folder($list_id))) {
             return false;
+        }
 
         // moved from another folder
         if (!empty($note'_fromlist') && ($fromfolder = $this->get_folder($note'_fromlist'))) {
-            if (!$fromfolder->move($note'uid', $folder->name))
+            if (!$fromfolder->move($note'uid', $folder->name)) {
                 return false;
+            }
 
             unset($note'_fromlist');
         }
@@ -742,12 +746,14 @@
         $old = null;
         if (!empty($note'uid')) {
             $old = $folder->get_object($note'uid');
-            if (!$old || PEAR::isError($old))
+            if (!$old || PEAR::isError($old)) {
                 return false;
+            }
 
             // merge existing properties if the update isn't complete
-            if (!isset($note'title') || !isset($note'description'))
+            if (!isset($note'title') || !isset($note'description')) {
                 $note += $old;
+            }
         }
 
         // generate new note object from input
@@ -763,14 +769,16 @@
         $saved = $folder->save($object, 'note', $note'uid');
 
         if (!$saved) {
-            rcube::raise_error(array(
+            rcube::raise_error(
+                
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Error saving note object to Kolab server"),
-                true, false);
+                'message' => "Error saving note object to Kolab server",
+                true,
+                false
+            );
             $saved = false;
-        }
-        else {
+        } else {
             // save links in configuration.relation object
             $this->save_links($object'uid', $links);
             // save tags in configuration.relation object
@@ -791,7 +799,7 @@
     /**
      * Move the given note to another folder
      */
-    function move_note($note, $list_id)
+    public function move_note($note, $list_id)
     {
         $this->_read_lists();
 
@@ -808,9 +816,10 @@
     /**
      * Remove a single note record from the backend
      *
-     * @param array   Hash array with note properties (id, list)
-     * @param boolean Remove record irreversible (mark as deleted otherwise)
-     * @return boolean True on success, False on error
+     * @param array $note  Hash array with note properties (id, list)
+     * @param bool  $force Remove record irreversible (mark as deleted otherwise)
+     *
+     * @return bool True on success, False on error
      */
     public function delete_note($note, $force = true)
     {
@@ -839,7 +848,7 @@
         $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
         $list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GET);
 
-        $this->note = $this->get_note(array('uid' => $uid, 'list' => $list));
+        $this->note = $this->get_note('uid' => $uid, 'list' => $list);
 
         // encode for client use
         if (is_array($this->note)) {
@@ -847,10 +856,10 @@
         }
 
         $this->rc->output->set_pagetitle($this->note'title');
-        $this->rc->output->add_handlers(array(
-                'noteheader' => array($this, 'print_note_header'),
-                'notebody'   => array($this, 'print_note_body'),
-        ));
+        $this->rc->output->add_handlers(
+                'noteheader' => $this, 'print_note_header',
+                'notebody'   => $this, 'print_note_body',
+        );
 
         $this->include_script('notes.js');
 
@@ -859,29 +868,31 @@
 
     public function print_note_header()
     {
-        $tags = array_map(array('rcube', 'Q'), (array) $this->note'tags');
+        $tags = array_map('rcube', 'Q', (array) $this->note'tags');
         $tags = implode(' ', $tags);
 
-        return html::tag('h1', array('id' => 'notetitle'), rcube::Q($this->note'title'))
-            . html::div(array('id' => 'notetags', 'class' => 'tagline'), $tags)
-            . html::div('dates',
+        return html::tag('h1', 'id' => 'notetitle', rcube::Q($this->note'title'))
+            . html::div('id' => 'notetags', 'class' => 'tagline', $tags)
+            . html::div(
+                'dates',
                 html::label(null, rcube::Q($this->gettext('created')))
-                . html::span(array('id' => 'notecreated'), rcube::Q($this->note'created'))
+                . html::span('id' => 'notecreated', rcube::Q($this->note'created'))
                 . html::label(null, rcube::Q($this->gettext('changed')))
-                . html::span(array('id' => 'notechanged'), rcube::Q($this->note'changed'))
+                . html::span('id' => 'notechanged', rcube::Q($this->note'changed'))
             );
     }
 
     public function print_note_body()
     {
-        return isset($this->note'html') ? $this->note'html' : rcube::Q($this->note'description');
+        return $this->note'html' ?? rcube::Q($this->note'description');
     }
 
     /**
      * Provide a list of revisions for the given object
      *
-     * @param array  $note Hash array with note properties
-     * @return array List of changes, each as a hash array
+     * @param array $note Hash array with note properties
+     *
+     * @return array|false List of changes, each as a hash array
      */
     public function get_changelog($note)
     {
@@ -889,7 +900,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
+        $uid, $mailbox, $msguid = $this->_resolve_note_identity($note);
 
         $result = $uid && $mailbox ? $this->bonnie_api->changelog('note', $uid, $mailbox, $msguid) : null;
         if (is_array($result) && $result'uid' == $uid) {
@@ -902,10 +913,10 @@
     /**
      * Return full data of a specific revision of a note record
      *
-     * @param mixed  $note UID string or hash array with note properties
-     * @param mixed  $rev Revision number
+     * @param mixed $note UID string or hash array with note properties
+     * @param mixed $rev Revision number
      *
-     * @return array Note object as hash array
+     * @return array|false Note object as hash array
      */
     public function get_revison($note, $rev)
     {
@@ -913,7 +924,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
+        $uid, $mailbox, $msguid = $this->_resolve_note_identity($note);
 
         // call Bonnie API
         $result = $this->bonnie_api->get('note', $uid, $rev, $mailbox, $msguid);
@@ -934,10 +945,11 @@
     /**
      * Get a list of property changes beteen two revisions of a note object
      *
-     * @param array  $$note Hash array with note properties
-     * @param mixed  $rev   Revisions: "from:to"
+     * @param array $note Hash array with note properties
+     * @param mixed $rev1   Revision: "from"
+     * @param mixed $rev2   Revision: "to"
      *
-     * @return array List of property changes, each as a hash array
+     * @return array|false List of property changes, each as a hash array
      */
     public function get_diff($note, $rev1, $rev2)
     {
@@ -945,7 +957,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
+        $uid, $mailbox, $msguid = $this->_resolve_note_identity($note);
 
         // call Bonnie API
         $result = $this->bonnie_api->diff('note', $uid, $rev1, $rev2, $mailbox, $msguid);
@@ -954,13 +966,13 @@
             $result'rev2' = $rev2;
 
             // convert some properties, similar to self::_client_encode()
-            $keymap = array(
+            $keymap = 
                 'summary'  => 'title',
                 'lastmodified-date' => 'changed',
-            );
+            ;
 
             // map kolab object properties to keys and values the client expects
-            array_walk($result'changes', function(&$change, $i) use ($keymap) {
+            array_walk($result'changes', function (&$change, $i) use ($keymap) {
                 if (array_key_exists($change'property', $keymap)) {
                     $change'property' = $keymap$change'property';
                 }
@@ -979,7 +991,7 @@
                     $change'diff_' = libkolab::html_diff($change'old', $change'new');
                     if (!empty($change'diff_')) {
                         unset($change'old', $change'new');
-                        $change'diff_' = preg_replace(array('!^.*<body^>*>!Uims','!</body>.*$!Uims'), '', $change'diff_');
+                        $change'diff_' = preg_replace('!^.*<body^>*>!Uims','!</body>.*$!Uims', '', $change'diff_');
                         $change'diff_' = preg_replace("!</(p|li|span)>\n!", '</\\1>', $change'diff_');
                     }
                 }
@@ -995,10 +1007,10 @@
      * Command the backend to restore a certain revision of a note.
      * This shall replace the current object with an older version.
      *
-     * @param array  $note Hash array with note properties (id, list)
-     * @param mixed  $rev Revision number
+     * @param array $note Hash array with note properties (id, list)
+     * @param mixed $rev  Revision number
      *
-     * @return boolean True on success, False on failure
+     * @return bool True on success, False on failure
      */
     public function restore_revision($note, $rev)
     {
@@ -1006,7 +1018,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_note_identity($note);
+        $uid, $mailbox, $msguid = $this->_resolve_note_identity($note);
 
         $folder = $this->get_folder($note'list');
         $success = false;
@@ -1021,7 +1033,7 @@
                 // delete old revision from imap and cache
                 $imap->delete_message($msguid, $folder->name);
                 $folder->cache->set($msguid, false);
-                $this->cache = array();
+                $this->cache = ;
             }
         }
 
@@ -1044,9 +1056,8 @@
         if (is_array($note)) {
             $uid = $note'uid' ?: $note'id';
             $list = $note'list';
-        }
-        else {
-            return array(null, $mailbox, $msguid);
+        } else {
+            return null, $mailbox, $msguid;
         }
 
         if ($folder = $this->get_folder($list)) {
@@ -1059,7 +1070,7 @@
             }
         }
 
-        return array($uid, $mailbox, $msguid);
+        return $uid, $mailbox, $msguid;
     }
 
 
@@ -1071,6 +1082,7 @@
         $action  = rcube_utils::get_input_value('_do', rcube_utils::INPUT_GPC);
         $list    = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC, true);
         $success = $update_cmd = false;
+        $jsenv = ;
 
         if (empty($action)) {
             $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
@@ -1090,8 +1102,7 @@
 
                 if ($folder === false) {
                     $save_error = $this->gettext(kolab_storage::$last_error);
-                }
-                else {
+                } else {
                     $success = true;
                     $update_cmd = 'plugin.update_list';
                     $list'id' = kolab_storage::folder_id($folder);
@@ -1106,8 +1117,7 @@
 
                 if ($newfolder === false) {
                     $save_error = $this->gettext(kolab_storage::$last_error);
-                }
-                else {
+                } else {
                     $success = true;
                     $update_cmd = 'plugin.update_list';
                     $list'newid' = kolab_storage::folder_id($newfolder);
@@ -1128,29 +1138,28 @@
                 if ($folder && kolab_storage::folder_delete($folder->name)) {
                     $success = true;
                     $update_cmd = 'plugin.destroy_list';
-                }
-                else {
+                } else {
                     $save_error = $this->gettext(kolab_storage::$last_error);
                 }
                 break;
 
             case 'search':
                 $this->load_ui();
-                $results = array();
+                $results = ;
                 foreach ((array)$this->search_lists(rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC), rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC)) as $id => $prop) {
                     $editname = $prop'editname';
                     unset($prop'editname');  // force full name to be displayed
 
                     // let the UI generate HTML and CSS representation for this calendar
                     $html = $this->ui->folder_list_item($id, $prop, $jsenv, true);
-                    $prop += (array)$jsenv$id;
+                    $prop += $jsenv$id ?? ; // @phpstan-ignore-line
                     $prop'editname' = $editname;
                     $prop'html' = $html;
 
                     $results = $prop;
                 }
                 // report more results available
-                if ($this->driver->search_more_results) {
+                if ($this->search_more_results) {
                     $this->rc->output->show_message('autocompletemore', 'notice');
                 }
 
@@ -1160,18 +1169,22 @@
             case 'subscribe':
                 $success = false;
                 if ($list'id' && ($folder = $this->get_folder($list'id'))) {
-                    if (isset($list'permanent'))
+                    if (isset($list'permanent')) {
                         $success |= $folder->subscribe(intval($list'permanent'));
-                    if (isset($list'active'))
+                    }
+                    if (isset($list'active')) {
                         $success |= $folder->activate(intval($list'active'));
+                    }
 
                     // apply to child folders, too
                     if ($list'recursive') {
                         foreach ((array)kolab_storage::list_folders($folder->name, '*', 'node') as $subfolder) {
-                            if (isset($list'permanent'))
+                            if (isset($list'permanent')) {
                                 ($list'permanent' ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
-                            if (isset($list'active'))
+                            }
+                            if (isset($list'active')) {
                                 ($list'active' ? kolab_storage::folder_activate($subfolder) : kolab_storage::folder_deactivate($subfolder));
+                            }
                         }
                     }
                 }
@@ -1186,9 +1199,8 @@
             if ($update_cmd) {
                 $this->rc->output->command($update_cmd, $list);
             }
-        }
-        else {
-            $error_msg = $this->gettext('errorsaving') . ($save_error ? ': ' . $save_error :'');
+        } else {
+            $error_msg = $this->gettext('errorsaving') . (!empty($save_error) ? ': ' . $save_error : '');
             $this->rc->output->show_message($error_msg, 'error');
         }
     }
@@ -1204,14 +1216,14 @@
             $list = $args'param''notes_list';
 
             foreach ($uids as $uid) {
-                if ($note = $this->get_note(array('uid' => $uid, 'list' => $list))) {
+                if ($note = $this->get_note('uid' => $uid, 'list' => $list)) {
                     $data = $this->note2message($note);
-                    $args'attachments' = array(
+                    $args'attachments' = 
                         'name'     => abbreviate_string($note'title', 50, ''),
                         'mimetype' => 'message/rfc822',
                         'data'     => $data,
                         'size'     => strlen($data),
-                    );
+                    ;
 
                     if (empty($args'param''subject')) {
                         $args'param''subject' = $note'title';
@@ -1242,12 +1254,12 @@
     {
         $html = '';
         foreach ($this->message_notes as $note) {
-            $html .= html::a(array(
-                'href' => $this->rc->url(array('task' => 'notes', '_list' => $note'list', '_id' => $note'uid')),
+            $html .= html::a(
+                'href' => $this->rc->url('task' => 'notes', '_list' => $note'list', '_id' => $note'uid'),
                 'class' => 'kolabnotesref',
                 'rel' => $note'uid' . '@' . $note'list',
                 'target' => '_blank',
-            ), rcube::Q($note'title'));
+            , rcube::Q($note'title'));
         }
 
         // prepend note links to message body
@@ -1284,10 +1296,10 @@
         $message->setParam('html_charset', RCUBE_CHARSET);
         $message->setParam('text_charset', RCUBE_CHARSET);
 
-        $message->headers(array(
+        $message->headers(
             'Subject' => $note'title',
             'Date' => $note'changed'->format('r'),
-        ));
+        );
 
         if ($this->is_html($note)) {
             $message->setHTMLBody($note'description');
@@ -1301,8 +1313,7 @@
             $plain_part = preg_replace('/\r?\n/', "\r\n", $plain_part);
 
             $message->setTXTBody($plain_part);
-        }
-        else {
+        } else {
             $message->setTXTBody($note'description');
         }
 
@@ -1331,7 +1342,7 @@
     {
         $config = kolab_storage_config::get_instance();
         $tags   = $config->get_tags($uid);
-        $tags   = array_map(function($v) { return $v'name'; }, $tags);
+        $tags   = array_map(function ($v) { return $v'name'; }, $tags);
 
         return $tags;
     }
@@ -1363,7 +1374,7 @@
     /**
      * Process the given note data (submitted by the client) before saving it
      */
-    private function _write_preprocess($note, $old = array())
+    private function _write_preprocess($note, $old = )
     {
         $object = $note;
 
@@ -1371,9 +1382,8 @@
 
         // convert link references into simple URIs
         if (array_key_exists('links', $note)) {
-            $object'links' = array_map(function($link){ return is_array($link) ? $link'uri' : strval($link); }, $note'links');
-        }
-        else {
+            $object'links' = array_map(function ($link) { return is_array($link) ? $link'uri' : strval($link); }, $note'links');
+        } else {
             if ($old) {
                 $object'links' = $old'links' ?? null;
             }
@@ -1386,7 +1396,7 @@
         // try to be smart and convert to plain-text if no real formatting is detected
         if (preg_match('!<body><(?:p|pre)>(.*)</(?:p|pre)></body>!Uims', $object'description', $m)) {
             if (!preg_match('!<(a|b|i|strong|em|p|span|div|pre|li|img)(\s+a-z|>)!im', $m1, $n)
-                || ($n1 != 'img' && !strpos($m1, '</'.$n1.'>'))
+                || ($n1 != 'img' && !strpos($m1, '</' . $n1 . '>'))
             ) {
                 // $converter = new rcube_html2text($m1, false, true, 0);
                 // $object'description' = rtrim($converter->get_text());
@@ -1397,14 +1407,15 @@
 
         // Add proper HTML header, otherwise Kontact renders it as plain text
         if ($is_html) {
-            $object'description' = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">'."\n" .
+            $object'description' = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">' . "\n" .
                 str_replace('<head>', '<head><meta name="qrichtext" content="1" />', $object'description');
         }
 
         // copy meta data (starting with _) from old object
         foreach ((array)$old as $key => $val) {
-            if (!isset($object$key) && $key0 == '_')
+            if (!isset($object$key) && $key0 == '_') {
                 $object$key = $val;
+            }
         }
 
         // make list of categories unique
@@ -1423,23 +1434,23 @@
     {
         // Add header with charset spec., washtml cannot work without that
         $html = '<html><head>'
-            . '<meta http-equiv="Content-Type" content="text/html; charset='.RCUBE_CHARSET.'" />'
+            . '<meta http-equiv="Content-Type" content="text/html; charset=' . RCUBE_CHARSET . '" />'
             . '</head><body>' . $html . '</body></html>';
 
         // clean HTML with washtml by Frederic Motte
-        $wash_opts = array(
+        $wash_opts = 
             'show_washed'   => false,
             'allow_remote'  => 1,
             'charset'       => RCUBE_CHARSET,
-            'html_elements' => array('html', 'head', 'meta', 'body', 'link'),
-            'html_attribs'  => array('rel', 'type', 'name', 'http-equiv'),
-        );
+            'html_elements' => 'html', 'head', 'meta', 'body', 'link',
+            'html_attribs'  => 'rel', 'type', 'name', 'http-equiv',
+        ;
 
         // initialize HTML washer
         $washer = new rcube_washtml($wash_opts);
 
-        $washer->add_callback('form', array($this, '_washtml_callback'));
-        $washer->add_callback('a',    array($this, '_washtml_callback'));
+        $washer->add_callback('form', $this, '_washtml_callback');
+        $washer->add_callback('a', $this, '_washtml_callback');
 
         // Remove non-UTF8 characters
         $html = rcube_charset::clean($html);
@@ -1458,26 +1469,26 @@
     public function _washtml_callback($tagname, $attrib, $content, $washtml)
     {
         switch ($tagname) {
-        case 'form':
-            $out = html::div('form', $content);
-            break;
-
-        case 'a':
-            // strip temporary link tags from plain-text markup
-            $attrib = html::parse_attrib_string($attrib);
-            if (!empty($attrib'class') && strpos($attrib'class', 'x-templink') !== false) {
-                // remove link entirely
-                if (strpos($attrib'href', html_entity_decode($content)) !== false) {
-                    $out = $content;
-                    break;
+            case 'form':
+                $out = html::div('form', $content);
+                break;
+
+            case 'a':
+                // strip temporary link tags from plain-text markup
+                $attrib = html::parse_attrib_string($attrib);
+                if (!empty($attrib'class') && strpos($attrib'class', 'x-templink') !== false) {
+                    // remove link entirely
+                    if (strpos($attrib'href', html_entity_decode($content)) !== false) {
+                        $out = $content;
+                        break;
+                    }
+                    $attrib'class' = trim(str_replace('x-templink', '', $attrib'class'));
                 }
-                $attrib'class' = trim(str_replace('x-templink', '', $attrib'class'));
-            }
-            $out = html::a($attrib, $content);
-            break;
+                $out = html::a($attrib, $content);
+                break;
 
-        default:
-            $out = '';
+            default:
+                $out = '';
         }
 
         return $out;

roundcubemail-1.5.tar.gz/plugins/kolab_notes/kolab_notes_ui.php Changed

@@ -2,11 +2,13 @@
 
 class kolab_notes_ui
 {
+    private $folder;
     private $rc;
     private $plugin;
+    private $list;
     private $ready = false;
 
-    function __construct($plugin)
+    public function __construct($plugin)
     {
         $this->plugin = $plugin;
         $this->rc = $plugin->rc;
@@ -17,18 +19,19 @@
     */
     public function init()
     {
-        if ($this->ready)  // already done
+        if ($this->ready) {  // already done
             return;
+        }
 
         // add taskbar button
-        $this->plugin->add_button(array(
+        $this->plugin->add_button(
             'command'    => 'notes',
             'class'      => 'button-notes',
             'classsel'   => 'button-notes button-selected',
             'innerclass' => 'button-inner',
             'label'      => 'kolab_notes.navtitle',
-            'type'       => 'link'
-        ), 'taskbar');
+            'type'       => 'link',
+        , 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/notes.css');
 
@@ -40,15 +43,15 @@
     */
     public function init_templates()
     {
-        $this->plugin->register_handler('plugin.notebooks', array($this, 'folders'));
+        $this->plugin->register_handler('plugin.notebooks', $this, 'folders');
         #$this->plugin->register_handler('plugin.folders_select', array($this, 'folders_select'));
-        $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
-        $this->plugin->register_handler('plugin.listing', array($this, 'listing'));
-        $this->plugin->register_handler('plugin.editform', array($this, 'editform'));
-        $this->plugin->register_handler('plugin.notetitle', array($this, 'notetitle'));
-        $this->plugin->register_handler('plugin.detailview', array($this, 'detailview'));
-        $this->plugin->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
-        $this->plugin->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
+        $this->plugin->register_handler('plugin.searchform', $this->rc->output, 'search_form');
+        $this->plugin->register_handler('plugin.listing', $this, 'listing');
+        $this->plugin->register_handler('plugin.editform', $this, 'editform');
+        $this->plugin->register_handler('plugin.notetitle', $this, 'notetitle');
+        $this->plugin->register_handler('plugin.detailview', $this, 'detailview');
+        $this->plugin->register_handler('plugin.attachments_list', $this, 'attachments_list');
+        $this->plugin->register_handler('plugin.object_changelog_table', 'libkolab', 'object_changelog_table');
 
         $this->rc->output->include_script('list.js');
         $this->rc->output->include_script('treelist.js');
@@ -56,9 +59,9 @@
         $this->plugin->api->include_script('libkolab/libkolab.js');
 
         // load config options and user prefs relevant for the UI
-        $settings = array(
+        $settings = 
             'sort_col' => $this->rc->config->get('kolab_notes_sort_col', 'changed'),
-        );
+        ;
 
         if ($list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC)) {
             $settings'selected_list' = $list;
@@ -70,12 +73,12 @@
         $this->rc->html_editor();
 
         $this->rc->output->set_env('kolab_notes_settings', $settings);
-        $this->rc->output->add_label('save','cancel','delete','close','listoptionstitle');
+        $this->rc->output->add_label('save', 'cancel', 'delete', 'close', 'listoptionstitle');
     }
 
     public function folders($attrib)
     {
-        $attrib += array('id' => 'rcmkolabnotebooks');
+        $attrib += 'id' => 'rcmkolabnotebooks';
         $is_select = ($attrib'type' ?? null) == 'select';
 
         if ($is_select) {
@@ -85,12 +88,12 @@
 
         $tree  = !$is_select ? true : null;
         $lists = $this->plugin->get_lists($tree);
-        $jsenv = array();
+        $jsenv = ;
 
+        // @phpstan-ignore-next-line
         if (is_object($tree)) {
             $html = $this->folder_tree_html($tree, $lists, $jsenv, $attrib);
-        }
-        else {
+        } else {
             $html = '';
             foreach ($lists as $prop) {
                 $id = $prop'id';
@@ -104,9 +107,10 @@
                     if ($prop'editable' || strpos($prop'rights', 'i') !== false) {
                         $select->add($prop'name', $prop'id');
                     }
-                }
-                else {
-                    $html .= html::tag('li', array('id' => 'rcmliknb' . rcube_utils::html_identifier($id), 'class' => $prop'group'),
+                } else {
+                    $html .= html::tag(
+                        'li',
+                        'id' => 'rcmliknb' . rcube_utils::html_identifier($id), 'class' => $prop'group',
                         $this->folder_list_item($id, $prop, $jsenv)
                     );
                 }
@@ -133,16 +137,22 @@
             $content = $this->folder_list_item($id, $prop, $jsenv);
 
             if (!empty($folder->children)) {
-                $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
-                    $this->folder_tree_html($folder, $data, $jsenv, $attrib));
+                $content .= html::tag(
+                    'ul',
+                    'style' => ($is_collapsed ? "display:none;" : null), // @phpstan-ignore-line
+                    $this->folder_tree_html($folder, $data, $jsenv, $attrib)
+                );
             }
 
             if (strlen($content)) {
-                $out .= html::tag('li', array(
+                $out .= html::tag(
+                    'li',
+                    
                       'id' => 'rcmliknb' . rcube_utils::html_identifier($id),
                       'class' => $prop'group' . (!empty($prop'virtual') ? ' virtual' : ''),
-                    ),
-                    $content);
+                    ,
+                    $content
+                );
             }
         }
 
@@ -159,11 +169,10 @@
             $jsenv$id = $prop;
         }
 
-        $classes = array('folder');
+        $classes = 'folder';
         if (!empty($prop'virtual')) {
             $classes = 'virtual';
-        }
-        else if (!$prop'editable') {
+        } elseif (!$prop'editable') {
             $classes = 'readonly';
         }
         if ($prop'subscribed') {
@@ -177,91 +186,101 @@
           html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET) : '');
 
         $label_id = 'nl:' . $id;
-        $attr = !empty($prop'virtual') ? array('tabindex' => '0') : array('href' => $this->rc->url(array('_list' => $id)));
-        return html::div(join(' ', $classes),
-            html::a($attr + array('class' => 'listname', 'title' => $title, 'id' => $label_id), $prop'listname' ?: $prop'name') .
-            (!empty($prop'virtual') ? '' :
-                ($checkbox ?
-                    html::tag('input', array('type' => 'checkbox', 'name' => '_list', 'value' => $id, 'checked' => $prop'active', 'aria-labelledby' => $label_id)) :
+        $attr = !empty($prop'virtual') ? 'tabindex' => '0' : 'href' => $this->rc->url('_list' => $id);
+
+        return html::div(
+            implode(' ', $classes),
+            html::a($attr + 'class' => 'listname', 'title' => $title, 'id' => $label_id, $prop'listname' ?: $prop'name') .
+            (
+                !empty($prop'virtual') ? '' :
+                (
+                    $checkbox ?
+                    html::tag('input', 'type' => 'checkbox', 'name' => '_list', 'value' => $id, 'checked' => $prop'active', 'aria-labelledby' => $label_id) :
                     ''
                 ) .
                 html::span('handle', '') .
-                html::span('actions',
-                    (empty($prop'default') ?
-                        html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') :
+                html::span(
+                    'actions',
+                    (
+                        empty($prop'default') ?
+                        html::a('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist'), ' ') :
                         ''
                     ) .
-                    (isset($prop'subscribed') ?
-                        html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('foldersubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop'subscribed' ? 'true' : 'false'), ' ') :
+                    (
+                        isset($prop'subscribed') ?
+                        html::a('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('foldersubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop'subscribed' ? 'true' : 'false', ' ') :
                         ''
                     )
                 )
             )
         );
-
-        return '';
     }
 
     public function listing($attrib)
     {
-        $attrib += array('id' => 'rcmkolabnoteslist');
+        $attrib += 'id' => 'rcmkolabnoteslist';
         $this->rc->output->add_gui_object('noteslist', $attrib'id');
         return html::tag('table', $attrib, '<tbody></tbody>', html::$common_attrib);
     }
 
     public function editform($attrib)
     {
-        $attrib += array('action' => '#', 'id' => 'rcmkolabnoteseditform');
+        $attrib += 'action' => '#', 'id' => 'rcmkolabnoteseditform';
 
-        $textarea = new html_textarea(array(
+        $textarea = new html_textarea(
                 'name'     => 'content',
                 'id'       => 'notecontent',
                 'cols'     => 60,
                 'rows'     => 20,
                 'tabindex' => 0,
                 'class'    => 'mce_editor form-control',
-        ));
+        );
 
         $this->rc->output->add_gui_object('noteseditform', $attrib'id');
 
-        return html::tag('form', $attrib, $textarea->show(), array_merge(html::$common_attrib, array('action')));
+        return html::tag('form', $attrib, $textarea->show(), array_merge(html::$common_attrib, 'action'));
     }
 
     public function detailview($attrib)
     {
-        $attrib += array('id' => 'rcmkolabnotesdetailview');
+        $attrib += 'id' => 'rcmkolabnotesdetailview';
         $this->rc->output->add_gui_object('notesdetailview', $attrib'id');
         return html::div($attrib, '');
     }
 
     public function notetitle($attrib)
     {
-        $attrib += array('id' => 'rcmkolabnotestitle');
+        $attrib += 'id' => 'rcmkolabnotestitle';
         $this->rc->output->add_gui_object('noteviewtitle', $attrib'id');
 
-        $summary = new html_inputfield(array(
+        $summary = new html_inputfield(
                 'name'     => 'summary',
                 'class'    => 'notetitle inline-edit form-control',
                 'size'     => 60,
                 'id'       => 'notetitleinput',
-                'tabindex' => 0
-        ));
+                'tabindex' => 0,
+        );
 
-        $html = html::div('form-group row',
-                html::label(array('class' => 'col-sm-2 col-form-label', 'for' => 'notetitleinput'), $this->plugin->gettext('kolab_notes.title'))
+        $html = html::div(
+            'form-group row',
+            html::label('class' => 'col-sm-2 col-form-label', 'for' => 'notetitleinput', $this->plugin->gettext('kolab_notes.title'))
                     . html::span('col-sm-10', $summary->show())
+        )
+            . html::div(
+                'form-group row',
+                html::label('class' => 'col-sm-2 col-form-label', $this->plugin->gettext('kolab_notes.tags'))
+                    . html::div('class' => 'tagline tagedit col-sm-10', '&nbsp;')
             )
-            . html::div('form-group row',
-                html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('kolab_notes.tags'))
-                    . html::div(array('class' => 'tagline tagedit col-sm-10'), '&nbsp;')
-            )
-            . html::div(array('class' => 'dates text-only', 'style' => 'display:none'),
-                html::div('form-group row',
-                    html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('created'))
+            . html::div(
+                'class' => 'dates text-only', 'style' => 'display:none',
+                html::div(
+                    'form-group row',
+                    html::label('class' => 'col-sm-2 col-form-label', $this->plugin->gettext('created'))
                     . html::span('col-sm-10', html::span('notecreated form-control-plaintext', ''))
                 )
-                . html::div('form-group row',
-                    html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('changed'))
+                . html::div(
+                    'form-group row',
+                    html::label('class' => 'col-sm-2 col-form-label', $this->plugin->gettext('changed'))
                     . html::span('col-sm-10', html::span('notechanged form-control-plaintext', ''))
                 )
             );
@@ -271,7 +290,7 @@
 
     public function attachments_list($attrib)
     {
-        $attrib += array('id' => 'rcmkolabnotesattachmentslist');
+        $attrib += 'id' => 'rcmkolabnotesattachmentslist';
         $this->rc->output->add_gui_object('notesattachmentslist', $attrib'id');
         return html::tag('ul', $attrib, '', html::$common_attrib);
     }
@@ -281,12 +300,11 @@
      */
     public function list_editform($action, $list, $folder)
     {
-        $this->action = $action;
         $this->list   = $list;
         $this->folder = is_object($folder) ? $folder->name : ''; // UTF7;
 
         $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabelnotebookform'));
-        $this->rc->output->add_handler('folderform', array($this, 'notebookform'));
+        $this->rc->output->add_handler('folderform', $this, 'notebookform');
         $this->rc->output->send('libkolab.folderform');
     }
 
@@ -296,11 +314,11 @@
     public function notebookform($attrib)
     {
         $folder_name     = $this->folder;
-        $hidden_fields = array('name' => 'oldname', 'value' => $folder_name);
+        $hidden_fields = 'name' => 'oldname', 'value' => $folder_name;
 
         $storage = $this->rc->get_storage();
         $delim   = $storage->get_hierarchy_delimiter();
-        $form   = array();
+        $form   = ;
 
         if (strlen($folder_name)) {
             $options = $storage->folder_info($folder_name);
@@ -308,41 +326,39 @@
             $path_imap = explode($delim, $folder_name);
             array_pop($path_imap);  // pop off name part
             $path_imap = implode($delim, $path_imap);
-        }
-        else {
+        } else {
             $path_imap = '';
-            $options   = array();
+            $options   = ;
         }
 
         // General tab
-        $form'properties' = array(
+        $form'properties' = 
             'name'   => $this->rc->gettext('properties'),
-            'fields' => array(),
-        );
+            'fields' => ,
+        ;
 
         // folder name (default field)
-        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'noteslist-name', 'size' => 20));
-        $form'properties''fields''name' = array(
+        $input_name = new html_inputfield('name' => 'name', 'id' => 'noteslist-name', 'size' => 20);
+        $form'properties''fields''name' = 
             'label' => $this->plugin->gettext('listname'),
-            'value' => $input_name->show($this->list'editname', array('disabled' => ($options'norename' || $options'protected'))),
+            'value' => $input_name->show($this->list'editname', 'disabled' => ($options'norename' || $options'protected')),
             'id'    => 'noteslist-name',
-        );
+        ;
 
         // prevent user from moving folder
         if (!empty($options) && ($options'norename' || $options'protected')) {
-            $hidden_fields = array('name' => 'parent', 'value' => $path_imap);
-        }
-        else {
-            $select = kolab_storage::folder_selector('note', array('name' => 'parent', 'id' => 'parent-folder'), $folder_name);
-            $form'properties''fields''path' = array(
+            $hidden_fields = 'name' => 'parent', 'value' => $path_imap;
+        } else {
+            $select = kolab_storage::folder_selector('note', 'name' => 'parent', 'id' => 'parent-folder', $folder_name);
+            $form'properties''fields''path' = 
                 'label' => $this->plugin->gettext('parentfolder'),
                 'value' => $select->show(strlen($folder_name) ? $path_imap : ''),
                 'id'    => 'parent-folder',
-            );
+            ;
         }
 
         $form_html = kolab_utils::folder_form($form, $folder_name, 'kolab_notes', $hidden_fields);
 
-        return html::tag('form', $attrib + array('action' => '#', 'method' => 'post', 'id' => 'noteslistpropform'), $form_html);
+        return html::tag('form', $attrib + 'action' => '#', 'method' => 'post', 'id' => 'noteslistpropform', $form_html);
     }
 }

roundcubemail-1.5.tar.gz/plugins/kolab_notes/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/kolab_notes/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_notes/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_sso/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/drivers/oauth2.php Changed

@@ -23,16 +23,17 @@
  */
 class kolab_sso_oauth2
 {
+    protected $error;
     protected $plugin;
     protected $id       = 'oauth2';
-    protected $config   = array();
-    protected $params   = array();
-    protected $defaults = array(
+    protected $config   = ;
+    protected $params   = ;
+    protected $defaults = 
         'scope'          => 'email',
         'token_type'     => 'access_token',
         'user_field'     => 'email',
-        'validate_items' => array('aud'),
-    );
+        'validate_items' => 'aud',
+    ;
 
 
     /**
@@ -54,13 +55,13 @@
      */
     public function authorize()
     {
-        $params = array(
+        $params = 
             'response_type' => 'code',
             'scope'         => $this->get_param('scope'),
             'client_id'     => $this->get_param('client_id'),
             'state'         => $this->plugin->rc->get_request_token(),
             'redirect_uri'  => $this->redirect_uri(),
-        );
+        ;
 
         // Add extra request parameters (don't overwrite params set above)
         if (!empty($this->config'extra_params')) {
@@ -145,7 +146,7 @@
         $validto = new DateTime($session'validto', new DateTimezone('UTC'));
 
         // Don't refresh often than TTL/2
-        $validto->sub(new DateInterval(sprintf('PT%dS', $session'ttl'/2)));
+        $validto->sub(new DateInterval(sprintf('PT%dS', $session'ttl' / 2)));
         if ($now < $validto) {
             $this->plugin->debug("{$this->id}validate Token valid, skipping refresh");
             return $session;
@@ -181,17 +182,16 @@
     {
         $mode   = $refresh_token ? 'token-refresh' : 'token';
         $url    = $this->config'token_uri' ?: ($this->config'uri' . '/token');
-        $params = array(
+        $params = 
             'client_id'     => $this->get_param('client_id'),
             'client_secret' => $this->get_param('client_secret'),
             'grant_type'    => $refresh_token ? 'refresh_token' : 'authorization_code',
-        );
+        ;
 
         if ($refresh_token) {
             $params'refresh_token' = $refresh_token;
             $params'scope'         = $this->get_param('scope');
-        }
-        else {
+        } else {
             $params'code'         = $code;
             $params'redirect_uri' = $this->redirect_uri();
         }
@@ -225,12 +225,14 @@
                 $err = $this->error_text(is_array($response) ? $response'error' : null);
                 throw new Exception("OpenIDC request failed with error: $err");
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->error = $this->plugin->gettext('errorunknown');
-            rcube::raise_error(array(
-                'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
-                true, false);
+            rcube::raise_error(
+                
+                'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage(),
+                true,
+                false
+            );
             return;
         }
 
@@ -256,13 +258,13 @@
         $validto = new DateTime(sprintf('+%d seconds', $ttl), new DateTimezone('UTC'));
         $token   = $response$this->get_param('token_type');
 
-        $result = array(
+        $result = 
             'code'          => $code,
             'access_token'  => $response'access_token',
             // 'token_type'    => $response'token_type',
             'validto'       => $validto->format(DateTime::ISO8601),
             'ttl'           => $ttl,
-        );
+        ;
 
         if (!empty($response'refresh_token')) {
             $result'refresh_token' = $response'refresh_token';
@@ -281,24 +283,25 @@
 
                     if ($keyid = openssl_pkey_get_public($pubkey)) {
                         $key = $keyid;
-                    }
-                    else {
+                    } else {
                         throw new Exception("Failed to extract public key. " . openssl_error_string());
                     }
                 }
 
-                $jwt = new Firebase\JWT\JWT;
+                $jwt = new Firebase\JWT\JWT();
                 $jwt::$leeway = 60;
 
                 $payload = $jwt->decode($token, $key, array_keys(Firebase\JWT\JWT::$supported_algs));
 
                 $result'email' = $this->validate_token_payload($payload);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $this->error = $this->plugin->gettext('errorinvalidtoken');
-                rcube::raise_error(array(
-                    'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
-                    true, false);
+                rcube::raise_error(
+                    
+                    'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage(),
+                    true,
+                    false
+                );
                 return;
             }
         }
@@ -322,11 +325,11 @@
             // More extended token validation
             // https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
             switch (strtolower($item_name)) {
-            case 'aud':
-                if (!in_array($this->get_param('client_id'), (array) $payload->aud)) {
-                    throw new Exception("Token audience does not match");
-                }
-                break;
+                case 'aud':
+                    if (!in_array($this->get_param('client_id'), (array) $payload->aud)) {
+                        throw new Exception("Token audience does not match");
+                    }
+                    break;
             }
         }
 
@@ -343,7 +346,7 @@
         // and define a redirect in http server, example for Apache:
         // RewriteRule "^sso" "/roundcubemail/?_task=login&_action=sso" L,QSA
 
-        $redirect_params = empty($this->config'response_uri') ? array('_action' => 'sso') : array();
+        $redirect_params = empty($this->config'response_uri') ? '_action' => 'sso' : ;
 
         $url = $this->plugin->rc->url($redirect_params, false, true);
 
@@ -359,7 +362,7 @@
      */
     protected function get_request($url, $type)
     {
-        $config = array_intersect_key($this->config, array_flip(array(
+        $config = array_intersect_key($this->config, array_flip(
                 'ssl_verify_peer',
                 'ssl_verify_host',
                 'ssl_cafile',
@@ -367,7 +370,7 @@
                 'ssl_local_cert',
                 'ssl_passphrase',
                 'follow_redirects',
-        )));
+        ));
 
         return libkolab::http_request($url, $type, $config);
     }
@@ -383,9 +386,9 @@
 
         $msg = $this->error_text($error);
 
-        rcube::raise_error(array(
-            'message' => "SSO $msg." . ($description ? " $description" : '') . ($uri ? " ($uri)" : '')
-            ), true, false);
+        rcube::raise_error(
+            'message' => "SSO $msg." . ($description ? " $description" : '') . ($uri ? " ($uri)" : ''),
+            , true, false);
 
         $label = 'error' . str_replace('_', '', $error);
         if (!$this->plugin->rc->text_exists($label, 'kolab_sso')) {
@@ -401,26 +404,26 @@
     protected function error_text($error)
     {
         switch ($error) {
-        case 'invalid_request':
-            return "Request malformed";
-        case 'unauthorized_client':
-            return "The client is not authorized";
-        case 'invalid_client':
-            return "Client authentication failed";
-        case 'access_denied':
-            return "Request denied";
-        case 'unsupported_response_type':
-            return "Unsupported response type";
-        case 'invalid_grant':
-            return "Invalid authorization grant";
-        case 'unsupported_grant_type':
-            return "Unsupported authorization grant";
-        case 'invalid_scope':
-            return "Invalid scope";
-        case 'server_error':
-            return "Server error";
-        case 'temporarily_unavailable':
-            return "Service temporarily unavailable";
+            case 'invalid_request':
+                return "Request malformed";
+            case 'unauthorized_client':
+                return "The client is not authorized";
+            case 'invalid_client':
+                return "Client authentication failed";
+            case 'access_denied':
+                return "Request denied";
+            case 'unsupported_response_type':
+                return "Unsupported response type";
+            case 'invalid_grant':
+                return "Invalid authorization grant";
+            case 'unsupported_grant_type':
+                return "Unsupported authorization grant";
+            case 'invalid_scope':
+                return "Invalid scope";
+            case 'server_error':
+                return "Server error";
+            case 'temporarily_unavailable':
+                return "Service temporarily unavailable";
         }
 
         return "Unknown error";

roundcubemail-1.5.tar.gz/plugins/kolab_sso/drivers/openidc.php Changed

@@ -29,10 +29,10 @@
 class kolab_sso_openidc extends kolab_sso_oauth2
 {
     protected $id     = 'openidc';
-    protected $params = array(
+    protected $params = 
         'scope'      => 'openid email offline_access',
         'token_type' => 'id_token',
-    );
+    ;
 
     /**
      * Returns error text for specified OpenIDC error code
@@ -41,24 +41,24 @@
     {
         // OpenIDC-specific codes
         switch ($error) {
-        case 'interaction_required':
-            return "End-User interaction required";
-        case 'login_required':
-            return "End-User authentication required";
-        case 'account_selection_required':
-            return "End-User account selection required";
-        case 'consent_required':
-            return "End-User consent required";
-        case 'invalid_request_uri':
-            return "Invalid request_uri";
-        case 'invalid_request_object':
-            return "Invalid Request Object";
-        case 'request_not_supported':
-            return "Request not supported";
-        case 'request_uri_not_supported':
-            return "request_uri param not supported";
-        case 'registration_not_supported':
-            return "Registration not supported";
+            case 'interaction_required':
+                return "End-User interaction required";
+            case 'login_required':
+                return "End-User authentication required";
+            case 'account_selection_required':
+                return "End-User account selection required";
+            case 'consent_required':
+                return "End-User consent required";
+            case 'invalid_request_uri':
+                return "Invalid request_uri";
+            case 'invalid_request_object':
+                return "Invalid Request Object";
+            case 'request_not_supported':
+                return "Request not supported";
+            case 'request_uri_not_supported':
+                return "request_uri param not supported";
+            case 'registration_not_supported':
+                return "Registration not supported";
         }
 
         // Fallback to OAuth2-specific codes

roundcubemail-1.5.tar.gz/plugins/kolab_sso/drivers/seas.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/kolab_sso.php Changed

@@ -40,10 +40,10 @@
         if (defined('RCMAIL_VERSION') || defined('FILE_API_START')) {
             $this->rc = rcube::get_instance();
 
-            $this->add_hook('startup', array($this, 'startup'));
-            $this->add_hook('authenticate', array($this, 'authenticate'));
+            $this->add_hook('startup', $this, 'startup');
+            $this->add_hook('authenticate', $this, 'authenticate');
 
-            $this->rc->add_shutdown_function(array($this, 'shutdown'));
+            $this->rc->add_shutdown_function($this, 'shutdown');
         }
     }
 
@@ -68,13 +68,12 @@
                         $this->data'timezone' = $_SESSION'sso_timezone';
                         $this->data'url'      = $_SESSION'sso_url';
                         $this->data'mode'     = $mode;
-                    }
-                    else {
+                    } else {
                         $this->logon_error = $driver->response_error();
                     }
                 }
                 // This is where we handle clicking one of "Login by SSO" buttons
-                else if ($_SESSION'temp' && $this->rc->check_request()) {
+                elseif ($_SESSION'temp' && $this->rc->check_request()) {
                     // Remember some logon params for use on SSO response above
                     $_SESSION'sso_timezone' = rcube_utils::get_input_value('_timezone', rcube_utils::INPUT_POST);
                     $_SESSION'sso_url'      = rcube_utils::get_input_value('_url', rcube_utils::INPUT_POST);
@@ -88,7 +87,7 @@
             }
         }
         // On valid session...
-        else if (isset($_SESSION'user_id')
+        elseif (isset($_SESSION'user_id')
             && ($data = $_SESSION'sso_data')
             && ($data = json_decode($this->rc->decrypt($data), true))
             && ($mode = $data'mode')
@@ -100,9 +99,8 @@
             // Session validation, token refresh, etc.
             if ($this->data = $driver->validate_session($data)) {
                 // register storage connection hooks
-                $this->authenticate(array(), true);
-            }
-            else {
+                $this->authenticate(, true);
+            } else {
                 // Destroy the session
                 $this->rc->kill_session();
                 // TODO: error message beter explaining the reason
@@ -111,7 +109,7 @@
         }
 
         // Register login form modifications
-        $this->add_hook('template_object_loginform', array($this, 'login_form'));
+        $this->add_hook('template_object_loginform', $this, 'login_form');
 
         return $args;
     }
@@ -124,7 +122,7 @@
         // Chwala
         if (defined('FILE_API_START') && !$internal && empty($args'pass') && strpos($args'user', 'RC:') === 0) {
             // extract session ID and username from the token
-            list(, $sess_id, $user) = explode(':', $args'user');
+            , $sess_id, $user = explode(':', $args'user');
 
             // unset user, set invalid state
             $args'valid' = false;
@@ -149,13 +147,13 @@
                         $args'user'  = $user;
                         $args'pass'  = 'fake-sso-password';
                         $args'valid' = true;
-                        $this->authenticate(array(), true);
+                        $this->authenticate(, true);
                     }
                 }
             }
         }
         // Roundcube
-        else if (!empty($this->data) && ($email = $this->data'email')) {
+        elseif (!empty($this->data) && ($email = $this->data'email')) {
             if (!$internal) {
                 $args'user'        = $email;
                 $args'pass'        = 'fake-sso-password';
@@ -166,13 +164,12 @@
                 $_POST'_url'      = $this->data'url';
             }
 
-            $this->add_hook('storage_connect', array($this, 'storage_connect'));
-            $this->add_hook('managesieve_connect', array($this, 'storage_connect'));
-            $this->add_hook('smtp_connect', array($this, 'smtp_connect'));
-            $this->add_hook('ldap_connected', array($this, 'ldap_connected'));
-            $this->add_hook('chwala_authenticate', array($this, 'chwala_authenticate'));
-        }
-        else if ($this->logon_error) {
+            $this->add_hook('storage_connect', $this, 'storage_connect');
+            $this->add_hook('managesieve_connect', $this, 'storage_connect');
+            $this->add_hook('smtp_connect', $this, 'smtp_connect');
+            $this->add_hook('ldap_connected', $this, 'ldap_connected');
+            $this->add_hook('chwala_authenticate', $this, 'chwala_authenticate');
+        } elseif ($this->logon_error) {
             $args'valid' = false;
             $args'error' = $this->logon_error;
         }
@@ -217,7 +214,7 @@
      */
     public function smtp_connect($args)
     {
-        foreach (array('smtp_server', 'smtp_user', 'smtp_pass') as $prop) {
+        foreach ('smtp_server', 'smtp_user', 'smtp_pass' as $prop) {
             $args$prop = $this->rc->config->get("kolab_sso_$prop", $args$prop);
         }
 
@@ -290,19 +287,19 @@
         }
 
         // Add SSO form elements
-        $form = $doc->createNode('p', null, array('id' => 'sso-form', 'class' => 'formbuttons'), $body);
+        $form = $doc->createNode('p', null, 'id' => 'sso-form', 'class' => 'formbuttons', $body);
 
         foreach ($options as $idx => $option) {
-            $label = array('name' => 'loginby', 'vars' => array('provider' => $option'name' ?: $this->gettext('sso')));
-            $doc->createNode('button', $this->gettext($label), array(
+            $label = 'name' => 'loginby', 'vars' => 'provider' => $option'name' ?: $this->gettext('sso');
+            $doc->createNode('button', $this->gettext($label), 
                     'type'    => 'button',
                     'value'   => $idx,
                     'class'   => 'button sso w-100 mb-1',
                     'onclick' => 'kolab_sso_submit(this)',
-                ), $form);
+                , $form);
         }
 
-        $doc->createNode('input', null, array('name' => '_sso', 'type' => 'hidden'), $form);
+        $doc->createNode('input', null, 'name' => '_sso', 'type' => 'hidden', $form);
 
         // Save the form content back and append script
         $args'content' = $doc->saveHTML($body)
@@ -345,10 +342,10 @@
         $class   = "kolab_sso_$driver";
 
         if (empty($options) || !file_exists($this->home . "/drivers/$driver.php")) {
-            rcube::raise_error(array(
+            rcube::raise_error(
                     'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "Unable to find SSO driver"
-                ), true, true);
+                    'message' => "Unable to find SSO driver",
+                , true, true);
         }
 
         // Add /lib to include_path
@@ -380,7 +377,7 @@
         return preg_replace('|</?body>|', '', parent::saveHTML($node));
     }
 
-    public function createNode($name, $value = null, $args = array(), $parent = null, $prepend = false)
+    public function createNode($name, $value = null, $args = , $parent = null, $prepend = false)
     {
         $node = parent::createElement($name);
 
@@ -395,8 +392,7 @@
         if ($parent) {
             if ($prepend && $parent->firstChild) {
                 $parent->insertBefore($node, $parent->firstChild);
-            }
-            else {
+            } else {
                 $parent->appendChild($node);
             }
         }

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib/Firebase/JWT/BeforeValidException.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib/Firebase/JWT/ExpiredException.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib/Firebase/JWT/JWT.php Changed

@@ -1,10 +1,11 @@
 <?php
 
 namespace Firebase\JWT;
-use \DomainException;
-use \InvalidArgumentException;
-use \UnexpectedValueException;
-use \DateTime;
+
+use DomainException;
+use InvalidArgumentException;
+use UnexpectedValueException;
+use DateTime;
 
 /**
  * JSON Web Token implementation, based on this spec:
@@ -21,7 +22,6 @@
  */
 class JWT
 {
-
     /**
      * When checking nbf, iat or expiration times,
      * we want to provide some extra leeway time to
@@ -37,14 +37,14 @@
      */
     public static $timestamp = null;
 
-    public static $supported_algs = array(
-        'HS256' => array('hash_hmac', 'SHA256'),
-        'HS512' => array('hash_hmac', 'SHA512'),
-        'HS384' => array('hash_hmac', 'SHA384'),
-        'RS256' => array('openssl', 'SHA256'),
-        'RS384' => array('openssl', 'SHA384'),
-        'RS512' => array('openssl', 'SHA512'),
-    );
+    public static $supported_algs = 
+        'HS256' => 'hash_hmac', 'SHA256',
+        'HS512' => 'hash_hmac', 'SHA512',
+        'HS384' => 'hash_hmac', 'SHA384',
+        'RS256' => 'openssl', 'SHA256',
+        'RS384' => 'openssl', 'SHA384',
+        'RS512' => 'openssl', 'SHA512',
+    ;
 
     /**
      * Decodes a JWT string into a PHP object.
@@ -66,7 +66,7 @@
      * @uses jsonDecode
      * @uses urlsafeB64Decode
      */
-    public static function decode($jwt, $key, array $allowed_algs = array())
+    public static function decode($jwt, $key, array $allowed_algs = )
     {
         $timestamp = is_null(static::$timestamp) ? time() : static::$timestamp;
 
@@ -77,7 +77,7 @@
         if (count($tks) != 3) {
             throw new UnexpectedValueException('Wrong number of segments');
         }
-        list($headb64, $bodyb64, $cryptob64) = $tks;
+        $headb64, $bodyb64, $cryptob64 = $tks;
         if (null === ($header = static::jsonDecode(static::urlsafeB64Decode($headb64)))) {
             throw new UnexpectedValueException('Invalid header encoding');
         }
@@ -155,14 +155,14 @@
      */
     public static function encode($payload, $key, $alg = 'HS256', $keyId = null, $head = null)
     {
-        $header = array('typ' => 'JWT', 'alg' => $alg);
+        $header = 'typ' => 'JWT', 'alg' => $alg;
         if ($keyId !== null) {
             $header'kid' = $keyId;
         }
-        if ( isset($head) && is_array($head) ) {
+        if (isset($head) && is_array($head)) {
             $header = array_merge($head, $header);
         }
-        $segments = array();
+        $segments = ;
         $segments = static::urlsafeB64Encode(static::jsonEncode($header));
         $segments = static::urlsafeB64Encode(static::jsonEncode($payload));
         $signing_input = implode('.', $segments);
@@ -190,7 +190,9 @@
         if (empty(static::$supported_algs$alg)) {
             throw new DomainException('Algorithm not supported');
         }
-        list($function, $algorithm) = static::$supported_algs$alg;
+
+        $function, $algorithm = static::$supported_algs$alg;
+
         switch($function) {
             case 'hash_hmac':
                 return hash_hmac($algorithm, $msg, $key, true);
@@ -203,6 +205,8 @@
                     return $signature;
                 }
         }
+
+        throw new DomainException("Invalid algorithm");
     }
 
     /**
@@ -224,7 +228,7 @@
             throw new DomainException('Algorithm not supported');
         }
 
-        list($function, $algorithm) = static::$supported_algs$alg;
+        $function, $algorithm = static::$supported_algs$alg;
         switch($function) {
             case 'openssl':
                 $success = openssl_verify($msg, $signature, $key, $algorithm);
@@ -278,7 +282,7 @@
              *them to strings) before decoding, hence the preg_replace() call.
              */
             $max_int_length = strlen((string) PHP_INT_MAX) - 1;
-            $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $input);
+            $json_without_bigints = preg_replace('/:\s*(-?\d{' . $max_int_length . ',})/', ': "$1"', $input);
             $obj = json_decode($json_without_bigints);
         }
 
@@ -348,24 +352,23 @@
      */
     private static function handleJsonError($errno)
     {
-        $messages = array(
+        $messages = 
             JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
             JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON',
             JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
             JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters' //PHP >= 5.3.3
-        );
+            JSON_ERROR_UTF8 => 'Malformed UTF-8 characters', //PHP >= 5.3.3
+        ;
         throw new DomainException(
-            isset($messages$errno)
-            ? $messages$errno
-            : 'Unknown JSON error: ' . $errno
+            $messages$errno
+            ?? 'Unknown JSON error: ' . $errno
         );
     }
 
     /**
      * Get the number of bytes in cryptographic strings.
      *
-     * @param string
+     * @param string $str
      *
      * @return int
      */

roundcubemail-1.5.tar.gz/plugins/kolab_sso/lib/Firebase/JWT/SignatureInvalidException.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_sso/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_sso/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_tags/kolab_tags.php Changed

@@ -29,6 +29,8 @@
 
     private $engine;
     private $mail_headers_done = false;
+    private $current_tags;
+    private $current_filter;
 
 
     public function init()
@@ -36,17 +38,17 @@
         $this->rc = rcube::get_instance();
 
         // Register hooks to display tags in message subject
-        $this->add_hook('messages_list', array($this, 'messages_list'));
-        $this->add_hook('message_headers_output', array($this, 'message_headers_output'));
+        $this->add_hook('messages_list', $this, 'messages_list');
+        $this->add_hook('message_headers_output', $this, 'message_headers_output');
 
         // Searching by tags
-        $this->add_hook('imap_search_before', array($this, 'imap_search_before'));
+        $this->add_hook('imap_search_before', $this, 'imap_search_before');
 
         // Plugin actions for tag management
-        $this->register_action('plugin.kolab_tags', array($this, 'actions'));
+        $this->register_action('plugin.kolab_tags', $this, 'actions');
 
         // Load UI from startup hook
-        $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('startup', $this, 'startup');
     }
 
     /**
@@ -60,7 +62,7 @@
                 return $this->engine = false;
             }
 
-//            $this->load_config();
+            //            $this->load_config();
 
             require_once $this->home . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'kolab_tags_engine.php';

roundcubemail-1.5.tar.gz/plugins/kolab_tags/lib/kolab_tags_backend.php Changed

@@ -23,10 +23,10 @@
 
 class kolab_tags_backend
 {
-    private $tag_cols = array('name', 'category', 'color', 'parent', 'iconName', 'priority', 'members');
+    private $tag_cols = 'name', 'category', 'color', 'parent', 'iconName', 'priority', 'members';
 
-    const O_TYPE     = 'relation';
-    const O_CATEGORY = 'tag';
+    public const O_TYPE     = 'relation';
+    public const O_CATEGORY = 'tag';
 
 
     /**
@@ -36,12 +36,12 @@
      *
      * @return array List of tags
      */
-    public function list_tags($filter = array())
+    public function list_tags($filter = )
     {
         $config   = kolab_storage_config::get_instance();
         $default  = true;
-        $filter = array('type', '=', self::O_TYPE);
-        $filter = array('category', '=', self::O_CATEGORY);
+        $filter = 'type', '=', self::O_TYPE;
+        $filter = 'category', '=', self::O_CATEGORY;
 
         // for performance reasons assume there will be no more than 100 tags (per-folder)
 
@@ -77,7 +77,7 @@
     public function update($tag)
     {
         // get tag object data, we need _mailbox
-        $list    = $this->list_tags(array(array('uid', '=', $tag'uid')));
+        $list    = $this->list_tags('uid', '=', $tag'uid');
         $old_tag = $list0;
 
         if (!$old_tag) {
@@ -89,7 +89,7 @@
         $tag    = array_merge($old_tag, $tag);
 
         // Update the object
-        $result = $config->save($tag, self::O_TYPE, $tag'uid');
+        $result = $config->save($tag, self::O_TYPE);
 
         return $result ? $tag : false;
     }

roundcubemail-1.5.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php Changed

@@ -26,6 +26,7 @@
     private $backend;
     private $plugin;
     private $rc;
+    private $taglist;
 
     /**
      * Class constructor
@@ -36,7 +37,7 @@
 
         require_once $plugin->home . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'kolab_tags_backend.php';
 
-        $this->backend = new kolab_tags_backend;
+        $this->backend = new kolab_tags_backend();
         $this->plugin  = $plugin;
         $this->rc      = $plugin->rc;
     }
@@ -46,22 +47,35 @@
      */
     public function ui()
     {
-        if ($this->rc->action && !in_array($this->rc->action, array('show', 'preview', 'dialog-ui'))) {
+        if ($this->rc->action && !in_array($this->rc->action, 'show', 'preview', 'dialog-ui')) {
             return;
         }
 
         $this->plugin->add_texts('localization/');
 
-        $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
+        $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/style.css');
         $this->plugin->include_script('kolab_tags.js');
         $this->rc->output->add_label('cancel', 'save');
-        $this->plugin->add_label('tags', 'add', 'edit', 'delete', 'saving',
-            'nameempty', 'nameexists', 'colorinvalid', 'untag', 'tagname',
-            'tagcolor', 'tagsearchnew', 'newtag', 'notags');
+        $this->plugin->add_label(
+            'tags',
+            'add',
+            'edit',
+            'delete',
+            'saving',
+            'nameempty',
+            'nameexists',
+            'colorinvalid',
+            'untag',
+            'tagname',
+            'tagcolor',
+            'tagsearchnew',
+            'newtag',
+            'notags'
+        );
 
-        $this->rc->output->add_handlers(array(
-            'plugin.taglist' => array($this, 'taglist'),
-        ));
+        $this->rc->output->add_handlers(
+            'plugin.taglist' => $this, 'taglist',
+        );
 
         $ui = $this->rc->output->parse('kolab_tags.ui', false, false);
         $this->rc->output->add_footer($ui);
@@ -93,14 +107,13 @@
             $delete   = (array) rcube_utils::get_input_value('delete', rcube_utils::INPUT_POST);
             $update   = (array) rcube_utils::get_input_value('update', rcube_utils::INPUT_POST, true);
             $add      = (array) rcube_utils::get_input_value('add', rcube_utils::INPUT_POST, true);
-            $response = array();
+            $response = ;
 
             // tags deletion
             foreach ($delete as $uid) {
                 if ($this->backend->remove($uid)) {
                     $response'delete' = $uid;
-                }
-                else {
+                } else {
                     $error = true;
                 }
             }
@@ -109,8 +122,7 @@
             foreach ($add as $tag) {
                 if ($tag = $this->backend->create($tag)) {
                     $response'add' = $this->parse_tag($tag);
-                }
-                else {
+                } else {
                     $error = true;
                 }
             }
@@ -119,16 +131,14 @@
             foreach ($update as $tag) {
                 if ($this->backend->update($tag)) {
                     $response'update' = $this->parse_tag($tag);
-                }
-                else {
+                } else {
                     $error = true;
                 }
             }
 
             if (!empty($error)) {
                 $this->rc->output->show_message($this->plugin->gettext('updateerror'), 'error');
-            }
-            else {
+            } else {
                 $this->rc->output->show_message($this->plugin->gettext('updatesuccess'), 'confirmation');
             }
 
@@ -145,21 +155,20 @@
     public function action_remove()
     {
         $tag     = rcube_utils::get_input_value('_tag', rcube_utils::INPUT_POST);
-        $filter  = $tag == '*' ? array() : array(array('uid', '=', explode(',', $tag)));
+        $filter  = $tag == '*' ?  : 'uid', '=', explode(',', $tag);
         $taglist = $this->backend->list_tags($filter);
-        $filter  = array();
-        $tags    = array();
+        $filter  = ;
+        $tags    = ;
 
         foreach (rcmail::get_uids() as $mbox => $uids) {
             if ($uids === '*') {
-                $filter$mbox = $this->build_member_url(array('folder' => $mbox));
-            }
-            else {
+                $filter$mbox = $this->build_member_url('folder' => $mbox);
+            } else {
                 foreach ((array)$uids as $uid) {
-                    $filter$mbox = $this->build_member_url(array(
+                    $filter$mbox = $this->build_member_url(
                             'folder' => $mbox,
-                            'uid'    => $uid
-                    ));
+                            'uid'    => $uid,
+                    );
                 }
             }
         }
@@ -202,15 +211,14 @@
             $tags = $tag'uid';
         }
 
-        if ($error) {
+        if (!empty($error)) {
             if ($_POST'_from' != 'show') {
                 $this->rc->output->show_message($this->plugin->gettext('untaggingerror'), 'error');
                 $this->rc->output->command('list_mailbox');
             }
-        }
-        else {
+        } else {
             $this->rc->output->show_message($this->plugin->gettext('untaggingsuccess'), 'confirmation');
-            $this->rc->output->command('plugin.kolab_tags', array('mark' => 1, 'delete' => $tags));
+            $this->rc->output->command('plugin.kolab_tags', 'mark' => 1, 'delete' => $tags);
         }
     }
 
@@ -221,7 +229,7 @@
     {
         $tag     = rcube_utils::get_input_value('_tag', rcube_utils::INPUT_POST);
         $storage = $this->rc->get_storage();
-        $members = array();
+        $members = ;
 
         // build list of members
         foreach (rcmail::get_uids() as $mbox => $uids) {
@@ -229,8 +237,7 @@
                 $index = $storage->index($mbox, null, null, true);
                 $uids  = $index->get();
                 $msgs  = $storage->fetch_headers($mbox, $uids, false);
-            }
-            else {
+            } else {
                 $msgs = $storage->fetch_headers($mbox, $uids, false);
             }
 
@@ -239,17 +246,17 @@
 
         // create a new tag?
         if (!empty($_POST'_new')) {
-            $object = array(
+            $object = 
                 'name'    => $tag,
                 'members' => $members,
-            );
+            ;
 
             $object = $this->backend->create($object);
             $error  = $object === false;
         }
         // use existing tags (by UID)
         else {
-            $filter  = array(array('uid', '=', explode(',', $tag)));
+            $filter  = 'uid', '=', explode(',', $tag);
             $taglist = $this->backend->list_tags($filter);
 
             // for every tag...
@@ -263,18 +270,17 @@
             }
         }
 
-        if ($error) {
+        if (!empty($error)) {
             $this->rc->output->show_message($this->plugin->gettext('taggingerror'), 'error');
 
             if ($_POST'_from' != 'show') {
                 $this->rc->output->command('list_mailbox');
             }
-        }
-        else {
+        } else {
             $this->rc->output->show_message($this->plugin->gettext('taggingsuccess'), 'confirmation');
 
             if (isset($object)) {
-                $this->rc->output->command('plugin.kolab_tags', array('mark' => 1, 'add' => array($this->parse_tag($object))));
+                $this->rc->output->command('plugin.kolab_tags', 'mark' => 1, 'add' => $this->parse_tag($object));
             }
         }
     }
@@ -285,10 +291,10 @@
     public function action_refresh()
     {
         $taglist = $this->backend->list_tags();
-        $taglist = array_map(array($this, 'parse_tag'), $taglist);
+        $taglist = array_map($this, 'parse_tag', $taglist);
 
         $this->rc->output->set_env('tags', $taglist);
-        $this->rc->output->command('plugin.kolab_tags', array('refresh' => 1));
+        $this->rc->output->command('plugin.kolab_tags', 'refresh' => 1);
     }
 
     /**
@@ -303,7 +309,7 @@
             $this->taglist = $taglist;
         }
 
-        $taglist = array_map(array($this, 'parse_tag'), $taglist);
+        $taglist = array_map($this, 'parse_tag', $taglist);
 
         $this->rc->output->set_env('tags', $taglist);
         $this->rc->output->add_gui_object('taglist', $attrib'id');
@@ -324,6 +330,7 @@
         $taglist = $this->backend->list_tags();
 
         // get message UIDs
+        $message_tags = ;
         foreach ($args'messages' as $msg) {
             $message_tags$msg->uid . '-' . $msg->folder = null;
         }
@@ -334,7 +341,7 @@
             $tag = $this->parse_tag($tag, true);
 
             foreach ((array) $tag'uids' as $folder => $_uids) {
-                array_walk($_uids, function(&$uid, $key, $folder) { $uid .= '-' . $folder; }, $folder);
+                array_walk($_uids, function (&$uid, $key, $folder) { $uid .= '-' . $folder; }, $folder);
 
                 foreach (array_intersect($uids, $_uids) as $uid) {
                     $message_tags$uid = $tag'uid';
@@ -357,7 +364,7 @@
         $taglist = $this->taglist ?: $this->backend->list_tags();
         $uid     = $args'uid';
         $folder  = $args'folder';
-        $tags    = array();
+        $tags    = ;
 
         foreach ($taglist as $tag) {
             $tag = $this->parse_tag($tag, true, false);
@@ -388,7 +395,7 @@
         $orig_folder = $storage->get_folder();
 
         // get tags
-        $tags = $this->backend->list_tags(array(array('uid', '=', $args'search_tags')));
+        $tags = $this->backend->list_tags('uid', '=', $args'search_tags');
 
         // sanity check (that should not happen)
         if (empty($tags)) {
@@ -399,7 +406,7 @@
             return $args;
         }
 
-        $search  = array();
+        $search  = ;
         $folders = (array) $args'folder';
 
         // collect folders and uids
@@ -417,20 +424,19 @@
         }
 
         $search   = array_map('array_unique', $search);
-        $criteria = array();
+        $criteria = ;
 
         // modify search folders/criteria
         $args'folder' = array_intersect($folders, array_keys($search));
 
         foreach ($args'folder' as $folder) {
-            $criteria$folder = ($args'search' != 'ALL' ? trim($args'search').' ' : '')
+            $criteria$folder = ($args'search' != 'ALL' ? trim($args'search') . ' ' : '')
                 . 'UID ' . rcube_imap_generic::compressMessageSet($search$folder);
         }
 
         if (!empty($args'folder')) {
             $args'search' = $criteria;
-        }
-        else {
+        } else {
             // return empty result
             empty_result:
 
@@ -440,8 +446,7 @@
                     $index = new rcube_result_index($folder, '* SORT');
                     $args'result'->add($index);
                 }
-            }
-            else {
+            } else {
                 $class  = 'rcube_result_' . ($args'threading' ? 'thread' : 'index');
                 $result = $args'threading' ? '* THREAD' : '* SORT';
 
@@ -461,10 +466,10 @@
      */
     protected function search_filter_mods()
     {
-       if (!empty($_REQUEST'_search') && !empty($_SESSION'search')
-            && $_SESSION'search_request' == $_REQUEST'_search'
-            && ($filter = $_SESSION'search_filter')
-       ) {
+        if (!empty($_REQUEST'_search') && !empty($_SESSION'search')
+             && $_SESSION'search_request' == $_REQUEST'_search'
+             && ($filter = $_SESSION'search_filter')
+        ) {
             if (preg_match('/^(kolab_tags_0-9{10,}:(^:+):)/', $filter, $m)) {
                 $search_tags   = explode(',', $m2);
                 $search_filter = substr($filter, strlen($m1));
@@ -481,11 +486,11 @@
      */
     private function parse_tag($tag, $list = false, $force = true)
     {
-        $result = array(
+        $result = 
             'uid'   => $tag'uid',
             'name'  => $tag'name',
             'color' => $tag'color' ?? null,
-        );
+        ;
 
         if ($list) {
             $result'uids' = $this->get_tag_messages($tag, $force);
@@ -529,7 +534,7 @@
     /**
      * Builds member URI
      *
-     * @param array Message folder, UID, Search headers (Message-Id, Date)
+     * @param array $params Message folder, UID, Search headers (Message-Id, Date)
      *
      * @return string $url Member URI
      */

roundcubemail-1.5.tar.gz/plugins/kolab_tags/tests Deleted

roundcubemail-1.5.tar.gz/plugins/kolab_tags/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -30,33 +30,36 @@
     protected $sender;
     protected $domain;
     protected $itip_send = false;
-    protected $rsvp_actions = array('accepted','tentative','declined','delegated');
-    protected $rsvp_status  = array('accepted','tentative','declined','delegated');
+    protected $rsvp_actions = 'accepted','tentative','declined','delegated';
+    protected $rsvp_status  = 'accepted','tentative','declined','delegated';
 
-    function __construct($plugin, $domain = 'libcalendaring')
+    public function __construct($plugin, $domain = 'libcalendaring')
     {
         $this->plugin = $plugin;
         $this->rc = rcube::get_instance();
         $this->lib = libcalendaring::get_instance();
         $this->domain = $domain;
 
-        $hook = $this->rc->plugins->exec_hook('calendar_load_itip',
-            array('identity' => $this->rc->user->list_emails(true)));
+        $hook = $this->rc->plugins->exec_hook(
+            'calendar_load_itip',
+            'identity' => $this->rc->user->list_emails(true)
+        );
         $this->sender = $hook'identity';
 
-        $this->plugin->add_hook('smtp_connect', array($this, 'smtp_connect_hook'));
+        $this->plugin->add_hook('smtp_connect', $this, 'smtp_connect_hook');
     }
 
     public function set_sender_email($email)
     {
-        if (!empty($email))
+        if (!empty($email)) {
             $this->sender'email' = $email;
+        }
     }
 
     public function set_rsvp_actions($actions)
     {
         $this->rsvp_actions = (array)$actions;
-        $this->rsvp_status = array_merge($this->rsvp_actions, array('delegated'));
+        $this->rsvp_status = array_merge($this->rsvp_actions, 'delegated');
     }
 
     public function set_rsvp_status($status)
@@ -83,14 +86,15 @@
     /**
      * Send an iTip mail message
      *
-     * @param array   Event object to send
-     * @param string  iTip method (REQUEST|REPLY|CANCEL)
-     * @param array   Hash array with recipient data (name, email)
-     * @param string  Mail subject
-     * @param string  Mail body text label
-     * @param object  Mail_mime object with message data
-     * @param boolean Request RSVP
-     * @return boolean True on success, false on failure
+     * @param array     $event     Event object to send
+     * @param string    $method    iTip method (REQUEST|REPLY|CANCEL)
+     * @param array     $recipient Hash array with recipient data (name, email)
+     * @param string    $subject   Mail subject
+     * @param string    $bodytext  Mail body text label
+     * @param Mail_mime $message   An object with message data
+     * @param bool      $rsvp      Request RSVP
+     *
+     * @return bool True on success, false on failure
      */
     public function send_itip_message($event, $method, $recipient, $subject, $bodytext, $message = null, $rsvp = true)
     {
@@ -107,16 +111,16 @@
 
         $headers = $message->headers();
         $headers'To' = format_email_recipient($mailto, $recipient'name');
-        $headers'Subject' = $this->gettext(array(
+        $headers'Subject' = $this->gettext(
             'name' => $subject,
-            'vars' => array(
+            'vars' => 
                 'title' => $event'title',
                 'name' => $this->sender'name',
-            )
-        ));
+            ,
+        );
 
         // compose a list of all event attendees
-        $attendees_list = array();
+        $attendees_list = ;
         foreach ((array)$event'attendees' as $attendee) {
             $attendees_list = (!empty($attendee'name') && !empty($attendee'email')) ?
                 $attendee'name' . ' <' . $attendee'email' . '>' :
@@ -127,22 +131,21 @@
         if (!empty($event'recurrence_id')) {
             $msg = $this->gettext(!empty($event'thisandfuture') ? 'itipmessagefutureoccurrence' : 'itipmessagesingleoccurrence');
             $recurrence_info = "\n\n** $msg **";
-        }
-        else if (!empty($event'recurrence')) {
+        } elseif (!empty($event'recurrence')) {
             $recurrence_info = sprintf("\n%s: %s", $this->gettext('recurring'), $this->lib->recurrence_text($event'recurrence'));
         }
 
-        $mailbody = $this->gettext(array(
+        $mailbody = $this->gettext(
             'name' => $bodytext,
-            'vars' => array(
+            'vars' => 
                 'title'       => $event'title',
                 'date'        => $this->lib->event_date_text($event) . $recurrence_info,
-                'attendees'   => join(",\n ", $attendees_list),
+                'attendees'   => implode(",\n ", $attendees_list),
                 'sender'      => $this->sender'name',
                 'organizer'   => $this->sender'name',
-                'description' => isset($event'description') ? $event'description' : '',
-            )
-        ));
+                'description' => $event'description' ?? '',
+            ,
+        );
 
         // remove redundant empty lines (e.g. when an event description is empty)
         $mailbody = preg_replace('/\n{3,}/', "\n\n", $mailbody);
@@ -156,12 +159,11 @@
             && $this->rc->config->get('calendar_itip_smtp_server')
             && ($token = $this->store_invitation($event, $recipient'email'))
         ) {
-            $mailbody .= "\n\n" . $this->gettext(array(
+            $mailbody .= "\n\n" . $this->gettext(
                 'name' => 'invitationattendlinks',
-                'vars' => array('url' => $this->plugin->get_url(array('action' => 'attend', 't' => $token))),
-            ));
-        }
-        else if ($method == 'CANCEL' && $event'cancelled') {
+                'vars' => 'url' => $this->plugin->get_url('action' => 'attend', 't' => $token),
+            );
+        } elseif ($method == 'CANCEL' && $event'cancelled') {
             $this->cancel_itip_invitation($event);
         }
 
@@ -174,6 +176,7 @@
 
         // finally send the message
         $this->itip_send = true;
+        $smtp_error = null;
         $sent = $this->rc->deliver_message($message, $headers'X-Sender', $mailto, $smtp_error);
         $this->itip_send = false;
 
@@ -188,7 +191,7 @@
     {
         // replace smtp auth settings if we're not in an authenticated session
         if ($this->itip_send && !$this->rc->user->ID) {
-            foreach (array('smtp_server', 'smtp_user', 'smtp_pass') as $prop) {
+            foreach ('smtp_server', 'smtp_user', 'smtp_pass' as $prop) {
                 $p$prop = $this->rc->config->get("calendar_itip_$prop", $p$prop);
             }
         }
@@ -197,12 +200,13 @@
     }
 
     /**
-     * Helper function to build a Mail_mime object to send an iTip message
+     * Helper function to build a Mail_mime object to send an iTip message.
+     *
+     * @param array  $event  Event object to send
+     * @param string $method iTip method (REQUEST|REPLY|CANCEL)
+     * @param bool   $rsvp   Request RSVP
      *
-     * @param array   Event object to send
-     * @param string  iTip method (REQUEST|REPLY|CANCEL)
-     * @param boolean Request RSVP
-     * @return object Mail_mime object with message data
+     * @return Mail_mime An object with message data
      */
     public function compose_itip_message($event, $method, $rsvp = true)
     {
@@ -214,24 +218,23 @@
         // constraints for a METHOD:REPLY according to RFC 5546
         if ($method == 'REPLY') {
             $replying_attendee = null;
-            $reply_attendees = array();
+            $reply_attendees = ;
             foreach ($event'attendees' as $attendee) {
                 if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
                     $reply_attendees = $attendee;
                 }
                 // we accept on behalf of a resource
-                else if (isset($event'_resource') && strcasecmp($attendee'email', $event'_resource') == 0) {
+                elseif (isset($event'_resource') && strcasecmp($attendee'email', $event'_resource') == 0) {
                     $replying_attendee = $attendee;
                     $replying_attendee'sent-by' = 'mailto:' . $from_utf;
-                }
-                else if (strcasecmp($attendee'email', $from) == 0 || strcasecmp($attendee'email', $from_utf) == 0) {
+                } elseif (strcasecmp($attendee'email', $from) == 0 || strcasecmp($attendee'email', $from_utf) == 0) {
                     $replying_attendee = $attendee;
                     if ($attendee'status' != 'DELEGATED') {
                         unset($replying_attendee'rsvp');  // unset the RSVP attribute
                     }
                 }
                 // include attendees relevant for delegation (RFC 5546, Section 4.2.5)
-                else if ((!empty($attendee'delegated-to') &&
+                elseif ((!empty($attendee'delegated-to') &&
                             (strcasecmp($attendee'delegated-to', $from) == 0 || strcasecmp($attendee'delegated-to', $from_utf) == 0)) ||
                          (!empty($attendee'delegated-from') &&
                             (strcasecmp($attendee'delegated-from', $from) == 0 || strcasecmp($attendee'delegated-from', $from_utf) == 0))) {
@@ -247,7 +250,7 @@
             }
         }
         // set RSVP for every attendee
-        else if ($method == 'REQUEST') {
+        elseif ($method == 'REQUEST') {
             foreach ($event'attendees' as $i => $attendee) {
                 if (
                     ($rsvp || !isset($attendee'rsvp'))
@@ -256,11 +259,10 @@
                         && $attendee'role' != 'NON-PARTICIPANT'
                     )
                 ) {
-                    $event'attendees'$i'rsvp'= (bool) $rsvp;
+                    $event'attendees'$i'rsvp' = (bool) $rsvp;
                 }
             }
-        }
-        else if ($method == 'CANCEL') {
+        } elseif ($method == 'CANCEL') {
             if (!empty($event'recurrence')) {
                 unset($event'recurrence''EXCEPTIONS');
             }
@@ -290,12 +292,12 @@
         $message->setContentType('multipart/alternative');
 
         // compose common headers array
-        $headers = array(
+        $headers = 
             'From' => $sender,
             'Date' => $this->rc->user_date(),
             'Message-ID' => $this->rc->gen_message_id(),
             'X-Sender' => $from,
-        );
+        ;
         if ($agent = $this->rc->config->get('useragent')) {
             $headers'User-Agent' = $agent;
         }
@@ -304,7 +306,7 @@
 
         // attach ics file for this event
         $ical = libcalendaring::get_ical();
-        $ics = $ical->export(array($event), $method, false, $method == 'REQUEST' && $this->plugin->driver ? array($this->plugin->driver, 'get_attachment_body') : false);
+        $ics = $ical->export($event, $method, false, $method == 'REQUEST' && $this->plugin->driver ? $this->plugin->driver, 'get_attachment_body' : false);
         $filename = !empty($event'_type') && $event'_type' == 'task' ? 'todo.ics' : 'event.ics';
         $message->addAttachment($ics, 'text/calendar', $filename, false, '8bit', '', RCUBE_CHARSET . "; method=" . $method);
 
@@ -314,13 +316,14 @@
     /**
      * Forward the given iTip event as delegation to another person
      *
-     * @param array Event object to delegate
-     * @param mixed Delegatee as string or hash array with keys 'name' and 'mailto'
-     * @param boolean The delegator's RSVP flag
-     * @param array List with indexes of new/updated attendees
-     * @return boolean True on success, False on failure
+     * @param array $event     Event object to delegate
+     * @param mixed $delegate  Delegatee as string or hash array with keys 'name' and 'mailto'
+     * @param bool  $rsvp      The delegator's RSVP flag
+     * @param array $attendees List with indexes of new/updated attendees
+     *
+     * @return bool True on success, False on failure
      */
-    public function delegate_to(&$event, $delegate, $rsvp = false, &$attendees = array())
+    public function delegate_to(&$event, $delegate, $rsvp = false, &$attendees = )
     {
         if (is_string($delegate)) {
             $delegates = rcube_mime::decode_address_list($delegate, 1, false);
@@ -333,31 +336,31 @@
         $me     = $this->rc->user->list_emails(true);
 
         // find/create the delegate attendee
-        $delegate_attendee = array(
+        $delegate_attendee = 
             'email' => $delegate'mailto',
             'name'  => $delegate'name',
             'role'  => 'REQ-PARTICIPANT',
-        );
+        ;
         $delegate_index = count($event'attendees');
 
         foreach ($event'attendees' as $i => $attendee) {
-          // set myself the DELEGATED-TO parameter
-          if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
-              $event'attendees'$i'delegated-to' = $delegate'mailto';
-              $event'attendees'$i'status' = 'DELEGATED';
-              $event'attendees'$i'role' = 'NON-PARTICIPANT';
-              $event'attendees'$i'rsvp' = $rsvp;
-
-              $me'email' = $attendee'email';
-              $delegate_attendee'role' = $attendee'role';
-          }
-          // the disired delegatee is already listed as an attendee
-          else if (stripos($delegate'mailto', $attendee'email') !== false && $attendee'role' != 'ORGANIZER') {
-              $delegate_attendee = $attendee;
-              $delegate_index = $i;
-              break;
-          }
-          // TODO: remove previous delegatee (i.e. attendee that has DELEGATED-FROM == $me)
+            // set myself the DELEGATED-TO parameter
+            if ($attendee'email' && in_array(strtolower($attendee'email'), $emails)) {
+                $event'attendees'$i'delegated-to' = $delegate'mailto';
+                $event'attendees'$i'status' = 'DELEGATED';
+                $event'attendees'$i'role' = 'NON-PARTICIPANT';
+                $event'attendees'$i'rsvp' = $rsvp;
+
+                $me'email' = $attendee'email';
+                $delegate_attendee'role' = $attendee'role';
+            }
+            // the disired delegatee is already listed as an attendee
+            elseif (stripos($delegate'mailto', $attendee'email') !== false && $attendee'role' != 'ORGANIZER') {
+                $delegate_attendee = $attendee;
+                $delegate_index = $i;
+                break;
+            }
+            // TODO: remove previous delegatee (i.e. attendee that has DELEGATED-FROM == $me)
         }
 
         // set/add delegate attendee with RSVP=TRUE and DELEGATED-FROM parameter
@@ -383,7 +386,7 @@
         $html   = '';
 
         if (is_numeric($event'changed')) {
-            $event'changed' = new DateTime('@'.$event'changed');
+            $event'changed' = new DateTime('@' . $event'changed');
         }
 
         // check if the given itip object matches the last state
@@ -406,8 +409,7 @@
                         break;
                     }
                 }
-            }
-            else {
+            } else {
                 $rsvp = $event'rsvp' && $this->rc->config->get('calendar_allow_itip_uninvited', true);
             }
 
@@ -416,8 +418,7 @@
             if ($status_lc == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
                 $html = html::div('rsvp-status', $this->gettext('notanattendee'));
                 $action = 'import';
-            }
-            else if (in_array($status_lc, $this->rsvp_status)) {
+            } elseif (in_array($status_lc, $this->rsvp_status)) {
                 $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
 
                 if ($existing && ($existing'sequence' > $event'sequence'
@@ -427,11 +428,9 @@
                     if ($status_lc == 'needs-action') {
                         $status_text = $this->gettext('outdatedinvitation');
                     }
-                }
-                else if (!$existing && !$rsvp) {
+                } elseif (!$existing && !$rsvp) {
                     $action = 'import';
-                }
-                else {
+                } else {
                     if ($latest) {
                         $diff = $this->get_itip_diff($event, $existing);
 
@@ -445,8 +444,7 @@
                     if ($rescheduled) {
                         $action = 'rsvp';
                         $latest = false;
-                    }
-                    else if ($status_lc != 'needs-action') {
+                    } elseif ($status_lc != 'needs-action') {
                         // check if there are any changes
                         if ($latest) {
                             $latest = empty($diff);
@@ -460,14 +458,14 @@
             }
         }
         // determine action for REPLY
-        else if ($event'method' == 'REPLY') {
+        elseif ($event'method' == 'REPLY') {
             // check whether the sender already is an attendee
             if ($existing) {
                 // Relax checking if that is a reply to the latest version of the event
                 // We accept versions with older SEQUENCE but no significant changes (Bifrost#T78144)
                 if (!$latest) {
                     $num = $got = 0;
-                    foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+                    foreach ('start', 'end', 'due', 'allday', 'recurrence', 'location' as $key) {
                         if (isset($existing$key)) {
                             if ($key == 'allday') {
                                 $event$key = $event$key == 'true';
@@ -495,7 +493,7 @@
                                 'rsvp-status ' . $status_lc,
                                 $this->gettext(
                                     'name' => 'attendee' . $status_lc,
-                                    'vars' => 'delegatedto' => rcube::Q($delegatee)
+                                    'vars' => 'delegatedto' => rcube::Q($delegatee),
                                 )
                             );
                         }
@@ -509,20 +507,18 @@
                 if (!$listed) {
                     $html = html::div('rsvp-status', $this->gettext('itipnewattendee'));
                 }
-            }
-            else {
+            } else {
                 $html   = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
                 $action = '';
             }
-        }
-        else if ($event'method' == 'CANCEL') {
+        } elseif ($event'method' == 'CANCEL') {
             if (!$existing) {
                 $html   = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
                 $action = '';
             }
         }
 
-        return array(
+        return 
             'uid'        => $event'uid',
             'id'         => asciiwords($event'uid', true),
             'existing'   => $existing ? true : false,
@@ -532,7 +528,7 @@
             'action'     => $action,
             'rescheduled' => $rescheduled,
             'html'       => $html,
-        );
+        ;
     }
 
     protected function get_itip_diff($event, $existing)
@@ -541,26 +537,30 @@
             return;
         }
 
-        $itip = $this->lib->mail_get_itip_object($event'mbox', $event'message_uid', $event'mime_id',
-            $event'task' == 'calendar' ? 'event' : 'task');
+        $itip = $this->lib->mail_get_itip_object(
+            $event'mbox',
+            $event'message_uid',
+            $event'mime_id',
+            $event'task' == 'calendar' ? 'event' : 'task'
+        );
 
         if ($itip) {
             // List of properties that could change without SEQUENCE bump
-            $attrs = array('description', 'title', 'location', 'url');
-            $diff  = array();
+            $attrs = 'description', 'title', 'location', 'url';
+            $diff  = ;
 
             foreach ($attrs as $attr) {
                 if (isset($itip$attr) && $itip$attr != $existing$attr) {
-                    $diff$attr = array(
+                    $diff$attr = 
                         'new' => $itip$attr,
-                        'old' => $existing$attr
-                    );
+                        'old' => $existing$attr,
+                    ;
                 }
             }
 
-            $status             = array();
-            $itip_attendees     = array();
-            $existing_attendees = array();
+            $status             = ;
+            $itip_attendees     = ;
+            $existing_attendees = ;
             $emails             = $this->lib->get_user_emails();
 
             // Compare list of attendees (ignoring current user status)
@@ -572,35 +572,35 @@
                     $attendee'status' = 'ACCEPTED'; // sometimes is not set for exceptions
                     $existing'attendees'$idx = $attendee;
                 }
-                $existing_attendees = $attendee'email' . (isset($attendee'name') ? $attendee'name' : '');
+                $existing_attendees = $attendee'email' . ($attendee'name' ?? '');
             }
             foreach ((array) $itip'attendees' as $idx => $attendee) {
                 if (!empty($attendee'email') && !empty($statusstrtolower($attendee'email'))) {
                     $attendee'status' = $statusstrtolower($attendee'email');
                     $itip'attendees'$idx = $attendee;
                 }
-                $itip_attendees = $attendee'email' . (isset($attendee'name') ? $attendee'name' : '');
+                $itip_attendees = $attendee'email' . ($attendee'name' ?? '');
             }
 
             if ($itip_attendees != $existing_attendees) {
-                $diff'attendees' = array(
+                $diff'attendees' = 
                     'new' => $itip'attendees',
-                    'old' => $existing'attendees'
-                );
+                    'old' => $existing'attendees',
+                ;
             }
 
             if ($existing'start' != $itip'start') {
-                $diff'start' = array(
+                $diff'start' = 
                     'new' => $itip'start',
                     'old' => $existing'start',
-                );
+                ;
             }
 
             if ($existing'end' != $itip'end') {
-                $diff'end' = array(
+                $diff'end' = 
                     'new' => $itip'end',
                     'old' => $existing'end',
-                );
+                ;
             }
 
             return $diff;
@@ -612,27 +612,28 @@
      */
     public function mail_itip_inline_ui($event, $method, $mime_id, $task, $message_date = null, $preview_url = null)
     {
-        $buttons = array();
+        $buttons = ;
         $dom_id  = asciiwords($event'uid', true);
 
         $rsvp_status  = 'unknown';
         $rsvp_buttons = '';
+        $title = '';
 
         // pass some metadata about the event and trigger the asynchronous status check
         $changed = !empty($event'changed') && is_object($event'changed') ? $event'changed' : $message_date;
-        $metadata = array(
+        $metadata = 
             'uid'      => $event'uid',
-            '_instance' => isset($event'_instance') ? $event'_instance' : null,
+            '_instance' => $event'_instance' ?? null,
             'changed'  => $changed ? $changed->format('U') : 0,
             'sequence' => intval($event'sequence' ?? 0),
             'method'   => $method,
             'task'     => $task,
             'mime_id'  => $mime_id,
             'rsvp'     => false,
-        );
+        ;
 
         // create buttons to be activated from async request checking existence of this event in local calendars
-        $buttons = html::div(array('id' => 'loading-'.$dom_id, 'class' => 'rsvp-status loading'), $this->gettext('loading'));
+        $buttons = html::div('id' => 'loading-' . $dom_id, 'class' => 'rsvp-status loading', $this->gettext('loading'));
 
         // on iTip REPLY we have two options:
         if ($method == 'REPLY') {
@@ -649,39 +650,39 @@
             }
 
             // 1. update the attendee status on our copy
-            $update_button = html::tag('input', array(
+            $update_button = html::tag('input', 
                 'type'    => 'button',
                 'class'   => 'button',
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
                 'value'   => $this->gettext('updateattendeestatus'),
-            ));
+            );
 
             // 2. accept or decline a new or delegate attendee
-            $accept_buttons = html::tag('input', array(
+            $accept_buttons = html::tag('input', 
                 'type'    => 'button',
                 'class'   => "button accept",
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
                 'value'   => $this->gettext('acceptattendee'),
-            ));
-            $accept_buttons .= html::tag('input', array(
+            );
+            $accept_buttons .= html::tag('input', 
                 'type'    => 'button',
                 'class'   => "button decline",
                 'onclick' => "rcube_libcalendaring.decline_attendee_reply('" . rcube::JQ($mime_id) . "', '$task')",
                 'value'   => $this->gettext('declineattendee'),
-            ));
+            );
 
-            $buttons = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
-            $buttons = html::div(array('id' => 'accept-'.$dom_id, 'style' => 'display:none'), $accept_buttons);
+            $buttons = html::div('id' => 'update-' . $dom_id, 'style' => 'display:none', $update_button);
+            $buttons = html::div('id' => 'accept-' . $dom_id, 'style' => 'display:none', $accept_buttons);
 
             // For replies we need more metadata
-            foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+            foreach ('start', 'end', 'due', 'allday', 'recurrence', 'location' as $key) {
                 if (isset($event$key)) {
                     $metadata$key = $event$key instanceof DateTimeInterface ? $event$key->format('c') : $event$key;
                 }
             }
         }
         // when receiving iTip REQUEST messages:
-        else if ($method == 'REQUEST') {
+        elseif ($method == 'REQUEST') {
             $emails = $this->lib->get_user_emails();
             $title = !empty($event'sequence') ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
             $metadata'rsvp' = true;
@@ -692,47 +693,47 @@
 
             // check for X-KOLAB-INVITATIONTYPE property and only show accept/decline buttons
             if (self::get_custom_property($event, 'X-KOLAB-INVITATIONTYPE') == 'CONFIRMATION') {
-                $this->rsvp_actions = array('accepted','declined');
+                $this->rsvp_actions = 'accepted','declined';
                 $metadata'nosave' = true;
             }
 
             // 1. display RSVP buttons (if the user was invited)
             foreach ($this->rsvp_actions as $method) {
-                $rsvp_buttons .= html::tag('input', array(
+                $rsvp_buttons .= html::tag('input', 
                     'type'    => 'button',
                     'class'   => "button $method",
                     'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task', '$method', '$dom_id')",
                     'value'   => $this->gettext('itip' . $method),
-                ));
+                );
             }
 
             // add button to open calendar/preview
             if (!empty($preview_url)) {
                 $msgref = $this->lib->ical_message->folder . '/' . $this->lib->ical_message->uid . '#' . $mime_id;
-                $rsvp_buttons .= html::tag('input', array(
+                $rsvp_buttons .= html::tag('input', 
                     'type'    => 'button',
                     // TODO: Temp. disable this button on small screen in Elastic (Bifrost#T105747)
                     'class'   => "button preview hidden-phone hidden-small",
                     'onclick' => "rcube_libcalendaring.open_itip_preview('" . rcube::JQ($preview_url) . "', '" . rcube::JQ($msgref) . "')",
                     'value'   => $this->gettext('openpreview'),
-                ));
+                );
             }
 
             // 2. update the local copy with minor changes
-            $update_button = html::tag('input', array(
+            $update_button = html::tag('input', 
                 'type'    => 'button',
                 'class'   => 'button',
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
                 'value'   => $this->gettext('updatemycopy'),
-            ));
+            );
 
             // 3. Simply import the event without replying
-            $import_button = html::tag('input', array(
+            $import_button = html::tag('input', 
                 'type'    => 'button',
                 'class'   => 'button',
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
                 'value'   => $this->gettext('importtocalendar'),
-            ));
+            );
 
             // check my status as an attendee
             foreach ($event'attendees' as $attendee) {
@@ -748,8 +749,8 @@
             // add itip reply message controls
             $rsvp_buttons .= html::div('itip-reply-controls', $this->itip_rsvp_options_ui($dom_id, !empty($metadata'nosave')));
 
-            $buttons = html::div(array('id' => 'rsvp-'.$dom_id, 'class' => 'rsvp-buttons', 'style' => 'display:none'), $rsvp_buttons);
-            $buttons = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
+            $buttons = html::div('id' => 'rsvp-' . $dom_id, 'class' => 'rsvp-buttons', 'style' => 'display:none', $rsvp_buttons);
+            $buttons = html::div('id' => 'update-' . $dom_id, 'style' => 'display:none', $update_button);
 
             // prepare autocompletion for delegation dialog
             if (in_array('delegated', $this->rsvp_actions)) {
@@ -757,31 +758,31 @@
             }
         }
         // for CANCEL messages, we can:
-        else if ($method == 'CANCEL') {
+        elseif ($method == 'CANCEL') {
             $title = $this->gettext('itipcancellation');
-            $event_prop = array_filter(array(
+            $event_prop = array_filter(
                 'uid'       => $event'uid',
-                '_instance' => isset($event'_instance') ? $event'_instance' : null,
-                '_savemode' => isset($event'_savemode') ? $event'_savemode' : null,
-            ));
+                '_instance' => $event'_instance' ?? null,
+                '_savemode' => $event'_savemode' ?? null,
+            );
 
             // 1. remove the event from our calendar
-            $button_remove = html::tag('input', array(
+            $button_remove = html::tag('input', 
                 'type' => 'button',
                 'class' => 'button',
                 'onclick' => "rcube_libcalendaring.remove_from_itip(" . rcube_output::json_serialize($event_prop) . ", '$task', '" . rcube::JQ($event'title') . "')",
                 'value' => $this->gettext('removefromcalendar'),
-            ));
+            );
 
             // 2. update our copy with status=cancelled
-            $button_update = html::tag('input', array(
+            $button_update = html::tag('input', 
                 'type'    => 'button',
                 'class'   => 'button',
                 'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . rcube::JQ($mime_id) . "', '$task')",
                 'value'   => $this->gettext('updatemycopy'),
-            ));
+            );
 
-            $buttons = html::div(array('id' => 'rsvp-'.$dom_id, 'style' => 'display:none'), $button_remove . $button_update);
+            $buttons = html::div('id' => 'rsvp-' . $dom_id, 'style' => 'display:none', $button_remove . $button_update);
 
             $rsvp_status = 'CANCELLED';
             $metadata'rsvp' = true;
@@ -789,7 +790,7 @@
 
         // append generic import button
         if (!empty($import_button)) {
-            $buttons = html::div(array('id' => 'import-'.$dom_id, 'style' => 'display:none'), $import_button);
+            $buttons = html::div('id' => 'import-' . $dom_id, 'style' => 'display:none', $import_button);
         }
 
         // pass some metadata about the event and trigger the asynchronous status check
@@ -802,7 +803,7 @@
         $output_labels = ;
         $labels = 'savingdata','deleteobjectconfirm','declinedeleteconfirm','declineattendee',
             'cancel','itipdelegated','declineattendeeconfirm','itipcomment','delegateinvitation',
-            'delegateto','delegatersvpme','delegateinvalidaddress'
+            'delegateto','delegatersvpme','delegateinvalidaddress',
         ;
         foreach ($labels as $label) {
             $output_labels"itip.$label" = $this->gettext($label);
@@ -811,15 +812,15 @@
 
         // show event details with buttons
         return $this->itip_object_details_table($event, $title) .
-            html::div(array('class' => 'itip-buttons', 'id' => 'itip-buttons-' . asciiwords($metadata'uid', true)), join('', $buttons));
+            html::div('class' => 'itip-buttons', 'id' => 'itip-buttons-' . asciiwords($metadata'uid', true), implode('', $buttons));
     }
 
     /**
      * Render an RSVP UI widget with buttons to respond on iTip invitations
      */
-    function itip_rsvp_buttons($attrib = array(), $actions = null)
+    public function itip_rsvp_buttons($attrib = , $actions = null)
     {
-        $attrib += array('type' => 'button');
+        $attrib += 'type' => 'button';
 
         if (!$actions) {
             $actions = $this->rsvp_actions;
@@ -828,20 +829,20 @@
         $buttons = '';
 
         foreach ($actions as $method) {
-            $buttons .= html::tag('input', array(
+            $buttons .= html::tag('input', 
                 'type'  => $attrib'type',
                 'name'  => !empty($attrib'iname') ? $attrib'iname' : null,
                 'class' => 'button',
                 'rel'   => $method,
                 'value' => $this->gettext('itip' . $method),
-            ));
+            );
         }
 
         // add localized texts for the delegation dialog
         $output_labels = ;
         if (in_array('delegated', $actions)) {
             $labels = 'itipdelegated','itipcomment','delegateinvitation',
-                  'delegateto','delegatersvpme','delegateinvalidaddress','cancel'
+                  'delegateto','delegatersvpme','delegateinvalidaddress','cancel',
             ;
             foreach ($labels as $label) {
                 $output_labels"itip.$label" = $this->gettext($label);
@@ -854,11 +855,13 @@
 
         $this->rc->output->command('add_label', $output_labels);
 
-        $savemode_radio = new html_radiobutton(array('name' => '_rsvpmode', 'class' => 'rsvp-replymode'));
+        $savemode_radio = new html_radiobutton('name' => '_rsvpmode', 'class' => 'rsvp-replymode');
 
-        return html::div($attrib,
+        return html::div(
+            $attrib,
             html::div('label', $this->gettext('acceptinvitation')) .
-            html::div('rsvp-buttons itip-buttons',
+            html::div(
+                'rsvp-buttons itip-buttons',
                 $buttons .
                 html::div('itip-reply-controls', $this->itip_rsvp_options_ui($attrib'id'))
             )
@@ -876,36 +879,40 @@
         if ($itip_sending === 0) {
             return '';
         }
+
+        $rsvp_additions = '';
+
         // add checkbox to suppress itip reply message
-        else if ($itip_sending >= 2) {
-            $toggle_attrib = array(
+        if ($itip_sending >= 2) {
+            $toggle_attrib = 
                 'type'     => 'checkbox',
-                'id'       => 'noreply-'.$dom_id,
+                'id'       => 'noreply-' . $dom_id,
                 'value'    => 1,
                 'disabled' => $disable,
                 'checked'  => ($itip_sending & 1) == 0,
                 'class'    => 'pretty-checkbox',
-            );
-            $rsvp_additions = html::label(array('class' => 'noreply-toggle'),
+            ;
+            $rsvp_additions .= html::label(
+                'class' => 'noreply-toggle',
                 html::tag('input', $toggle_attrib) . ' ' . $this->gettext('itipsuppressreply')
             );
         }
 
         // add input field for reply comment
-        $toggle_attrib = array(
+        $toggle_attrib = 
             'href'    => '#toggle',
             'class'   => 'reply-comment-toggle',
-            'onclick' => '$(this).hide().parent().find(\'textarea\').show().focus()'
-        );
-        $textarea_attrib = array(
+            'onclick' => '$(this).hide().parent().find(\'textarea\').show().focus()',
+        ;
+        $textarea_attrib = 
             'id'    => 'reply-comment-' . $dom_id,
             'name'  => '_comment',
             'cols'  => 40,
             'rows'  => 4,
             'class' => 'form-control',
             'style' => 'display:none',
-            'placeholder' => $this->gettext('itipcomment')
-        );
+            'placeholder' => $this->gettext('itipcomment'),
+        ;
 
         $rsvp_additions .= html::a($toggle_attrib, $this->gettext('itipeditresponse'))
             . html::div('itip-reply-comment', html::tag('textarea', $textarea_attrib, ''));
@@ -916,24 +923,22 @@
     /**
      * Render event/task details in a table
      */
-    function itip_object_details_table($event, $title)
+    public function itip_object_details_table($event, $title)
     {
-        $table = new html_table(array('cols' => 2, 'border' => 0, 'class' => 'calendar-eventdetails'));
+        $table = new html_table('cols' => 2, 'border' => 0, 'class' => 'calendar-eventdetails');
         $table->add('ititle', $title);
         $table->add('title', rcube::Q(trim($event'title')));
         if ($event'start' && $event'end') {
             $table->add('label', $this->gettext('date'));
             $table->add('date', rcube::Q($this->lib->event_date_text($event)));
-        }
-        else if ($event'due' && $event'_type' == 'task') {
+        } elseif ($event'due' && $event'_type' == 'task') {
             $table->add('label', $this->gettext('date'));
             $table->add('date', rcube::Q($this->lib->event_date_text($event)));
         }
         if (!empty($event'recurrence_date')) {
             $table->add('label', '');
-            $table->add('recurrence-id', $this->gettext($event'thisandfuture' ? 'itipfutureoccurrence' : 'itipsingleoccurrence'));
-        }
-        else if (!empty($event'recurrence')) {
+            $table->add('recurrence-id', $this->gettext(!empty($event'thisandfuture') ? 'itipfutureoccurrence' : 'itipsingleoccurrence'));
+        } elseif (!empty($event'recurrence')) {
             $table->add('label', $this->gettext('recurring'));
             $table->add('recurrence', $this->lib->recurrence_text($event'recurrence'));
         }
@@ -953,13 +958,13 @@
         return $table->show();
     }
 
-
     /**
      * Create iTIP invitation token for later replies via URL
      *
-     * @param array Hash array with event properties
-     * @param string Attendee email address
-     * @return string Invitation token
+     * @param array  $event    Hash array with event properties
+     * @param string $attendee Attendee email address
+     *
+     * @return string|false Invitation token
      */
     public function store_invitation($event, $attendee)
     {
@@ -970,12 +975,11 @@
     /**
      * Mark invitations for the given event as cancelled
      *
-     * @param array Hash array with event properties
+     * @param array $event Hash array with event properties
      */
     public function cancel_itip_invitation($event)
     {
         // empty stub
-        return false;
     }
 
     /**
@@ -986,7 +990,7 @@
         $ret = false;
 
         if (is_array($event'x-custom')) {
-            array_walk($event'x-custom', function($prop, $i) use ($name, &$ret) {
+            array_walk($event'x-custom', function ($prop, $i) use ($name, &$ret) {
                 if (strcasecmp($prop0, $name) === 0) {
                     $ret = $prop1;
                 }
@@ -1010,9 +1014,9 @@
     /**
      * Find an attendee that is not the organizer and has an email matching $email_field
      */
-    public function find_attendee_by_email($attendees, $email_field, $email, $email_utf = null)
+    public static function find_attendee_by_email($attendees, $email_field, $email, $email_utf = null)
     {
-        foreach ($attendees as $_attendee) {
+        foreach ($attendees as $attendee) {
             if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
                 continue;
             }
@@ -1030,7 +1034,7 @@
     public static function find_reply_attendee($event)
     {
         // remove the organizer
-        $itip_attendees = array_filter($event'attendees', function($item) {
+        $itip_attendees = array_filter($event'attendees', function ($item) {
             return (empty($item'role') || $item'role' != 'ORGANIZER') && !empty($item'email');
         });

roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_recurrence.php Changed

@@ -41,7 +41,7 @@
      * @param libcalendaring $lib   The libcalendaring plugin instance
      * @param array          $event The event object to operate on
      */
-    function __construct($lib, $event = null)
+    public function __construct($lib, $event = null)
     {
         $this->lib   = $lib;
         $this->event = $event;
@@ -60,8 +60,8 @@
     /**
      * Initialize recurrence engine
      *
-     * @param array    The recurrence properties
-     * @param DateTime The recurrence start date
+     * @param array    $recurrence The recurrence properties
+     * @param DateTime $start      The recurrence start date
      */
     public function init($recurrence, $start)
     {
@@ -95,12 +95,11 @@
         try {
             $this->engine->next();
             $current = $this->engine->getDtStart();
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             // do nothing
         }
 
-        return $current ? $this->toDateTime($current) : false;
+        return !empty($current) ? $this->toDateTime($current) : false;
     }
 
     /**
@@ -119,8 +118,7 @@
             && $next_start->format('Ymd') != $this->start->format('Ymd')
         ) {
             $next_start = $this->toDateTime($next_start);
-        }
-        else {
+        } else {
             $next_start = $this->next_start();
         }
 
@@ -155,7 +153,7 @@
     {
         // recurrence end date is given
         if (isset($this->recurrence'UNTIL') && $this->recurrence'UNTIL' instanceof DateTimeInterface) {
-            return $this->recurrence'UNTIL';
+            return $this->toDateTime($this->recurrence'UNTIL');
         }
 
         // Run through all items till we reach the end, or limit of iterations
@@ -164,17 +162,17 @@
             foreach ($this->engine as $end) {
                 // do nothing
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             // do nothing
         }
-/*
+
+        /*
         if (empty($end) && isset($this->event'start') && $this->event'start' instanceof DateTimeInterface) {
             // determine a reasonable end date if none given
             $end = clone $this->event'start';
             $end->add(new DateInterval('P100Y'));
         }
-*/
+        */
 
         return isset($end) ? $this->toDateTime($end) : false;
     }
@@ -191,37 +189,38 @@
         $freq     = $this->recurrence'FREQ' ?? null;
 
         switch ($freq) {
-        case 'WEEKLY':
-            if (empty($this->recurrence'BYDAY')) {
-                return $start;
-            }
+            case 'WEEKLY':
+                if (empty($this->recurrence'BYDAY')) {
+                    return $start;
+                }
 
-            $start->sub(new DateInterval("P{$interval}W"));
-            break;
-
-        case 'MONTHLY':
-            if (empty($this->recurrence'BYDAY') && empty($this->recurrence'BYMONTHDAY')) {
-                return $start;
-            }
+                $start->sub(new DateInterval("P{$interval}W"));
+                break;
 
-            $start->sub(new DateInterval("P{$interval}M"));
-            break;
+            case 'MONTHLY':
+                if (empty($this->recurrence'BYDAY') && empty($this->recurrence'BYMONTHDAY')) {
+                    return $start;
+                }
 
-        case 'YEARLY':
-            if (empty($this->recurrence'BYDAY') && empty($this->recurrence'BYMONTH')) {
-                return $start;
-            }
+                $start->sub(new DateInterval("P{$interval}M"));
+                break;
 
-            $start->sub(new DateInterval("P{$interval}Y"));
-            break;
+            case 'YEARLY':
+                if (empty($this->recurrence'BYDAY') && empty($this->recurrence'BYMONTH')) {
+                    return $start;
+                }
 
-        case 'DAILY':
-            if (!empty($this->recurrence'BYMONTH')) {
+                $start->sub(new DateInterval("P{$interval}Y"));
                 break;
-            }
 
-        default:
-            return $start;
+            case 'DAILY':
+                if (!empty($this->recurrence'BYMONTH')) {
+                    break;
+                }
+
+                // no break
+            default:
+                return $start;
         }
 
         $recurrence = $this->recurrence;
@@ -255,8 +254,11 @@
             rcube::raise_error(
                 
                     'file' => __FILE__, 'line' => __LINE__,
-                    'message' => sprintf("Failed to find a first occurrence. Start: %s, Recurrence: %s",
-                        $this->start->format(DateTime::ISO8601), json_encode($recurrence)),
+                    'message' => sprintf(
+                        "Failed to find a first occurrence. Start: %s, Recurrence: %s",
+                        $this->start->format(DateTime::ISO8601),
+                        json_encode($recurrence)
+                    ),
                 ,
                 true
             );

roundcubemail-1.5.tar.gz/plugins/libcalendaring/lib/libcalendaring_vcalendar.php Changed

@@ -21,22 +21,21 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-use \Sabre\VObject;
-use \Sabre\VObject\DateTimeParser;
+use Sabre\VObject;
+use Sabre\VObject\DateTimeParser;
 
 /**
  * Class to parse and build vCalendar (iCalendar) files
  *
  * Uses the Sabre VObject library, version 3.x.
  */
-#AllowDynamicProperties
 class libcalendaring_vcalendar implements Iterator
 {
     private $timezone;
     private $attach_uri;
     private $prodid;
-    private $type_component_map = array('event' => 'VEVENT', 'task' => 'VTODO');
-    private $attendee_keymap = array(
+    private $type_component_map = 'event' => 'VEVENT', 'task' => 'VTODO';
+    private $attendee_keymap = 
         'name'   => 'CN',
         'status' => 'PARTSTAT',
         'role'   => 'ROLE',
@@ -47,30 +46,32 @@
         'schedule-status' => 'SCHEDULE-STATUS',
         'schedule-agent'  => 'SCHEDULE-AGENT',
         'sent-by'         => 'SENT-BY',
-    );
-    private $organizer_keymap = array(
+    ;
+    private $organizer_keymap = 
         'name'            => 'CN',
         'schedule-status' => 'SCHEDULE-STATUS',
         'schedule-agent'  => 'SCHEDULE-AGENT',
         'sent-by'         => 'SENT-BY',
-    );
+    ;
     private $iteratorkey = 0;
     private $charset;
     private $forward_exceptions;
     private $vhead;
     private $fp;
-    private $vtimezones = array();
+    private $vtimezones = ;
 
     public $method;
     public $agent = '';
-    public $objects = array();
-    public $freebusy = array();
-
+    public $objects = ;
+    public $freebusy = ;
+    public $sender;
+    public $message_date;
+    public $mime_id;
 
     /**
      * Default constructor
      */
-    function __construct($tz = null)
+    public function __construct($tz = null)
     {
         $this->timezone = $tz;
         $this->prodid = '-//Roundcube ' . RCUBE_VERSION . '//Sabre VObject ' . VObject\Version::VERSION . '//EN';
@@ -115,9 +116,9 @@
     {
         $this->vhead = '';
         $this->method = '';
-        $this->objects = array();
-        $this->freebusy = array();
-        $this->vtimezones = array();
+        $this->objects = ;
+        $this->freebusy = ;
+        $this->vtimezones = ;
         $this->iteratorkey = 0;
 
         if ($this->fp) {
@@ -129,9 +130,9 @@
     /**
     * Import events from iCalendar format
     *
-    * @param string vCalendar input
-    * @param string Input charset (from envelope)
-    * @param bool   True if parsing exceptions should be forwarded to the caller
+    * @param string $vcal               vCalendar input
+    * @param string $charset            Input charset (from envelope)
+    * @param bool   $forward_exceptions True if parsing exceptions should be forwarded to the caller
     *
     * @return array List of events extracted from the input
     */
@@ -143,7 +144,7 @@
             // estimate the memory usage and try to avoid fatal errors when allowed memory gets exhausted
             if ($memcheck) {
                 $count = substr_count($vcal, 'BEGIN:VEVENT') + substr_count($vcal, 'BEGIN:VTODO');
-                $expected_memory = $count * 70*1024;  // assume ~ 70K per event (empirically determined)
+                $expected_memory = $count * 70 * 1024;  // assume ~ 70K per event (empirically determined)
 
                 if (!rcube_utils::mem_check($expected_memory)) {
                     throw new Exception("iCal file too big");
@@ -151,19 +152,21 @@
             }
 
             $vobject = VObject\Reader::read($vcal, VObject\Reader::OPTION_FORGIVING | VObject\Reader::OPTION_IGNORE_INVALID_LINES);
-            if ($vobject)
+            if ($vobject) {
                 return $this->import_from_vobject($vobject);
-        }
-        catch (Exception $e) {
+            }
+        } catch (Exception $e) {
             if ($forward_exceptions) {
                 throw $e;
-            }
-            else {
-                rcube::raise_error(array(
+            } else {
+                rcube::raise_error(
+                    
                     'code' => 600, 'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "iCal data parse error: " . $e->getMessage()),
-                    true, false);
+                    'message' => "iCal data parse error: " . $e->getMessage(),
+                    true,
+                    false
+                );
             }
         }
 
@@ -173,9 +176,9 @@
     /**
     * Read iCalendar events from a file
     *
-    * @param string File path to read from
-    * @param string Input charset (from envelope)
-    * @param bool   True if parsing exceptions should be forwarded to the caller
+    * @param string $filepath                File path to read from
+    * @param string $charset                 Input charset (from envelope)
+    * @param bool   $forward_exceptions True if parsing exceptions should be forwarded to the caller
     *
     * @return array List of events extracted from the file
     */
@@ -196,10 +199,11 @@
     /**
      * Open a file to read iCalendar events sequentially
      *
-     * @param  string File path to read from
-     * @param  string Input charset (from envelope)
-     * @param  boolean True if parsing exceptions should be forwarded to the caller
-     * @return boolean True if file contents are considered valid
+     * @param string $filepath           File path to read from
+     * @param string $charset            Input charset (from envelope)
+     * @param bool   $forward_exceptions True if parsing exceptions should be forwarded to the caller
+     *
+     * @return bool True if file contents are considered valid
      */
     public function fopen($filepath, $charset = 'UTF-8', $forward_exceptions = false)
     {
@@ -229,8 +233,8 @@
     {
         if ($reset) {
             $this->iteratorkey = 0;
-            $this->objects = array();
-            $this->freebusy = array();
+            $this->objects = ;
+            $this->freebusy = ;
         }
 
         $next = $this->_next_component();
@@ -246,18 +250,19 @@
         if (strlen($buffer) && preg_match('/BEGIN:(VEVENT|VTODO|VFREEBUSY)/i', $buffer)) {
             try {
                 $this->import($this->vhead . $buffer . "END:VCALENDAR", $this->charset, true, false);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 if ($this->forward_exceptions) {
                     throw new VObject\ParseException($e->getMessage() . " in\n" . $buffer);
-                }
-                else {
+                } else {
                     // write the failing section to error log
-                    rcube::raise_error(array(
+                    rcube::raise_error(
+                        
                         'code' => 600, 'type' => 'php',
                         'file' => __FILE__, 'line' => __LINE__,
-                        'message' => $e->getMessage() . " in\n" . $buffer),
-                        true, false);
+                        'message' => $e->getMessage() . " in\n" . $buffer,
+                        true,
+                        false
+                    );
                 }
 
                 // advance to next
@@ -295,8 +300,7 @@
 
             if ($vcalendar_head) {
                 $this->vhead .= $line;
-            }
-            else {
+            } else {
                 $buffer .= $line;
                 if (preg_match('/END:(VEVENT|VTODO|VFREEBUSY)/i', $line)) {
                     break;
@@ -310,13 +314,14 @@
     /**
      * Import objects from an already parsed Sabre\VObject\Component object
      *
-     * @param object Sabre\VObject\Component to read from
+     * @param VObject\Component $vobject Component to read from
+     *
      * @return array List of events extracted from the file
      */
     public function import_from_vobject($vobject)
     {
-        $seen = array();
-        $exceptions = array();
+        $seen = ;
+        $exceptions = ;
 
         if ($vobject->name == 'VCALENDAR') {
             $this->method = strval($vobject->METHOD);
@@ -330,13 +335,11 @@
                     // temporarily store this as exception
                     if (!empty($object'recurrence_date')) {
                         $exceptions = $object;
-                    }
-                    else if (empty($seen$object'uid')) {
+                    } elseif (empty($seen$object'uid')) {
                         $seen$object'uid' = true;
                         $this->objects = $object;
                     }
-                }
-                else if ($ve->name == 'VFREEBUSY') {
+                } elseif ($ve->name == 'VFREEBUSY') {
                     $this->objects = $this->_parse_freebusy($ve);
                 }
             }
@@ -349,8 +352,7 @@
                 if (empty($seen$uid)) {
                     $seen$uid = true;
                     $this->objects = $exception;
-                }
-                else {
+                } else {
                     foreach ($this->objects as $i => $object) {
                         // add as exception to existing entry with a matching UID
                         if ($object'uid' == $uid) {
@@ -374,7 +376,7 @@
      */
     public function get_busy_periods()
     {
-        $out = array();
+        $out = ;
         foreach ((array)$this->freebusy'periods' as $period) {
             if ($period2 != 'FREE') {
                 $out = $period;
@@ -397,214 +399,216 @@
     /**
      * Convert the given VEvent object to a libkolab compatible array representation
      *
-     * @param object Vevent object to convert
+     * @param VObject\Component\VEvent|VObject\Component\VTodo $ve VEvent object to convert
+     *
      * @return array Hash array with object properties
      */
     private function _to_array($ve)
     {
-        $event = array(
+        $event = 
             'uid'     => self::convert_string($ve->UID),
             'title'   => self::convert_string($ve->SUMMARY),
             '_type'   => $ve->name == 'VTODO' ? 'task' : 'event',
             // set defaults
             'priority' => 0,
-            'attendees' => array(),
-            'x-custom' => array(),
-        );
+            'attendees' => ,
+            'x-custom' => ,
+        ;
 
         // Catch possible exceptions when date is invalid (Bug #2144)
         // We can skip these fields, they aren't critical
-        foreach (array('CREATED' => 'created', 'LAST-MODIFIED' => 'changed', 'DTSTAMP' => 'changed') as $attr => $field) {
+        foreach ('CREATED' => 'created', 'LAST-MODIFIED' => 'changed', 'DTSTAMP' => 'changed' as $attr => $field) {
             try {
                 if (empty($event$field) && !empty($ve->{$attr})) {
                     $event$field = $ve->{$attr}->getDateTime();
                 }
-            } catch (Exception $e) {}
+            } catch (Exception $e) {
+            }
         }
 
         // map other attributes to internal fields
         foreach ($ve->children() as $prop) {
-            if (!($prop instanceof VObject\Property))
+            if (!($prop instanceof VObject\Property)) {
                 continue;
+            }
 
             $value = strval($prop);
 
             switch ($prop->name) {
-            case 'DTSTART':
-            case 'DTEND':
-            case 'DUE':
-                $propmap = array('DTSTART' => 'start', 'DTEND' => 'end', 'DUE' => 'due');
-                $event$propmap$prop->name = self::convert_datetime($prop);
-                break;
-
-            case 'TRANSP':
-                $event'free_busy' = strval($prop) == 'TRANSPARENT' ? 'free' : 'busy';
-                break;
-
-            case 'STATUS':
-                if ($value == 'TENTATIVE')
-                    $event'free_busy' = 'tentative';
-                else if ($value == 'CANCELLED')
-                    $event'cancelled' = true;
-                else if ($value == 'COMPLETED')
-                    $event'complete' = 100;
+                case 'DTSTART':
+                case 'DTEND':
+                case 'DUE':
+                    $propmap = 'DTSTART' => 'start', 'DTEND' => 'end', 'DUE' => 'due';
+                    $event$propmap$prop->name = self::convert_datetime($prop);
+                    break;
 
-                $event'status' = $value;
-                break;
+                case 'TRANSP':
+                    $event'free_busy' = strval($prop) == 'TRANSPARENT' ? 'free' : 'busy';
+                    break;
 
-            case 'COMPLETED':
-                if (self::convert_datetime($prop)) {
-                    $event'status' = 'COMPLETED';
-                    $event'complete' = 100;
-                }
-                break;
+                case 'STATUS':
+                    if ($value == 'TENTATIVE') {
+                        $event'free_busy' = 'tentative';
+                    } elseif ($value == 'CANCELLED') {
+                        $event'cancelled' = true;
+                    } elseif ($value == 'COMPLETED') {
+                        $event'complete' = 100;
+                    }
 
-            case 'PRIORITY':
-                if (is_numeric($value))
-                    $event'priority' = $value;
-                break;
+                    $event'status' = $value;
+                    break;
 
-            case 'RRULE':
-                $params = !empty($event'recurrence') && is_array($event'recurrence') ? $event'recurrence' : array();
-                // parse recurrence rule attributes
-                foreach ($prop->getParts() as $k => $v) {
-                    $paramsstrtoupper($k) = is_array($v) ? implode(',', $v) : $v;
-                }
-                if (!empty($params'UNTIL')) {
-                    $params'UNTIL' = date_create($params'UNTIL');
-                }
-                if (empty($params'INTERVAL')) {
-                    $params'INTERVAL' = 1;
-                }
+                case 'COMPLETED':
+                    if (self::convert_datetime($prop)) {
+                        $event'status' = 'COMPLETED';
+                        $event'complete' = 100;
+                    }
+                    break;
 
-                $event'recurrence' = array_filter($params);
-                break;
+                case 'PRIORITY':
+                    if (is_numeric($value)) {
+                        $event'priority' = $value;
+                    }
+                    break;
 
-            case 'EXDATE':
-                if (!empty($value)) {
-                    $exdates = array_map(function($_) { return is_array($_) ? $_0 : $_; }, self::convert_datetime($prop, true));
-                    if (!empty($event'recurrence''EXDATE')) {
-                        $event'recurrence''EXDATE' = array_merge($event'recurrence''EXDATE', $exdates);
+                case 'RRULE':
+                    $params = !empty($event'recurrence') && is_array($event'recurrence') ? $event'recurrence' : ;
+                    // parse recurrence rule attributes
+                    foreach ($prop->getParts() as $k => $v) {
+                        $paramsstrtoupper($k) = is_array($v) ? implode(',', $v) : $v;
                     }
-                    else {
-                        $event'recurrence''EXDATE' = $exdates;
+                    if (!empty($params'UNTIL')) {
+                        $params'UNTIL' = date_create($params'UNTIL');
                     }
-                }
-                break;
+                    if (empty($params'INTERVAL')) {
+                        $params'INTERVAL' = 1;
+                    }
+
+                    $event'recurrence' = array_filter($params);
+                    break;
 
-            case 'RDATE':
-                if (!empty($value)) {
-                    $rdates = array_map(function($_) { return is_array($_) ? $_0 : $_; }, self::convert_datetime($prop, true));
-                    if (!empty($event'recurrence''RDATE')) {
-                        $event'recurrence''RDATE' = array_merge($event'recurrence''RDATE', $rdates);
+                case 'EXDATE':
+                    if (!empty($value)) {
+                        $exdates = array_map(function ($_) { return is_array($_) ? $_0 : $_; }, self::convert_datetime($prop, true));
+                        if (!empty($event'recurrence''EXDATE')) {
+                            $event'recurrence''EXDATE' = array_merge($event'recurrence''EXDATE', $exdates);
+                        } else {
+                            $event'recurrence''EXDATE' = $exdates;
+                        }
                     }
-                    else {
-                        $event'recurrence''RDATE' = $rdates;
+                    break;
+
+                case 'RDATE':
+                    if (!empty($value)) {
+                        $rdates = array_map(function ($_) { return is_array($_) ? $_0 : $_; }, self::convert_datetime($prop, true));
+                        if (!empty($event'recurrence''RDATE')) {
+                            $event'recurrence''RDATE' = array_merge($event'recurrence''RDATE', $rdates);
+                        } else {
+                            $event'recurrence''RDATE' = $rdates;
+                        }
                     }
-                }
-                break;
+                    break;
 
-            case 'RECURRENCE-ID':
-                $event'recurrence_date' = self::convert_datetime($prop);
-                if ($prop->offsetGet('RANGE') == 'THISANDFUTURE' || $prop->offsetGet('THISANDFUTURE') !== null) {
-                    $event'thisandfuture' = true;
-                }
-                break;
+                case 'RECURRENCE-ID':
+                    $event'recurrence_date' = self::convert_datetime($prop);
+                    if ($prop->offsetGet('RANGE') == 'THISANDFUTURE' || $prop->offsetGet('THISANDFUTURE') !== null) {
+                        $event'thisandfuture' = true;
+                    }
+                    break;
 
-            case 'RELATED-TO':
-                $reltype = $prop->offsetGet('RELTYPE');
-                if ($reltype == 'PARENT' || $reltype === null) {
-                    $event'parent_id' = $value;
-                }
-                break;
+                case 'RELATED-TO':
+                    $reltype = $prop->offsetGet('RELTYPE');
+                    if ($reltype == 'PARENT' || $reltype === null) {
+                        $event'parent_id' = $value;
+                    }
+                    break;
 
-            case 'SEQUENCE':
-                $event'sequence' = intval($value);
-                break;
+                case 'SEQUENCE':
+                    $event'sequence' = intval($value);
+                    break;
 
-            case 'PERCENT-COMPLETE':
-                $event'complete' = intval($value);
-                break;
+                case 'PERCENT-COMPLETE':
+                    $event'complete' = intval($value);
+                    break;
 
-            case 'LOCATION':
-            case 'DESCRIPTION':
-            case 'URL':
-            case 'COMMENT':
-                $eventstrtolower($prop->name) = self::convert_string($prop);
-                break;
+                case 'LOCATION':
+                case 'DESCRIPTION':
+                case 'URL':
+                case 'COMMENT':
+                    $eventstrtolower($prop->name) = self::convert_string($prop);
+                    break;
 
-            case 'CATEGORY':
-            case 'CATEGORIES':
-                if (!empty($event'categories')) {
-                    $event'categories' = array_merge((array) $event'categories', $prop->getParts());
-                }
-                else {
-                    $event'categories' = $prop->getParts();
-                }
-                break;
+                case 'CATEGORY':
+                case 'CATEGORIES':
+                    if (!empty($event'categories')) {
+                        $event'categories' = array_merge((array) $event'categories', $prop->getParts());
+                    } else {
+                        $event'categories' = $prop->getParts();
+                    }
+                    break;
 
-            case 'X-MICROSOFT-CDO-BUSYSTATUS':
-                if ($value == 'OOF') {
-                    $event'free_busy' = 'outofoffice';
-                }
-                else if (in_array($value, array('FREE', 'BUSY', 'TENTATIVE'))) {
-                    $event'free_busy' = strtolower($value);
-                }
-                break;
+                case 'X-MICROSOFT-CDO-BUSYSTATUS':
+                    if ($value == 'OOF') {
+                        $event'free_busy' = 'outofoffice';
+                    } elseif (in_array($value, 'FREE', 'BUSY', 'TENTATIVE')) {
+                        $event'free_busy' = strtolower($value);
+                    }
+                    break;
 
-            case 'ATTENDEE':
-            case 'ORGANIZER':
-                $params = array('RSVP' => false);
-                foreach ($prop->parameters() as $pname => $pvalue) {
-                    switch ($pname) {
-                        case 'RSVP': $params$pname = strtolower($pvalue) == 'true'; break;
-                        case 'CN':   $params$pname = self::unescape($pvalue); break;
-                        default:     $params$pname = strval($pvalue); break;
+                case 'ATTENDEE':
+                case 'ORGANIZER':
+                    $params = 'RSVP' => false;
+                    foreach ($prop->parameters() as $pname => $pvalue) {
+                        switch ($pname) {
+                            case 'RSVP': $params$pname = strtolower($pvalue) == 'true';
+                                break;
+                            case 'CN':   $params$pname = self::unescape($pvalue);
+                                break;
+                            default:     $params$pname = strval($pvalue);
+                                break;
+                        }
                     }
-                }
-                $attendee = self::map_keys($params, array_flip($this->attendee_keymap));
-                $attendee'email' = preg_replace('!^mailto:!i', '', $value);
+                    $attendee = self::map_keys($params, array_flip($this->attendee_keymap));
+                    $attendee'email' = preg_replace('!^mailto:!i', '', $value);
 
-                if ($prop->name == 'ORGANIZER') {
-                    $attendee'role' = 'ORGANIZER';
-                    $attendee'status' = 'ACCEPTED';
-                    $event'organizer' = $attendee;
+                    if ($prop->name == 'ORGANIZER') {
+                        $attendee'role' = 'ORGANIZER';
+                        $attendee'status' = 'ACCEPTED';
+                        $event'organizer' = $attendee;
 
-                    if (array_key_exists('schedule-agent', $attendee)) {
-                        $schedule_agent = $attendee'schedule-agent';
+                        if (array_key_exists('schedule-agent', $attendee)) {
+                            $schedule_agent = $attendee'schedule-agent';
+                        }
+                    } elseif (empty($event'organizer') || $attendee'email' != $event'organizer''email') {
+                        $event'attendees' = $attendee;
                     }
-                }
-                else if (empty($event'organizer') || $attendee'email' != $event'organizer''email') {
-                    $event'attendees' = $attendee;
-                }
-                break;
+                    break;
 
-            case 'ATTACH':
-                $params = self::parameters_array($prop);
-                if (substr($value, 0, 4) == 'http' && !strpos($value, ':attachment:')) {
-                    $event'links' = $value;
-                }
-                else if (!empty($params'VALUE') && strtoupper($params'VALUE') == 'BINARY') {
-                    $attachment = self::map_keys($params, 
-                            'FMTTYPE' => 'mimetype',
-                            'X-LABEL' => 'name',
-                            'X-APPLE-FILENAME' => 'name',
-                            'X-SIZE' => 'size'
-                    );
-
-                    $attachment'data' = $value ?? null;
-                    $attachment'size' = $attachment'size' ?? strlen($value);
-                    $attachment'id'   = md5(($attachment'mimetype' ?? 'application/octet-stream') . ($attachment'name' ?? 'noname'));
-
-                    $event'attachments' = $attachment;
-                }
-                break;
+                case 'ATTACH':
+                    $params = self::parameters_array($prop);
+                    if (substr($value, 0, 4) == 'http' && !strpos($value, ':attachment:')) {
+                        $event'links' = $value;
+                    } elseif (!empty($params'VALUE') && strtoupper($params'VALUE') == 'BINARY') {
+                        $attachment = self::map_keys($params, 
+                                'FMTTYPE' => 'mimetype',
+                                'X-LABEL' => 'name',
+                                'X-APPLE-FILENAME' => 'name',
+                                'X-SIZE' => 'size',
+                        );
+
+                        $attachment'data' = $value;
+                        $attachment'size' ??= strlen($value);
+                        $attachment'id'   = md5(($attachment'mimetype' ?? 'application/octet-stream') . ($attachment'name' ?? 'noname'));
+
+                        $event'attachments' = $attachment;
+                    }
+                    break;
 
-            default:
-                if (substr($prop->name, 0, 2) == 'X-') {
-                    $event'x-custom' = $prop->name, strval($value);
-                }
-                break;
+                default:
+                    if (substr($prop->name, 0, 2) == 'X-') {
+                        $event'x-custom' = $prop->name, strval($value);
+                    }
+                    break;
             }
         }
 
@@ -615,8 +619,7 @@
                 $end = clone $event'start';
                 $end->add($duration);
                 $event'end' = $end;
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 trigger_error(strval($e), E_USER_WARNING);
             }
         }
@@ -630,7 +633,7 @@
                 $event'end' = clone $event'start';
             }
             // shift end-date by one day (except Thunderbird)
-            else if ($event'allday' && is_object($event'end')) {
+            elseif ($event'allday' && is_object($event'end')) {
                 $event'end'->sub(new \DateInterval('PT23H'));
             }
 
@@ -649,60 +652,59 @@
         foreach ($ve->select('VALARM') as $valarm) {
             $action  = 'DISPLAY';
             $trigger = null;
-            $alarm   = array();
+            $alarm   = ;
 
             foreach ($valarm->children() as $prop) {
                 $value = strval($prop);
 
                 switch ($prop->name) {
-                case 'TRIGGER':
-                    foreach ($prop->parameters as $param) {
-                        if ($param->name == 'VALUE' && $param->getValue() == 'DATE-TIME') {
-                            $trigger = '@' . $prop->getDateTime()->format('U');
-                            $alarm'trigger' = $prop->getDateTime();
+                    case 'TRIGGER':
+                        foreach ($prop->parameters as $param) {
+                            if ($param->name == 'VALUE' && $param->getValue() == 'DATE-TIME') {
+                                $trigger = '@' . $prop->getDateTime()->format('U');
+                                $alarm'trigger' = $prop->getDateTime();
+                            } elseif ($param->name == 'RELATED') {
+                                $alarm'related' = $param->getValue();
+                            }
                         }
-                        else if ($param->name == 'RELATED') {
-                            $alarm'related' = $param->getValue();
+                        if (!$trigger && ($values = libcalendaring::parse_alarm_value($value))) {
+                            $trigger = $values2;
                         }
-                    }
-                    if (!$trigger && ($values = libcalendaring::parse_alarm_value($value))) {
-                        $trigger = $values2;
-                    }
 
-                    if (empty($alarm'trigger')) {
-                        $alarm'trigger' = rtrim(preg_replace('/(A-Z)0WDHMS/', '\\1', $value), 'T');
-                        // if all 0-values have been stripped, assume 'at time'
-                        if ($alarm'trigger' == 'P') {
-                            $alarm'trigger' = 'PT0S';
+                        if (empty($alarm'trigger')) {
+                            $alarm'trigger' = rtrim(preg_replace('/(A-Z)0WDHMS/', '\\1', $value), 'T');
+                            // if all 0-values have been stripped, assume 'at time'
+                            if ($alarm'trigger' == 'P') {
+                                $alarm'trigger' = 'PT0S';
+                            }
                         }
-                    }
-                    break;
-
-                case 'ACTION':
-                    $action = $alarm'action' = strtoupper($value);
-                    break;
-
-                case 'SUMMARY':
-                case 'DESCRIPTION':
-                case 'DURATION':
-                    $alarmstrtolower($prop->name) = self::convert_string($prop);
-                    break;
-
-                case 'REPEAT':
-                    $alarm'repeat' = intval($value);
-                    break;
-
-                case 'ATTENDEE':
-                    $alarm'attendees' = preg_replace('!^mailto:!i', '', $value);
-                    break;
-
-                case 'ATTACH':
-                    $params = self::parameters_array($prop);
-                    if (strlen($value) && (preg_match('/^a-z+:/', $value) || strtoupper($params'VALUE') == 'URI')) {
-                        // we only support URI-type of attachments here
-                        $alarm'uri' = $value;
-                    }
-                    break;
+                        break;
+
+                    case 'ACTION':
+                        $action = $alarm'action' = strtoupper($value);
+                        break;
+
+                    case 'SUMMARY':
+                    case 'DESCRIPTION':
+                    case 'DURATION':
+                        $alarmstrtolower($prop->name) = self::convert_string($prop);
+                        break;
+
+                    case 'REPEAT':
+                        $alarm'repeat' = intval($value);
+                        break;
+
+                    case 'ATTENDEE':
+                        $alarm'attendees' = preg_replace('!^mailto:!i', '', $value);
+                        break;
+
+                    case 'ATTACH':
+                        $params = self::parameters_array($prop);
+                        if (strlen($value) && (preg_match('/^a-z+:/', $value) || strtoupper($params'VALUE') == 'URI')) {
+                            // we only support URI-type of attachments here
+                            $alarm'uri' = $value;
+                        }
+                        break;
                 }
             }
 
@@ -721,15 +723,13 @@
         // assign current timezone to event start/end
         if (!empty($event'start') && $event'start' instanceof DateTimeInterface) {
             $this->_apply_timezone($event'start');
-        }
-        else {
+        } else {
             unset($event'start');
         }
 
         if (!empty($event'end') && $event'end' instanceof DateTimeInterface) {
             $this->_apply_timezone($event'end');
-        }
-        else {
+        } else {
             unset($event'end');
         }
 
@@ -741,7 +741,7 @@
         // T2531: Remember SCHEDULE-AGENT in custom property to properly
         // support event updates via CalDAV when SCHEDULE-AGENT=CLIENT is used
         if (isset($schedule_agent)) {
-            $event'x-custom' = array('SCHEDULE-AGENT', $schedule_agent);
+            $event'x-custom' = 'SCHEDULE-AGENT', $schedule_agent;
         }
 
         // minimal validation
@@ -754,6 +754,8 @@
 
     /**
      * Apply user timezone to DateTime object
+     *
+     * @param DateTime $date
      */
     private function _apply_timezone(&$date)
     {
@@ -767,8 +769,7 @@
             $dt->setDate($date->format('Y'), $date->format('n'), $date->format('j'));
             $dt->setTime($date->format('G'), $date->format('i'), 0);
             $date = $dt;
-        }
-        else {
+        } else {
             $date->setTimezone($this->timezone);
         }
     }
@@ -782,64 +783,65 @@
         $seen = ;
 
         foreach ($ve->children() as $prop) {
-            if (!($prop instanceof VObject\Property))
+            if (!($prop instanceof VObject\Property)) {
                 continue;
+            }
 
             $value = strval($prop);
 
             switch ($prop->name) {
-            case 'CREATED':
-            case 'LAST-MODIFIED':
-            case 'DTSTAMP':
-            case 'DTSTART':
-            case 'DTEND':
-                $propmap = 
-                    'DTSTART' => 'start',
-                    'DTEND' => 'end',
-                    'CREATED' => 'created',
-                    'LAST-MODIFIED' => 'changed',
-                    'DTSTAMP' => 'changed'
-                ;
-                $this->freebusy$propmap$prop->name = self::convert_datetime($prop);
-                break;
+                case 'CREATED':
+                case 'LAST-MODIFIED':
+                case 'DTSTAMP':
+                case 'DTSTART':
+                case 'DTEND':
+                    $propmap = 
+                        'DTSTART' => 'start',
+                        'DTEND' => 'end',
+                        'CREATED' => 'created',
+                        'LAST-MODIFIED' => 'changed',
+                        'DTSTAMP' => 'changed',
+                    ;
+                    $this->freebusy$propmap$prop->name = self::convert_datetime($prop);
+                    break;
 
-            case 'ORGANIZER':
-                $this->freebusy'organizer' = preg_replace('!^mailto:!i', '', $value);
-                break;
+                case 'ORGANIZER':
+                    $this->freebusy'organizer' = preg_replace('!^mailto:!i', '', $value);
+                    break;
 
-            case 'FREEBUSY':
-                // The freebusy component can hold more than 1 value, separated by commas.
-                $periods = explode(',', $value);
-                $fbtype = strval($prop'FBTYPE') ?: 'BUSY';
+                case 'FREEBUSY':
+                    // The freebusy component can hold more than 1 value, separated by commas.
+                    $periods = explode(',', $value);
+                    $fbtype = strval($prop'FBTYPE') ?: 'BUSY';
 
-                // skip dupes
-                if (!empty($seen$value.':'.$fbtype)) {
-                    break;
-                }
+                    // skip dupes
+                    if (!empty($seen$value . ':' . $fbtype)) {
+                        break;
+                    }
 
-                $seen$value.':'.$fbtype = true;
+                    $seen$value . ':' . $fbtype = true;
 
-                foreach ($periods as $period) {
-                    // Every period is formatted as start/end. The start is an
-                    // absolute UTC time, the end may be an absolute UTC time, or
-                    // duration (relative) value.
-                    list($busyStart, $busyEnd) = explode('/', $period);
+                    foreach ($periods as $period) {
+                        // Every period is formatted as start/end. The start is an
+                        // absolute UTC time, the end may be an absolute UTC time, or
+                        // duration (relative) value.
+                        $busyStart, $busyEnd = explode('/', $period);
 
-                    $busyStart = DateTimeParser::parse($busyStart);
-                    $busyEnd = DateTimeParser::parse($busyEnd);
-                    if ($busyEnd instanceof \DateInterval) {
-                        $tmp = clone $busyStart;
-                        $tmp->add($busyEnd);
-                        $busyEnd = $tmp;
-                    }
+                        $busyStart = DateTimeParser::parse($busyStart);
+                        $busyEnd = DateTimeParser::parse($busyEnd);
+                        if ($busyEnd instanceof \DateInterval) {
+                            $tmp = clone $busyStart;
+                            $busyEnd = $tmp->add($busyEnd);
+                        }
 
-                    if ($busyEnd && $busyEnd > $busyStart)
-                        $this->freebusy'periods' = $busyStart, $busyEnd, $fbtype;
-                }
-                break;
+                        if ($busyEnd && $busyEnd > $busyStart) {
+                            $this->freebusy'periods' = $busyStart, $busyEnd, $fbtype;
+                        }
+                    }
+                    break;
 
-            case 'COMMENT':
-                $this->freebusy'comment' = $value;
+                case 'COMMENT':
+                    $this->freebusy'comment' = $value;
             }
         }
 
@@ -881,76 +883,81 @@
                     $item->_dateonly = $dateonly;
                     $dt = $item;
                 }
-            }
-            else {
+            } else {
                 $dt = self::toDateTime($prop->getDateTime());
                 if (!$prop->hasTime()) {
                     $dt->_dateonly = true;
                 }
             }
-        }
-        else if ($prop instanceof VObject\Property\ICalendar\Period) {
+        } elseif ($prop instanceof VObject\Property\ICalendar\Period) {
             $dt = ;
             foreach ($prop->getParts() as $val) {
                 try {
-                    list($start, $end) = explode('/', $val);
-                    $start = DateTimeParser::parseDateTime($start);
+                    $start, $end = explode('/', $val);
+                    $start = self::toDateTime(DateTimeParser::parseDateTime($start));
 
                     // This is a duration value.
                     if ($end0 === 'P') {
                         $dur = DateTimeParser::parseDuration($end);
                         $end = clone $start;
                         $end->add($dur);
-                    }
-                    else {
-                        $end = DateTimeParser::parseDateTime($end);
+                    } else {
+                        $end = self::toDateTime(DateTimeParser::parseDateTime($end));
                     }
 
-                    $dt = self::toDateTime($start), self::toDateTime($end);
-                }
-                catch (Exception $e) {
+                    $dt = $start, $end;
+                } catch (Exception $e) {
                     // ignore single date parse errors
                 }
             }
-        }
-        else if ($prop instanceof \DateTimeInterface) {
+        } elseif ($prop instanceof \DateTimeInterface) {
             $dt = self::toDateTime($prop);
         }
 
         // force return value to array if requested
-        if ($as_array && !is_array($dt)) {
-            $dt = empty($dt) ?  : $dt;
+        if ($as_array) {
+            if (empty($dt)) {
+                return ;
+            }
+
+            return is_array($dt) ? $dt : $dt;
         }
 
-        return $dt;
+        return $dt ?? null;
     }
 
 
     /**
      * Create a Sabre\VObject\Property instance from a PHP DateTime object
      *
-     * @param object  VObject\Document parent node to create property for
-     * @param string  Property name
-     * @param object  DateTime
-     * @param boolean Set as UTC date
-     * @param boolean Set as VALUE=DATE property
+     * @param VObject\Document $cal      Parent node to create property for
+     * @param string           $name     Property name
+     * @param DateTime         $dt       Date time object
+     * @param bool             $utc      Set as UTC date
+     * @param bool             $dateonly Set as VALUE=DATE property
+     *
+     * @return VObject\Property
      */
     public function datetime_prop($cal, $name, $dt, $utc = false, $dateonly = null, $set_type = false)
     {
-        if ($utc) {
-            $dt->setTimeZone(new \DateTimeZone('UTC'));
-            $is_utc = true;
-        }
-        else {
-            $is_utc = ($tz = $dt->getTimezone()) && in_array($tz->getName(), array('UTC','GMT','Z'));
+        $tz = null;
+        $is_utc = false;
+
+        if ($dt) {
+            if ($utc) {
+                $dt->setTimeZone(new DateTimeZone('UTC'));
+                $is_utc = true;
+            } else {
+                $is_utc = ($tz = $dt->getTimezone()) && in_array($tz->getName(), 'UTC','GMT','Z');
+            }
         }
-        $is_dateonly = $dateonly === null ? !empty($dt->_dateonly) : (bool) $dateonly;
+
+        $is_dateonly = $dateonly === null && $dt ? !empty($dt->_dateonly) : (bool) $dateonly;
         $vdt = $cal->createProperty($name, $dt, null, $is_dateonly ? 'DATE' : 'DATE-TIME');
 
         if ($is_dateonly) {
             $vdt'VALUE' = 'DATE';
-        }
-        else if ($set_type) {
+        } elseif ($set_type) {
             $vdt'VALUE' = 'DATE-TIME';
         }
 
@@ -960,9 +967,8 @@
             if (!empty($this->vtimezones$tzname)) {
                 $this->vtimezones$tzname0 = min($this->vtimezones$tzname0, $ts);
                 $this->vtimezones$tzname1 = max($this->vtimezones$tzname1, $ts);
-            }
-            else {
-                $this->vtimezones$tzname = array($ts, $ts);
+            } else {
+                $this->vtimezones$tzname = $ts, $ts;
             }
         }
 
@@ -974,10 +980,11 @@
      */
     public static function map_keys($values, $map)
     {
-        $out = array();
+        $out = ;
         foreach ($map as $from => $to) {
-            if (isset($values$from))
-                $out$to = is_array($values$from) ? join(',', $values$from) : $values$from;
+            if (isset($values$from)) {
+                $out$to = is_array($values$from) ? implode(',', $values$from) : $values$from;
+            }
         }
         return $out;
     }
@@ -987,36 +994,36 @@
      */
     private static function parameters_array($prop)
     {
-        $params = array();
+        $params = ;
         foreach ($prop->parameters() as $name => $value) {
             $paramsstrtoupper($name) = strval($value);
         }
         return $params;
     }
 
-
     /**
      * Export events to iCalendar format
      *
-     * @param  array   Events as array
-     * @param  string  VCalendar method to advertise
-     * @param  boolean Directly send data to stdout instead of returning
-     * @param  callable Callback function to fetch attachment contents, false if no attachment export
-     * @param  boolean Add VTIMEZONE block with timezone definitions for the included events
-     * @return string  Events in iCalendar format (http://tools.ietf.org/html/rfc5545)
+     * @param array     $objects        Events as array
+     * @param ?string   $method         VCalendar method to advertise
+     * @param bool      $write          Directly send data to stdout instead of returning
+     * @param ?callable $get_attachment Optional callback function to fetch attachment contents
+     * @param bool      $with_timezones Add VTIMEZONE block with timezone definitions for the included events
+     *
+     * @return string|true Events in iCalendar format (http://tools.ietf.org/html/rfc5545)
      */
-    public function export($objects, $method = null, $write = false, $get_attachment = false, $with_timezones = true)
+    public function export($objects, $method = null, $write = false, $get_attachment = null, $with_timezones = true)
     {
         $this->method = $method;
 
         // encapsulate in VCALENDAR container
         $vcal = new VObject\Component\VCalendar();
-        $vcal->VERSION = '2.0';
-        $vcal->PRODID = $this->prodid;
-        $vcal->CALSCALE = 'GREGORIAN';
+        $vcal->VERSION = '2.0'; // @phpstan-ignore-line
+        $vcal->PRODID = $this->prodid; // @phpstan-ignore-line
+        $vcal->CALSCALE = 'GREGORIAN'; // @phpstan-ignore-line
 
         if (!empty($method)) {
-            $vcal->METHOD = $method;
+            $vcal->METHOD = $method; // @phpstan-ignore-line
         }
 
         // write vcalendar header
@@ -1025,7 +1032,7 @@
         }
 
         foreach ($objects as $object) {
-            $this->_to_ical($object, !$write?$vcal:false, $get_attachment);
+            $this->_to_ical($object, !$write ? $vcal : false, $get_attachment);
         }
 
         // include timezone information
@@ -1038,8 +1045,7 @@
 
                 if ($write) {
                     echo $vt->serialize();
-                }
-                else {
+                } else {
                     $vcal->add($vt);
                 }
             }
@@ -1049,20 +1055,19 @@
             echo "END:VCALENDAR\r\n";
             return true;
         }
-        else {
-            return $vcal->serialize();
-        }
+
+        return $vcal->serialize();
     }
 
     /**
      * Converts internal event representation to Sabre component
      *
-     * @param  array    Event
-     * @param  callable Callback function to fetch attachment contents, false if no attachment export
+     * @param array     $object         Event
+     * @param ?callable $get_attachment Optional callback function to fetch attachment contents
      *
-     * @return Sabre\VObject\Component\VEvent Sabre component
+     * @return VObject\Component Sabre component
      */
-    public function toSabreComponent($object, $get_attachment = false)
+    public function toSabreComponent($object, $get_attachment = null)
     {
         $vcal = new VObject\Component\VCalendar();
 
@@ -1074,10 +1079,10 @@
     /**
      * Build a valid iCal format block from the given event
      *
-     * @param  array    Hash array with event/task properties from libkolab
-     * @param  object   VCalendar object to append event to or false for directly sending data to stdout
-     * @param  callable Callback function to fetch attachment contents, false if no attachment export
-     * @param  object   RECURRENCE-ID property when serializing a recurrence exception
+     * @param array                       $event          Hash array with event/task properties from libkolab
+     * @param VObject\Component\VCalendar $vcal VCalendar object to append event to or false for directly sending data to stdout
+     * @param ?callable                   $get_attachment Optional callback function to fetch attachment contents
+     * @param VObject\Property            $recurrence_id  RECURRENCE-ID property when serializing a recurrence exception
      */
     private function _to_ical($event, $vcal, $get_attachment, $recurrence_id = null)
     {
@@ -1088,7 +1093,7 @@
         $ve->UID = $event'uid';
 
         // set DTSTAMP according to RFC 5545, 3.8.7.2.
-        $dtstamp = !empty($event'changed') && empty($this->method) ? $event'changed' : new DateTime('now', new \DateTimeZone('UTC'));
+        $dtstamp = !empty($event'changed') && empty($this->method) ? $event'changed' : new DateTime('now', new DateTimeZone('UTC'));
         $ve->DTSTAMP = $this->datetime_prop($cal, 'DTSTAMP', $dtstamp, true);
 
         // all-day events end the next day
@@ -1134,7 +1139,7 @@
         }
 
         if (!empty($event'description')) {
-            $ve->add('DESCRIPTION', strtr($event'description', array("\r\n" => "\n", "\r" => "\n"))); // normalize line endings
+            $ve->add('DESCRIPTION', strtr($event'description', "\r\n" => "\n", "\r" => "\n")); // normalize line endings
         }
 
         if (isset($event'sequence')) {
@@ -1193,14 +1198,11 @@
 
         if (!empty($event'cancelled')) {
             $ve->add('STATUS', 'CANCELLED');
-        }
-        else if (!empty($event'free_busy') && $event'free_busy' == 'tentative') {
+        } elseif (!empty($event'free_busy') && $event'free_busy' == 'tentative') {
             $ve->add('STATUS', 'TENTATIVE');
-        }
-        else if (!empty($event'complete') && $event'complete' == 100) {
+        } elseif (!empty($event'complete') && $event'complete' == 100) {
             $ve->add('STATUS', 'COMPLETED');
-        }
-        else if (!empty($event'status')) {
+        } elseif (!empty($event'status')) {
             $ve->add('STATUS', $event'status');
         }
 
@@ -1223,9 +1225,8 @@
                 $va->action = $alarm'action';
                 if ($alarm'trigger' instanceof DateTimeInterface) {
                     $va->add($this->datetime_prop($cal, 'TRIGGER', $alarm'trigger', true, null, true));
-                }
-                else {
-                    $alarm_props = array();
+                } else {
+                    $alarm_props = ;
                     if (!empty($alarm'related') && strtoupper($alarm'related') == 'END') {
                         $alarm_props'RELATED' = 'END';
                     }
@@ -1250,20 +1251,19 @@
                     $va->add('REPEAT', !empty($alarm'repeat') ? intval($alarm'repeat') : 0);
                 }
                 if (!empty($alarm'uri')) {
-                    $va->add('ATTACH', $alarm'uri', array('VALUE' => 'URI'));
+                    $va->add('ATTACH', $alarm'uri', 'VALUE' => 'URI');
                 }
                 $ve->add($va);
             }
         }
         // legacy support
-        else if (!empty($event'alarms')) {
+        elseif (!empty($event'alarms')) {
             $va = $cal->createComponent('VALARM');
-            list($trigger, $va->action) = explode(':', $event'alarms');
+            $trigger, $va->action = explode(':', $event'alarms');
             $val = libcalendaring::parse_alarm_value($trigger);
             if (!empty($val3)) {
                 $va->add('TRIGGER', $val3);
-            }
-            else if ($val0 instanceof DateTimeInterface) {
+            } elseif ($val0 instanceof DateTimeInterface) {
                 $va->add($this->datetime_prop($cal, 'TRIGGER', $val0, true, null, true));
             }
             $ve->add($va);
@@ -1281,10 +1281,10 @@
         if (!empty($event'attendees')) {
             foreach ((array) $event'attendees' as $attendee) {
                 if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
-                    if (empty($event'organizer'))
+                    if (empty($event'organizer')) {
                         $event'organizer' = $attendee;
-                }
-                else if (!empty($attendee'email')) {
+                    }
+                } elseif (!empty($attendee'email')) {
                     if (isset($attendee'rsvp')) {
                         $attendee'rsvp' = $attendee'rsvp' ? 'TRUE' : null;
                     }
@@ -1320,7 +1320,7 @@
         }
 
         if (!empty($event'parent_id')) {
-            $ve->add('RELATED-TO', $event'parent_id', array('RELTYPE' => 'PARENT'));
+            $ve->add('RELATED-TO', $event'parent_id', 'RELTYPE' => 'PARENT');
         }
 
         if (!empty($event'comment')) {
@@ -1334,7 +1334,7 @@
             foreach ((array) $event'attachments' as $idx => $attach) {
                 // check available memory and skip attachment export if we can't buffer it
                 // @todo: use rcube_utils::mem_check()
-                if (is_callable($get_attachment) && $memory_limit > 0 && ($memory_used = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024)
+                if (is_callable($get_attachment) && $memory_limit > 0 && ($memory_used = function_exists('memory_get_usage') ? memory_get_usage() : 16 * 1024 * 1024)
                     && !empty($attach'size') && $memory_used + $attach'size' * 3 > $memory_limit
                 ) {
                     continue;
@@ -1343,7 +1343,8 @@
                 // embed attachments using the given callback function
                 if (is_callable($get_attachment) && ($data = call_user_func($get_attachment, $attach'id' ?? $idx, $event))) {
                     // embed attachments for iCal
-                    $ve->add('ATTACH',
+                    $ve->add(
+                        'ATTACH',
                         $data,
                         array_filter(
                                 'VALUE'    => 'BINARY',
@@ -1356,8 +1357,9 @@
                     unset($data);  // attempt to free memory
                 }
                 // list attachments as absolute URIs
-                else if (!empty($this->attach_uri)) {
-                    $ve->add('ATTACH',
+                elseif (!empty($this->attach_uri)) {
+                    $ve->add(
+                        'ATTACH',
                         strtr($this->attach_uri, 
                             '{{id}}'       => urlencode($attach'id' ?? $idx),
                             '{{name}}'     => urlencode($attach'name'),
@@ -1385,8 +1387,7 @@
         // append to vcalendar container
         if ($vcal) {
             $vcal->add($ve);
-        }
-        else {   // serialize and send to stdout
+        } else {   // serialize and send to stdout
             echo $ve->serialize();
         }
 
@@ -1410,35 +1411,39 @@
      * Returns a VTIMEZONE component for a Olson timezone identifier
      * with daylight transitions covering the given date range.
      *
-     * @param string Timezone ID as used in PHP's Date functions
-     * @param integer Unix timestamp with first date/time in this timezone
-     * @param integer Unix timestap with last date/time in this timezone
-     * @param VObject\Component\VCalendar Optional VCalendar component
+     * @param string $tzid Timezone ID as used in PHP's Date functions
+     * @param int    $from Unix timestamp with first date/time in this timezone
+     * @param int    $to   Unix timestap with last date/time in this timezone
+     * @param VObject\Component\VCalendar $cal Optional VCalendar component
      *
-     * @return mixed A Sabre\VObject\Component object representing a VTIMEZONE definition
-     *               or false if no timezone information is available
+     * @return VObject\Component|false Object representing a VTIMEZONE definition
+     *                                 or false if no timezone information is available
      */
     public static function get_vtimezone($tzid, $from = 0, $to = 0, $cal = null)
     {
         // TODO: Consider using tzurl.org database for better interoperability e.g. with Outlook
 
-        if (!$from) $from = time();
-        if (!$to)   $to = $from;
-        if (!$cal)  $cal = new VObject\Component\VCalendar();
+        if (!$from) {
+            $from = time();
+        }
+        if (!$to) {
+            $to = $from;
+        }
+        if (!$cal) {
+            $cal = new VObject\Component\VCalendar();
+        }
 
         if (is_string($tzid)) {
             try {
-                $tz = new \DateTimeZone($tzid);
+                $tz = new DateTimeZone($tzid);
+            } catch (Exception $e) {
+                // do nothing
             }
-            catch (\Exception $e) {
-                return false;
-            }
-        }
-        else if (is_a($tzid, '\\DateTimeZone')) {
+        } elseif ($tzid instanceof DateTimeZone) {
             $tz = $tzid;
         }
 
-        if (empty($tz) || !is_a($tz, '\\DateTimeZone')) {
+        if (empty($tz) || !$tz instanceof DateTimeZone) {
             return false;
         }
 
@@ -1459,10 +1464,11 @@
         $vt = $cal->createComponent('VTIMEZONE');
         $vt->TZID = $tz->getName();
 
-        $std = null; $dst = null;
-        foreach ($transitions as $i => $trans) {
-            $cmp = null;
+        $std = null;
+        $dst = null;
+        $t_dst = $t_std = 0;
 
+        foreach ($transitions as $i => $trans) {
             if (!isset($tzfrom)) {
                 $tzfrom = $trans'offset' / 3600;
                 continue;
@@ -1472,29 +1478,27 @@
                 $t_dst = $trans'ts';
                 $dst = $cal->createComponent('DAYLIGHT');
                 $cmp = $dst;
-            }
-            else {
+            } else {
                 $t_std = $trans'ts';
                 $std = $cal->createComponent('STANDARD');
                 $cmp = $std;
             }
 
-            if ($cmp) {
-                $dt = new DateTime($trans'time');
-                $offset = $trans'offset' / 3600;
+            // FIXME: Imho $trans'time' is UTC, shouldn't we consider timezone offset for DTSTART below?
+            $dt = new DateTime($trans'time');
+            $offset = $trans'offset' / 3600;
 
-                $cmp->DTSTART = $dt->format('Ymd\THis');
-                $cmp->TZOFFSETFROM = sprintf('%+03d%02d', floor($tzfrom), ($tzfrom - floor($tzfrom)) * 60);
-                $cmp->TZOFFSETTO   = sprintf('%+03d%02d', floor($offset), ($offset - floor($offset)) * 60);
+            $cmp->DTSTART = $dt->format('Ymd\THis');
+            $cmp->TZOFFSETFROM = sprintf('%+03d%02d', floor($tzfrom), ($tzfrom - floor($tzfrom)) * 60);
+            $cmp->TZOFFSETTO = sprintf('%+03d%02d', floor($offset), ($offset - floor($offset)) * 60);
 
-                if (!empty($trans'abbr')) {
-                    $cmp->TZNAME = $trans'abbr';
-                }
-
-                $tzfrom = $offset;
-                $vt->add($cmp);
+            if (!empty($trans'abbr')) {
+                $cmp->TZNAME = $trans'abbr';
             }
 
+            $tzfrom = $offset;
+            $vt->add($cmp);
+
             // we covered the entire date range
             if ($std && $dst && min($t_std, $t_dst) < $from && max($t_std, $t_dst) > $to) {
                 break;
@@ -1512,6 +1516,8 @@
 
     /**
      * Convert DateTime into libcalendaring_datetime
+     *
+     * @return libcalendaring_datetime
      */
     private static function toDateTime($date)
     {
@@ -1526,19 +1532,19 @@
     /*** Implement PHP 5 Iterator interface to make foreach work ***/
 
     #\ReturnTypeWillChange
-    function current()
+    public function current()
     {
         return $this->objects$this->iteratorkey;
     }
 
     #\ReturnTypeWillChange
-    function key()
+    public function key()
     {
         return $this->iteratorkey;
     }
 
     #\ReturnTypeWillChange
-    function next()
+    public function next()
     {
         $this->iteratorkey++;
 
@@ -1546,22 +1552,19 @@
         if (empty($this->objects$this->iteratorkey) && $this->fp) {
             $this->_parse_next(true);
         }
-
-        return $this->valid();
     }
 
     #\ReturnTypeWillChange
-    function rewind()
+    public function rewind()
     {
         $this->iteratorkey = 0;
     }
 
     #\ReturnTypeWillChange
-    function valid()
+    public function valid()
     {
         return !empty($this->objects$this->iteratorkey);
     }
-
 }

roundcubemail-1.5.tar.gz/plugins/libcalendaring/libcalendaring.php Changed

@@ -37,27 +37,30 @@
     public $dst_active;
     public $timezone_offset;
     public $ical_parts = ;
+
+    /** @var ?rcube_message Email message */
     public $ical_message;
 
-    public $defaults = array(
-        'calendar_date_format'  => "Y-m-d",
-        'calendar_date_short'   => "M-j",
-        'calendar_date_long'    => "F j Y",
-        'calendar_date_agenda'  => "l M-d",
-        'calendar_time_format'  => "H:m",
+    /** @var array Configuration defaults */
+    public $defaults = 
+        'calendar_date_format'  => 'Y-m-d',
+        'calendar_date_short'   => 'M-j',
+        'calendar_date_long'    => 'F j Y',
+        'calendar_date_agenda'  => 'l M-d',
+        'calendar_time_format'  => 'H:m',
         'calendar_first_day'    => 1,
         'calendar_first_hour'   => 6,
-        'calendar_date_format_sets' => array(
-            'Y-m-d' => array('d M Y',   'm-d',  'l m-d'),
-            'Y/m/d' => array('d M Y',   'm/d',  'l m/d'),
-            'Y.m.d' => array('d M Y',   'm.d',  'l m.d'),
-            'd-m-Y' => array('d M Y',   'd-m',  'l d-m'),
-            'd/m/Y' => array('d M Y',   'd/m',  'l d/m'),
-            'd.m.Y' => array('d M Y',  'd.m',  'l d.m'),
-            'j.n.Y' => array('d M Y',  'd.m',  'l d.m'),
-            'm/d/Y' => array('M d Y',   'm/d',  'l m/d'),
-        ),
-    );
+        'calendar_date_format_sets' => 
+            'Y-m-d' => 'd M Y', 'm-d', 'l m-d',
+            'Y/m/d' => 'd M Y', 'm/d', 'l m/d',
+            'Y.m.d' => 'd M Y', 'm.d', 'l m.d',
+            'd-m-Y' => 'd M Y', 'd-m', 'l d-m',
+            'd/m/Y' => 'd M Y', 'd/m', 'l d/m',
+            'd.m.Y' => 'd M Y', 'd.m', 'l d.m',
+            'j.n.Y' => 'd M Y', 'd.m', 'l d.m',
+            'm/d/Y' => 'M d Y', 'm/d', 'l m/d',
+        ,
+    ;
 
     private static $instance;
 
@@ -86,8 +89,7 @@
         // set user's timezone
         try {
             $this->timezone = new DateTimeZone($this->rc->config->get('timezone', 'GMT'));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->timezone = new DateTimeZone('GMT');
         }
 
@@ -117,13 +119,13 @@
         // include client scripts and styles
         if ($this->rc->output) {
             // add hook to display alarms
-            $this->add_hook('refresh', array($this, 'refresh'));
-            $this->register_action('plugin.alarms', array($this, 'alarms_action'));
-            $this->register_action('plugin.expand_attendee_group', array($this, 'expand_attendee_group'));
+            $this->add_hook('refresh', $this, 'refresh');
+            $this->register_action('plugin.alarms', $this, 'alarms_action');
+            $this->register_action('plugin.expand_attendee_group', $this, 'expand_attendee_group');
         }
 
         // proceed initialization in startup hook
-        $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('startup', $this, 'startup');
     }
 
     /**
@@ -137,24 +139,39 @@
             $this->include_stylesheet($this->local_skin_path() . '/libcal.css');
 
             $this->add_label(
-                'itipaccepted', 'itiptentative', 'itipdeclined',
-                'itipdelegated', 'expandattendeegroup', 'expandattendeegroupnodata',
-                'statusorganizer', 'statusaccepted', 'statusdeclined',
-                'statusdelegated', 'statusunknown', 'statusneeds-action',
-                'statustentative', 'statuscompleted', 'statusin-process',
-                'delegatedto', 'delegatedfrom', 'showmore', 'savein'
+                'itipaccepted',
+                'itiptentative',
+                'itipdeclined',
+                'itipdelegated',
+                'expandattendeegroup',
+                'expandattendeegroupnodata',
+                'statusorganizer',
+                'statusaccepted',
+                'statusdeclined',
+                'statusdelegated',
+                'statusunknown',
+                'statusneeds-action',
+                'statustentative',
+                'statuscompleted',
+                'statusin-process',
+                'delegatedto',
+                'delegatedfrom',
+                'showmore',
+                'savein'
             );
         }
 
         if (($args'task' ?? null) == 'mail') {
             if ($args'action' == 'show' || $args'action' == 'preview') {
-                $this->add_hook('message_load', array($this, 'mail_message_load'));
+                $this->add_hook('message_load', $this, 'mail_message_load');
             }
         }
     }
 
     /**
      * Load iCalendar functions
+     *
+     * @return libcalendaring_vcalendar iCal parser
      */
     public static function get_ical()
     {
@@ -181,22 +198,21 @@
     }
 
     /**
-     * Shift dates into user's current timezone
+     * Shift dates into user's current timezone.
      *
-     * @param mixed Any kind of a date representation (DateTime object, string or unix timestamp)
+     * @param mixed $dt Any kind of a date representation (DateTime object, string or unix timestamp)
      *
-     * @return object DateTime object in user's timezone
+     * @return DateTime DateTime object in user's timezone
      */
     public function adjust_timezone($dt, $dateonly = false)
     {
         if (is_numeric($dt)) {
-            $dt = new DateTime('@'.$dt);
-        }
-        else if (is_string($dt)) {
+            $dt = new DateTime('@' . $dt);
+        } elseif (is_string($dt)) {
             $dt = rcube_utils::anytodatetime($dt);
         }
 
-        if ($dt instanceof DateTimeInterface && empty($dt->_dateonly) && !$dateonly) {
+        if ($dt instanceof DateTime && empty($dt->_dateonly) && !$dateonly) {
             $dt = $dt->setTimezone($this->timezone);
         }
 
@@ -210,8 +226,8 @@
     {
         $this->date_format_defaults();
 
-        $settings = array();
-        $keys     = array('date_format', 'time_format', 'date_short', 'date_long', 'date_agenda');
+        $settings = ;
+        $keys     = 'date_format', 'time_format', 'date_short', 'date_long', 'date_agenda';
 
         foreach ($keys as $key) {
             $settings$key = (string)$this->rc->config->get('calendar_' . $key, $this->defaults'calendar_' . $key);
@@ -224,34 +240,34 @@
         $settings'dst'         = $this->dst_active;
 
         // localization
-        $settings'days' = array(
+        $settings'days' = 
             $this->rc->gettext('sunday'),   $this->rc->gettext('monday'),
             $this->rc->gettext('tuesday'),  $this->rc->gettext('wednesday'),
             $this->rc->gettext('thursday'), $this->rc->gettext('friday'),
-            $this->rc->gettext('saturday')
-        );
-        $settings'days_short' = array(
+            $this->rc->gettext('saturday'),
+        ;
+        $settings'days_short' = 
             $this->rc->gettext('sun'), $this->rc->gettext('mon'),
             $this->rc->gettext('tue'), $this->rc->gettext('wed'),
             $this->rc->gettext('thu'), $this->rc->gettext('fri'),
-            $this->rc->gettext('sat')
-        );
-        $settings'months' = array(
+            $this->rc->gettext('sat'),
+        ;
+        $settings'months' = 
             $this->rc->gettext('longjan'), $this->rc->gettext('longfeb'),
             $this->rc->gettext('longmar'), $this->rc->gettext('longapr'),
             $this->rc->gettext('longmay'), $this->rc->gettext('longjun'),
             $this->rc->gettext('longjul'), $this->rc->gettext('longaug'),
             $this->rc->gettext('longsep'), $this->rc->gettext('longoct'),
-            $this->rc->gettext('longnov'), $this->rc->gettext('longdec')
-        );
-        $settings'months_short' = array(
+            $this->rc->gettext('longnov'), $this->rc->gettext('longdec'),
+        ;
+        $settings'months_short' = 
             $this->rc->gettext('jan'), $this->rc->gettext('feb'),
             $this->rc->gettext('mar'), $this->rc->gettext('apr'),
             $this->rc->gettext('may'), $this->rc->gettext('jun'),
             $this->rc->gettext('jul'), $this->rc->gettext('aug'),
             $this->rc->gettext('sep'), $this->rc->gettext('oct'),
-            $this->rc->gettext('nov'), $this->rc->gettext('dec')
-        );
+            $this->rc->gettext('nov'), $this->rc->gettext('dec'),
+        ;
         $settings'today' = $this->rc->gettext('today');
 
         return $settings;
@@ -263,20 +279,23 @@
      */
     private function date_format_defaults()
     {
-        static $defaults = array();
+        static $defaults = ;
 
         // nothing to be done
-        if (isset($defaults'date_format'))
-          return;
+        if (isset($defaults'date_format')) {
+            return;
+        }
 
         $defaults'date_format' = $this->rc->config->get('calendar_date_format', $this->rc->config->get('date_format'));
         $defaults'time_format' = $this->rc->config->get('calendar_time_format', $this->rc->config->get('time_format'));
 
         // override defaults
-        if ($defaults'date_format')
+        if ($defaults'date_format') {
             $this->defaults'calendar_date_format' = $defaults'date_format';
-        if ($defaults'time_format')
+        }
+        if ($defaults'time_format') {
             $this->defaults'calendar_time_format' = $defaults'time_format';
+        }
 
         // derive format variants from basic date format
         $format_sets = $this->rc->config->get('calendar_date_format_sets', $this->defaults'calendar_date_format_sets');
@@ -342,12 +361,10 @@
             if (($todate = $formatDate($event'end', $date_format)) != $fromto) {
                 $fromto .= ' - ' . $todate;
             }
-        }
-        else if ($event'start'->format('Ymd') === $event'end'->format('Ymd')) {
+        } elseif ($event'start'->format('Ymd') === $event'end'->format('Ymd')) {
             $fromto = $formatDate($event'start', $date_format) . ' ' . $formatDate($event'start', $time_format) .
                 ' - ' . $formatDate($event'end', $time_format);
-        }
-        else {
+        } else {
             $fromto = $formatDate($event'start', $date_format) . ' ' . $formatDate($event'start', $time_format) .
                 ' - ' . $formatDate($event'end', $date_format) . ' ' . $formatDate($event'end', $time_format);
         }
@@ -368,12 +385,12 @@
     {
         unset($attrib'name');
 
-        $input_value    = new html_inputfield(array('name' => 'alarmvalue', 'class' => 'edit-alarm-value form-control', 'size' => 3));
-        $input_date     = new html_inputfield(array('name' => 'alarmdate', 'class' => 'edit-alarm-date form-control', 'size' => 10));
-        $input_time     = new html_inputfield(array('name' => 'alarmtime', 'class' => 'edit-alarm-time form-control', 'size' => 6));
-        $select_type    = new html_select(array('name' => 'alarmtype', 'class' => 'edit-alarm-type form-control', 'id' => $attrib'id'));
-        $select_offset  = new html_select(array('name' => 'alarmoffset', 'class' => 'edit-alarm-offset form-control'));
-        $select_related = new html_select(array('name' => 'alarmrelated', 'class' => 'edit-alarm-related form-control'));
+        $input_value    = new html_inputfield('name' => 'alarmvalue', 'class' => 'edit-alarm-value form-control', 'size' => 3);
+        $input_date     = new html_inputfield('name' => 'alarmdate', 'class' => 'edit-alarm-date form-control', 'size' => 10);
+        $input_time     = new html_inputfield('name' => 'alarmtime', 'class' => 'edit-alarm-time form-control', 'size' => 6);
+        $select_type    = new html_select('name' => 'alarmtype', 'class' => 'edit-alarm-type form-control', 'id' => $attrib'id');
+        $select_offset  = new html_select('name' => 'alarmoffset', 'class' => 'edit-alarm-offset form-control');
+        $select_related = new html_select('name' => 'alarmrelated', 'class' => 'edit-alarm-related form-control');
         $object_type    = !empty($attrib'_type') ? $attrib'_type' : 'event';
 
         $select_type->add($this->gettext('none'), '');
@@ -381,7 +398,7 @@
             $select_type->add($this->gettext(strtolower("alarm{$type}option")), $type);
         }
 
-        foreach (array('-M','-H','-D','+M','+H','+D') as $trigger) {
+        foreach ('-M','-H','-D','+M','+H','+D' as $trigger) {
             $select_offset->add($this->gettext('trigger' . $trigger), $trigger);
         }
 
@@ -395,11 +412,13 @@
 
         // pre-set with default values from user settings
         $preset = self::parse_alarm_value($this->rc->config->get('calendar_default_alarm_offset', '-15M'));
-        $hidden = array('style' => 'display:none');
+        $hidden = 'style' => 'display:none';
 
-        return html::span('edit-alarm-set',
+        return html::span(
+            'edit-alarm-set',
             $select_type->show($this->rc->config->get('calendar_default_alarm_type', '')) . ' ' .
-            html::span(array('class' => 'edit-alarm-values input-group', 'style' => 'display:none'),
+            html::span(
+                'class' => 'edit-alarm-values input-group', 'style' => 'display:none',
                 $input_value->show($preset0) . ' ' .
                 $select_offset->show($preset1) . ' ' .
                 $select_related->show() . ' ' .
@@ -412,13 +431,13 @@
     /**
      * Get a list of email addresses of the given user (from login and identities)
      *
-     * @param string User Email (default to current user)
+     * @param string $user User Email (default to current user)
      *
      * @return array Email addresses related to the user
      */
     public function get_user_emails($user = null)
     {
-        static $_emails = array();
+        static $_emails = ;
 
         if (empty($user)) {
             $user = $this->rc->user->get_username();
@@ -429,8 +448,8 @@
             return $_emails$user;
         }
 
-        $emails = array($user);
-        $plugin = $this->rc->plugins->exec_hook('calendar_user_emails', array('emails' => $emails));
+        $emails = $user;
+        $plugin = $this->rc->plugins->exec_hook('calendar_user_emails', 'emails' => $emails);
         $emails = array_map('strtolower', $plugin'emails');
 
         // add all emails from the current user's identities
@@ -452,7 +471,7 @@
      * @param string $status    The PARTSTAT value to set
      * @param bool   $recursive Recurive call
      *
-     * @return mixed Email address of the updated attendee or False if none matching found
+     * @return string|false Email address of the updated attendee or False if none matching found
      */
     public function set_partstat(&$event, $status, $recursive = true)
     {
@@ -489,26 +508,36 @@
     public static function parse_alarm_value($val)
     {
         if ($val0 == '@') {
-            return array(new DateTime($val));
+            return new DateTime($val);
         }
-        else if (preg_match('/(+-?)P?(T?\d+HMSDW)+/', $val, $m) && preg_match_all('/T?(\d+)(HMSDW)/', $val, $m2, PREG_SET_ORDER)) {
-            if ($m1 == '')
+
+        if (preg_match('/(+-?)P?(T?\d+HMSDW)+/', $val, $m) && preg_match_all('/T?(\d+)(HMSDW)/', $val, $m2, PREG_SET_ORDER)) {
+            if ($m1 == '') {
                 $m1 = '+';
+            }
+
+            $prefix = '';
             foreach ($m2 as $seg) {
                 $prefix = $seg2 == 'D' || $seg2 == 'W' ? 'P' : 'PT';
+
                 if ($seg1 > 0) {  // ignore zero values
                     // convert seconds to minutes
                     if ($seg2 == 'S') {
                         $seg2 = 'M';
-                        $seg1 = max(1, round($seg1/60));
+                        $seg1 = max(1, round(intval($seg1) / 60));
                     }
 
-                    return array($seg1, $m1.$seg2, $m1.$seg1.$seg2, $m1.$prefix.$seg1.$seg2);
+                    return $seg1, $m1 . $seg2, $m1 . $seg1 . $seg2, $m1 . $prefix . $seg1 . $seg2;
                 }
             }
 
             // return zero value nevertheless
-            return array($seg1, $m1.$seg2, $m1.$seg1.$seg2, $m1.$prefix.$seg1.$seg2);
+            return 
+                $seg1 ?? null,
+                $m1 . ($seg2 ?? ''),
+                $m1 . ($seg1 ?? '') . ($seg2 ?? ''),
+                $m1 . $prefix . ($seg1 ?? '') . ($seg2 ?? ''),
+            ;
         }
 
         return false;
@@ -519,11 +548,10 @@
      */
     public static function to_client_alarms($valarms)
     {
-        return array_map(function($alarm) {
+        return array_map(function ($alarm) {
             if ($alarm'trigger' instanceof DateTimeInterface) {
                 $alarm'trigger' = '@' . $alarm'trigger'->format('U');
-            }
-            else if ($trigger = libcalendaring::parse_alarm_value($alarm'trigger')) {
+            } elseif ($trigger = libcalendaring::parse_alarm_value($alarm'trigger')) {
                 $alarm'trigger' = $trigger2;
             }
             return $alarm;
@@ -535,15 +563,14 @@
      */
     public static function from_client_alarms($valarms)
     {
-        return array_map(function($alarm){
+        return array_map(function ($alarm) {
             if ($alarm'trigger'0 == '@') {
                 try {
                     $alarm'trigger' = new DateTime($alarm'trigger');
                     $alarm'trigger'->setTimezone(new DateTimeZone('UTC'));
+                } catch (Exception $e) { /* handle this ? */
                 }
-                catch (Exception $e) { /* handle this ? */ }
-            }
-            else if ($trigger = libcalendaring::parse_alarm_value($alarm'trigger')) {
+            } elseif ($trigger = libcalendaring::parse_alarm_value($alarm'trigger')) {
                 $alarm'trigger' = $trigger3;
             }
             return $alarm;
@@ -556,15 +583,15 @@
     public static function alarms_text($alarms)
     {
         if (is_array($alarms) && is_array($alarms0)) {
-            $texts = array();
+            $texts = ;
             foreach ($alarms as $alarm) {
-                if ($text = self::alarm_text($alarm))
+                if ($text = self::alarm_text($alarm)) {
                     $texts = $text;
+                }
             }
 
-            return join(', ', $texts);
-        }
-        else {
+            return implode(', ', $texts);
+        } else {
             return self::alarm_text($alarms);
         }
     }
@@ -577,9 +604,8 @@
         $related = null;
 
         if (is_string($alarm)) {
-            list($trigger, $action) = explode(':', $alarm);
-        }
-        else {
+            $trigger, $action = explode(':', $alarm);
+        } else {
             $trigger = $alarm'trigger';
             $action  = $alarm'action';
 
@@ -589,44 +615,40 @@
         }
 
         $text  = '';
-        $rcube = rcube::get_instance();
+        $rcube = rcmail::get_instance();
 
         switch ($action) {
-        case 'EMAIL':
-            $text = $rcube->gettext('libcalendaring.alarmemail');
-            break;
-        case 'DISPLAY':
-            $text = $rcube->gettext('libcalendaring.alarmdisplay');
-            break;
-        case 'AUDIO':
-            $text = $rcube->gettext('libcalendaring.alarmaudio');
-            break;
+            case 'EMAIL':
+                $text = $rcube->gettext('libcalendaring.alarmemail');
+                break;
+            case 'DISPLAY':
+                $text = $rcube->gettext('libcalendaring.alarmdisplay');
+                break;
+            case 'AUDIO':
+                $text = $rcube->gettext('libcalendaring.alarmaudio');
+                break;
         }
 
         if ($trigger instanceof DateTimeInterface) {
-            $text .= ' ' . $rcube->gettext(array(
+            $text .= ' ' . $rcube->gettext(
                 'name' => 'libcalendaring.alarmat',
-                'vars' => array('datetime' => $rcube->format_date($trigger))
-            ));
-        }
-        else if (preg_match('/@(\d+)/', $trigger, $m)) {
-            $text .= ' ' . $rcube->gettext(array(
+                'vars' => 'datetime' => $rcube->format_date($trigger),
+            );
+        } elseif (preg_match('/@(\d+)/', $trigger, $m)) {
+            $text .= ' ' . $rcube->gettext(
                 'name' => 'libcalendaring.alarmat',
-                'vars' => array('datetime' => $rcube->format_date($m1))
-            ));
-        }
-        else if ($val = self::parse_alarm_value($trigger)) {
+                'vars' => 'datetime' => $rcube->format_date($m1),
+            );
+        } elseif ($val = self::parse_alarm_value($trigger)) {
             $r = $related && strtoupper($related) == 'END' ? 'end' : '';
             // TODO: for all-day events say 'on date of event at XX' ?
             if ($val0 == 0) {
                 $text .= ' ' . $rcube->gettext('libcalendaring.triggerattime' . $r);
-            }
-            else {
+            } else {
                 $label = 'libcalendaring.trigger' . $r . $val1;
                 $text .= ' ' . intval($val0) . ' ' . $rcube->gettext($label);
             }
-        }
-        else {
+        } else {
             return false;
         }
 
@@ -636,8 +658,9 @@
     /**
      * Get the next alarm (time & action) for the given event
      *
-     * @param array Record data
-     * @return array Hash array with alarm time/type or null if no alarms are configured
+     * @param array $rec Record data
+     *
+     * @return array|null Hash array with alarm time/type or null if no alarms are configured
      */
     public static function get_next_alarm($rec, $type = 'event')
     {
@@ -667,14 +690,14 @@
 
         // support legacy format
         if (empty($rec'valarms')) {
-            list($trigger, $action) = explode(':', $rec'alarms', 2);
+            $trigger, $action = explode(':', $rec'alarms', 2);
             if ($alarm = self::parse_alarm_value($trigger)) {
-                $rec'valarms' = array(array('action' => $action, 'trigger' => $alarm3 ?: $alarm0));
+                $rec'valarms' = 'action' => $action, 'trigger' => $alarm3 ?: $alarm0;
             }
         }
 
         // alarm ID eq. record ID by default to keep backwards compatibility
-        $alarm_id   = isset($rec'id') ? $rec'id' : null;
+        $alarm_id   = $rec'id' ?? null;
         $alarm_prop = null;
         $expires    = new DateTime('now - 12 hours');
         $notify_at  = null;
@@ -685,8 +708,7 @@
 
             if ($alarm'trigger' instanceof DateTimeInterface) {
                 $notify_time = $alarm'trigger';
-            }
-            else if (is_string($alarm'trigger')) {
+            } elseif (is_string($alarm'trigger')) {
                 $refdate = !empty($alarm'related') && $alarm'related' == 'END' ? $rec'end' : $rec'start';
 
                 // abort if no reference date is available to compute notification time
@@ -698,11 +720,10 @@
 
                 try {
                     $interval = new DateInterval(trim($alarm'trigger', '+-'));
-                    $interval->invert = $alarm'trigger'0 == '-';
+                    $interval->invert = $alarm'trigger'0 == '-' ? 1 : 0;
                     $notify_time = clone $refdate;
                     $notify_time->add($interval);
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     rcube::raise_error($e, true);
                     continue;
                 }
@@ -710,23 +731,23 @@
 
             if ($notify_time && (!$notify_at || ($notify_time > $notify_at && $notify_time > $expires))) {
                 $notify_at  = $notify_time;
-                $action     = isset($alarm'action') ? $alarm'action' : null;
+                $action     = $alarm'action' ?? null;
                 $alarm_prop = $alarm;
 
                 // generate a unique alarm ID if multiple alarms are set
                 if (count($rec'valarms') > 1) {
-                    $rec_id = substr(md5(isset($rec'id') ? $rec'id' : 'none'), 0, 16);
+                    $rec_id = substr(md5($rec'id' ?? 'none'), 0, 16);
                     $alarm_id = $rec_id . '-' . $notify_at->format('Ymd\THis');
                 }
             }
         }
 
-        return !$notify_at ? null : array(
+        return !$notify_at ? null : 
             'time'   => $notify_at->format('U'),
             'action' => !empty($action) ? strtoupper($action) : 'DISPLAY',
             'id'     => $alarm_id,
             'prop'   => $alarm_prop,
-        );
+        ;
     }
 
     /**
@@ -736,10 +757,10 @@
     public function refresh($attr)
     {
         // collect pending alarms from all providers (e.g. calendar, tasks)
-        $plugin = $this->rc->plugins->exec_hook('pending_alarms', array(
+        $plugin = $this->rc->plugins->exec_hook('pending_alarms', 
             'time' => time(),
-            'alarms' => array(),
-        ));
+            'alarms' => ,
+        );
 
         if (!$plugin'abort' && !empty($plugin'alarms')) {
             // make sure texts and env vars are available on client
@@ -755,7 +776,7 @@
      */
     public function alarms_action()
     {
-//        $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
+        //        $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
         $data  = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
 
         $data'ids' = explode(',', $data'id');
@@ -763,8 +784,7 @@
 
         if (!empty($plugin'success')) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
-        }
-        else {
+        } else {
             $this->rc->output->show_message('calendar.errorsaving', 'error');
         }
     }
@@ -774,18 +794,18 @@
      */
     private function _alarms_output($alarms)
     {
-        $out = array();
+        $out = ;
         foreach ($alarms as $alarm) {
-            $out = array(
+            $out = 
                 'id'       => $alarm'id',
                 'start'    => !empty($alarm'start') ? $this->adjust_timezone($alarm'start')->format('c') : '',
-                'end'      => !empty($alarm'end')? $this->adjust_timezone($alarm'end')->format('c') : '',
+                'end'      => !empty($alarm'end') ? $this->adjust_timezone($alarm'end')->format('c') : '',
                 'allDay'   => !empty($alarm'allday'),
                 'action'   => $alarm'action',
                 'title'    => $alarm'title',
                 'location' => $alarm'location',
                 'calendar' => $alarm'calendar',
-            );
+            ;
         }
 
         return $out;
@@ -794,9 +814,9 @@
     /**
      * Render a dropdown menu to choose snooze time
      */
-    private function snooze_select($attrib = array())
+    private function snooze_select($attrib = )
     {
-        $steps = array(
+        $steps = 
              5 => 'repeatinmin',
             10 => 'repeatinmin',
             15 => 'repeatinmin',
@@ -806,15 +826,17 @@
             120 => 'repeatinhrs',
             1440 => 'repeattomorrow',
             10080 => 'repeatinweek',
-        );
+        ;
 
-        $items = array();
+        $items = ;
         foreach ($steps as $n => $label) {
-            $items = html::tag('li', null, html::a(array('href' => "#" . ($n * 60), 'class' => 'active'),
-                $this->gettext(array('name' => $label, 'vars' => array('min' => $n % 60, 'hrs' => intval($n / 60))))));
+            $items = html::tag('li', null, html::a(
+                'href' => "#" . ($n * 60), 'class' => 'active',
+                $this->gettext('name' => $label, 'vars' => 'min' => $n % 60, 'hrs' => intval($n / 60))
+            ));
         }
 
-        return html::tag('ul', $attrib + array('class' => 'toolbarmenu menu'), join("\n", $items), html::$common_attrib);
+        return html::tag('ul', $attrib + 'class' => 'toolbarmenu menu', implode("\n", $items), html::$common_attrib);
     }
 
 
@@ -826,10 +848,10 @@
     public function recurrence_text($rrule)
     {
         $limit     = 10;
-        $exdates   = array();
+        $exdates   = ;
         $format    = $this->rc->config->get('calendar_date_format', $this->defaults'calendar_date_format');
         $format    = self::to_php_date_format($format);
-        $format_fn = function($dt) use ($format) {
+        $format_fn = function ($dt) use ($format) {
             return rcmail::get_instance()->format_date($dt, $format);
         };
 
@@ -850,33 +872,31 @@
                 $more   = true;
             }
 
-            return $this->gettext('ondate') . ' ' . join(', ', $rdates) . ($more ? '...' : '');
+            return $this->gettext('ondate') . ' ' . implode(', ', $rdates) . ($more ? '...' : '');
         }
 
         $output  = sprintf('%s %d ', $this->gettext('every'), !empty($rrule'INTERVAL') ? $rrule'INTERVAL' : 1);
 
         switch ($rrule'FREQ') {
-        case 'DAILY':
-            $output .= $this->gettext('days');
-            break;
-        case 'WEEKLY':
-            $output .= $this->gettext('weeks');
-            break;
-        case 'MONTHLY':
-            $output .= $this->gettext('months');
-            break;
-        case 'YEARLY':
-            $output .= $this->gettext('years');
-            break;
+            case 'DAILY':
+                $output .= $this->gettext('days');
+                break;
+            case 'WEEKLY':
+                $output .= $this->gettext('weeks');
+                break;
+            case 'MONTHLY':
+                $output .= $this->gettext('months');
+                break;
+            case 'YEARLY':
+                $output .= $this->gettext('years');
+                break;
         }
 
         if (!empty($rrule'COUNT')) {
-            $until = $this->gettext(array('name' => 'forntimes', 'vars' => array('nr' => $rrule'COUNT')));
-        }
-        else if (!empty($rrule'UNTIL')) {
+            $until = $this->gettext('name' => 'forntimes', 'vars' => 'nr' => $rrule'COUNT');
+        } elseif (!empty($rrule'UNTIL')) {
             $until = $this->gettext('recurrencend') . ' ' . $this->rc->format_date($rrule'UNTIL', $format);
-        }
-        else {
+        } else {
             $until = $this->gettext('forever');
         }
 
@@ -889,7 +909,7 @@
                 $more    = true;
             }
 
-            $output  .= '; ' . $this->gettext('except') . ' ' . join(', ', $exdates) . ($more ? '...' : '');
+            $output  .= '; ' . $this->gettext('except') . ' ' . implode(', ', $exdates) . ($more ? '...' : '');
         }
 
         return $output;
@@ -898,106 +918,110 @@
     /**
      * Generate the form for recurrence settings
      */
-    public function recurrence_form($attrib = array())
+    public function recurrence_form($attrib = )
     {
+        $html = '';
         switch ($attrib'part') {
             // frequency selector
             case 'frequency':
-                $select = new html_select(array('name' => 'frequency', 'id' => 'edit-recurrence-frequency', 'class' => 'form-control'));
-                $select->add($this->gettext('never'),   '');
-                $select->add($this->gettext('daily'),   'DAILY');
-                $select->add($this->gettext('weekly'),  'WEEKLY');
+                $select = new html_select('name' => 'frequency', 'id' => 'edit-recurrence-frequency', 'class' => 'form-control');
+                $select->add($this->gettext('never'), '');
+                $select->add($this->gettext('daily'), 'DAILY');
+                $select->add($this->gettext('weekly'), 'WEEKLY');
                 $select->add($this->gettext('monthly'), 'MONTHLY');
-                $select->add($this->gettext('yearly'),  'YEARLY');
-                $select->add($this->gettext('rdate'),   'RDATE');
-                $html = html::label(array('for' => 'edit-recurrence-frequency', 'class' => 'col-form-label col-sm-2'), $this->gettext('frequency'))
+                $select->add($this->gettext('yearly'), 'YEARLY');
+                $select->add($this->gettext('rdate'), 'RDATE');
+                $html = html::label('for' => 'edit-recurrence-frequency', 'class' => 'col-form-label col-sm-2', $this->gettext('frequency'))
                     . html::div('col-sm-10', $select->show(''));
                 break;
 
-            // daily recurrence
+                // daily recurrence
             case 'daily':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-daily'));
-                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-daily', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                $select = $this->interval_selector('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-daily');
+                $html = html::div($attrib, html::label('for' => 'edit-recurrence-interval-daily', 'class' => 'col-form-label col-sm-2', $this->gettext('every'))
                     . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('days')))));
                 break;
 
-            // weekly recurrence form
+                // weekly recurrence form
             case 'weekly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-weekly'));
-                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-weekly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                $select = $this->interval_selector('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-weekly');
+                $html = html::div($attrib, html::label('for' => 'edit-recurrence-interval-weekly', 'class' => 'col-form-label col-sm-2', $this->gettext('every'))
                     . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('weeks')))));
 
                 // weekday selection
-                $daymap   = array('sun','mon','tue','wed','thu','fri','sat');
-                $checkbox = new html_checkbox(array('name' => 'byday', 'class' => 'edit-recurrence-weekly-byday'));
+                $daymap   = 'sun','mon','tue','wed','thu','fri','sat';
+                $checkbox = new html_checkbox('name' => 'byday', 'class' => 'edit-recurrence-weekly-byday');
                 $first    = $this->rc->config->get('calendar_first_day', 1);
 
-                for ($weekdays = '', $j = $first; $j <= $first+6; $j++) {
+                for ($weekdays = '', $j = $first; $j <= $first + 6; $j++) {
                     $d = $j % 7;
-                    $weekdays .= html::label(array('class' => 'weekday'),
-                        $checkbox->show('', array('value' => strtoupper(substr($daymap$d, 0, 2)))) .
+                    $weekdays .= html::label(
+                        'class' => 'weekday',
+                        $checkbox->show('', 'value' => strtoupper(substr($daymap$d, 0, 2))) .
                         $this->gettext($daymap$d)
                     ) . ' ';
                 }
 
-                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bydays'))
+                $html .= html::div($attrib, html::label('class' => 'col-form-label col-sm-2', $this->gettext('bydays'))
                     . html::div('col-sm-10 form-control-plaintext', $weekdays));
                 break;
 
-            // monthly recurrence form
+                // monthly recurrence form
             case 'monthly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-monthly'));
-                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-monthly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                $select = $this->interval_selector('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-monthly');
+                $html = html::div($attrib, html::label('for' => 'edit-recurrence-interval-monthly', 'class' => 'col-form-label col-sm-2', $this->gettext('every'))
                     . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('months')))));
 
-                $checkbox = new html_checkbox(array('name' => 'bymonthday', 'class' => 'edit-recurrence-monthly-bymonthday'));
+                $checkbox = new html_checkbox('name' => 'bymonthday', 'class' => 'edit-recurrence-monthly-bymonthday');
                 for ($monthdays = '', $d = 1; $d <= 31; $d++) {
-                    $monthdays .= html::label(array('class' => 'monthday'), $checkbox->show('', array('value' => $d)) . $d);
+                    $monthdays .= html::label('class' => 'monthday', $checkbox->show('', 'value' => $d) . $d);
                     $monthdays .= $d % 7 ? ' ' : html::br();
                 }
 
                 // rule selectors
-                $radio = new html_radiobutton(array('name' => 'repeatmode', 'class' => 'edit-recurrence-monthly-mode'));
-                $table = new html_table(array('cols' => 2, 'border' => 0, 'cellpadding' => 0, 'class' => 'formtable'));
-                $table->add('label', html::label(null, $radio->show('BYMONTHDAY', array('value' => 'BYMONTHDAY')) . ' ' . $this->gettext('each')));
+                $radio = new html_radiobutton('name' => 'repeatmode', 'class' => 'edit-recurrence-monthly-mode');
+                $table = new html_table('cols' => 2, 'border' => 0, 'cellpadding' => 0, 'class' => 'formtable');
+                $table->add('label', html::label(null, $radio->show('BYMONTHDAY', 'value' => 'BYMONTHDAY') . ' ' . $this->gettext('each')));
                 $table->add(null, $monthdays);
-                $table->add('label', html::label(null, $radio->show('', array('value' => 'BYDAY')) . ' ' . $this->gettext('every')));
+                $table->add('label', html::label(null, $radio->show('', 'value' => 'BYDAY') . ' ' . $this->gettext('every')));
                 $table->add('recurrence-onevery', $this->rrule_selectors($attrib'part'));
 
-                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bydays'))
+                $html .= html::div($attrib, html::label('class' => 'col-form-label col-sm-2', $this->gettext('bydays'))
                     . html::div('col-sm-10 form-control-plaintext', $table->show()));
                 break;
 
-            // annually recurrence form
+                // annually recurrence form
             case 'yearly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-yearly'));
-                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-yearly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                $select = $this->interval_selector('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-yearly');
+                $html = html::div($attrib, html::label('for' => 'edit-recurrence-interval-yearly', 'class' => 'col-form-label col-sm-2', $this->gettext('every'))
                     . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('years')))));
 
                 // month selector
-                $monthmap = array('','jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec');
-                $checkbox = new html_checkbox(array('name' => 'bymonth', 'class' => 'edit-recurrence-yearly-bymonth'));
+                $monthmap = '','jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec';
+                $checkbox = new html_checkbox('name' => 'bymonth', 'class' => 'edit-recurrence-yearly-bymonth');
 
                 for ($months = '', $m = 1; $m <= 12; $m++) {
-                    $months .= html::label(array('class' => 'month'), $checkbox->show(null, array('value' => $m)) . $this->gettext($monthmap$m));
+                    $months .= html::label('class' => 'month', $checkbox->show(null, 'value' => $m) . $this->gettext($monthmap$m));
                     $months .= $m % 4 ? ' ' : html::br();
                 }
 
-                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bymonths'))
-                    . html::div('col-sm-10 form-control-plaintext',
-                        html::div(array('id' => 'edit-recurrence-yearly-bymonthblock'), $months)
+                $html .= html::div($attrib, html::label('class' => 'col-form-label col-sm-2', $this->gettext('bymonths'))
+                    . html::div(
+                        'col-sm-10 form-control-plaintext',
+                        html::div('id' => 'edit-recurrence-yearly-bymonthblock', $months)
                         . html::div('recurrence-onevery', $this->rrule_selectors($attrib'part', '---'))
                     ));
                 break;
 
-            // end of recurrence form
+                // end of recurrence form
             case 'until':
-                $radio  = new html_radiobutton(array('name' => 'repeat', 'class' => 'edit-recurrence-until'));
-                $select = $this->interval_selector(array('name' => 'times', 'id' => 'edit-recurrence-repeat-times', 'class' => 'form-control'));
-                $input  = new html_inputfield(array('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => '10', 'class' => 'form-control datepicker'));
+                $radio  = new html_radiobutton('name' => 'repeat', 'class' => 'edit-recurrence-until');
+                $select = $this->interval_selector('name' => 'times', 'id' => 'edit-recurrence-repeat-times', 'class' => 'form-control');
+                $input  = new html_inputfield('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => '10', 'class' => 'form-control datepicker');
 
-                $html = html::div('line first',
-                    $radio->show('', array('value' => '', 'id' => 'edit-recurrence-repeat-forever'))
+                $html = html::div(
+                    'line first',
+                    $radio->show('', 'value' => '', 'id' => 'edit-recurrence-repeat-forever')
                         . ' ' . html::label('edit-recurrence-repeat-forever', $this->gettext('forever'))
                 );
 
@@ -1006,35 +1030,36 @@
                     $label = str_replace('$n', '', $label);
                     $group  = $select->show(1)
                         . html::span('input-group-append', html::span('input-group-text', rcube::Q($label)));
-                }
-                else {
+                } else {
                     $label = str_replace('$n', '', $label);
                     $group  = html::span('input-group-prepend', html::span('input-group-text', rcube::Q($label)))
                         . $select->show(1);
                 }
 
-                $html .= html::div('line',
-                    $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count'))
+                $html .= html::div(
+                    'line',
+                    $radio->show('', 'value' => 'count', 'id' => 'edit-recurrence-repeat-count')
                         . ' ' . html::label('edit-recurrence-repeat-count', $this->gettext('for'))
                         . ' ' . html::span('input-group', $group)
                 );
 
-                $html .= html::div('line',
-                    $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until', 'aria-label' => $this->gettext('untilenddate')))
+                $html .= html::div(
+                    'line',
+                    $radio->show('', 'value' => 'until', 'id' => 'edit-recurrence-repeat-until', 'aria-label' => $this->gettext('untilenddate'))
                         . ' ' . html::label('edit-recurrence-repeat-until', $this->gettext('untildate'))
-                        . ' ' . $input->show('', array('aria-label' => $this->gettext('untilenddate')))
+                        . ' ' . $input->show('', 'aria-label' => $this->gettext('untilenddate'))
                 );
 
-                $html = html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), ucfirst($this->gettext('recurrencend')))
+                $html = html::div($attrib, html::label('class' => 'col-form-label col-sm-2', ucfirst($this->gettext('recurrencend')))
                     . html::div('col-sm-10', $html));
                 break;
 
             case 'rdate':
-                $ul     = html::tag('ul', array('id' => 'edit-recurrence-rdates', 'class' => 'recurrence-rdates'), '');
-                $input  = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10", 'class' => 'form-control datepicker'));
-                $button = new html_inputfield(array('type' => 'button', 'class' => 'button add', 'value' => $this->gettext('addrdate')));
+                $ul     = html::tag('ul', 'id' => 'edit-recurrence-rdates', 'class' => 'recurrence-rdates', '');
+                $input  = new html_inputfield('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10", 'class' => 'form-control datepicker');
+                $button = new html_inputfield('type' => 'button', 'class' => 'button add', 'value' => $this->gettext('addrdate'));
 
-                $html = html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2', 'for' => 'edit-recurrence-rdate-input'), $this->gettext('bydates'))
+                $html = html::div($attrib, html::label('class' => 'col-form-label col-sm-2', 'for' => 'edit-recurrence-rdate-input', $this->gettext('bydates'))
                     . html::div('col-sm-10', $ul . html::div('inputform', $input->show() . $button->show())));
                 break;
         }
@@ -1048,7 +1073,7 @@
     private function interval_selector($attrib)
     {
         $select = new html_select($attrib);
-        $select->add(range(1,30), range(1,30));
+        $select->add(range(1, 30), range(1, 30));
         return $select;
     }
 
@@ -1058,23 +1083,29 @@
     private function rrule_selectors($part, $noselect = null)
     {
         // rule selectors
-        $select_prefix = new html_select(array('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix", 'class' => 'form-control'));
-        if ($noselect) $select_prefix->add($noselect, '');
-        $select_prefix->add(array(
+        $select_prefix = new html_select('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix", 'class' => 'form-control');
+        if ($noselect) {
+            $select_prefix->add($noselect, '');
+        }
+        $select_prefix->add(
+            
                 $this->gettext('first'),
                 $this->gettext('second'),
                 $this->gettext('third'),
                 $this->gettext('fourth'),
-                $this->gettext('last')
-            ),
-            array(1, 2, 3, 4, -1));
+                $this->gettext('last'),
+            ,
+            1, 2, 3, 4, -1
+        );
 
-        $select_wday = new html_select(array('name' => 'byday', 'id' => "edit-recurrence-$part-byday", 'class' => 'form-control'));
-        if ($noselect) $select_wday->add($noselect, '');
+        $select_wday = new html_select('name' => 'byday', 'id' => "edit-recurrence-$part-byday", 'class' => 'form-control');
+        if ($noselect) {
+            $select_wday->add($noselect, '');
+        }
 
-        $daymap = array('sunday','monday','tuesday','wednesday','thursday','friday','saturday');
+        $daymap = 'sunday','monday','tuesday','wednesday','thursday','friday','saturday';
         $first = $this->rc->config->get('calendar_first_day', 1);
-        for ($j = $first; $j <= $first+6; $j++) {
+        for ($j = $first; $j <= $first + 6; $j++) {
             $d = $j % 7;
             $select_wday->add($this->gettext($daymap$d), strtoupper(substr($daymap$d, 0, 2)));
         }
@@ -1094,7 +1125,7 @@
         // format RDATE values
         if (!empty($recurrence'RDATE')) {
             $libcal = $this;
-            $recurrence'RDATE' = array_map(function($rdate) use ($libcal) {
+            $recurrence'RDATE' = array_map(function ($rdate) use ($libcal) {
                 return $libcal->adjust_timezone($rdate, true)->format('c');
             }, (array) $recurrence'RDATE');
         }
@@ -1115,14 +1146,14 @@
 
         if (is_array($recurrence) && !empty($recurrence'RDATE')) {
             $tz = $this->timezone;
-            $recurrence'RDATE' = array_map(function($rdate) use ($tz, $start) {
+            $recurrence'RDATE' = array_map(function ($rdate) use ($tz, $start) {
                 try {
                     $dt = new DateTime($rdate, $tz);
-                    if (is_a($start, 'DateTime'))
+                    if (is_a($start, 'DateTime')) {
                         $dt->setTime($start->format('G'), $start->format('i'));
+                    }
                     return $dt;
-                }
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     return null;
                 }
             }, $recurrence'RDATE');
@@ -1146,11 +1177,11 @@
 
         // check all message parts for .ics files
         foreach ((array)$this->ical_message->mime_parts as $part) {
+            /** @var rcube_message_part $part */
             if (self::part_is_vcalendar($part, $this->ical_message)) {
                 if (!empty($part->ctype_parameters'method')) {
                     $itip_part = $part->mime_id;
-                }
-                else {
+                } else {
                     $this->ical_parts = $part->mime_id;
                 }
             }
@@ -1158,14 +1189,14 @@
 
         // priorize part with method parameter
         if ($itip_part) {
-            $this->ical_parts = array($itip_part);
+            $this->ical_parts = $itip_part;
         }
     }
 
     /**
      * Getter for the parsed iCal objects attached to the current email message
      *
-     * @return object libcalendaring_vcalendar parser instance with the parsed objects
+     * @return libcalendaring_vcalendar Parser instance with the parsed objects
      */
     public function get_mail_ical_objects()
     {
@@ -1208,12 +1239,12 @@
     /**
      * Read the given mime message from IMAP and parse ical data
      *
-     * @param string Mailbox name
-     * @param string Message UID
-     * @param string Message part ID and object index (e.g. '1.2:0')
-     * @param string Object type filter (optional)
+     * @param string $mbox    Mailbox name
+     * @param string $uid     Message UID
+     * @param string $mime_id Message part ID and object index (e.g. '1.2:0')
+     * @param string $type    Object type filter (optional)
      *
-     * @return array Hash array with the parsed iCal 
+     * @return ?array Hash array with the parsed iCal
      */
     public function mail_get_itip_object($mbox, $uid, $mime_id, $type = null)
     {
@@ -1224,7 +1255,7 @@
         $imap->set_folder($mbox);
 
         if ($uid && $mime_id) {
-            list($mime_id, $index) = explode(':', $mime_id);
+            $mime_id, $index = explode(':', $mime_id);
 
             $part    = $imap->get_message_part($uid, $mime_id);
             $headers = $imap->get_message_headers($uid);
@@ -1240,9 +1271,13 @@
         }
 
         // successfully parsed events/tasks?
-        if (!empty($objects) && ($object = $objects$index) && (!$type || $object'_type' == $type)) {
-            if ($parser->method)
+        if (!empty($headers) && !empty($objects) && !empty($parser) && !empty($index)
+            && ($object = $objects$index)
+            && (!$type || $object'_type' == $type)
+        ) {
+            if ($parser->method) {
                 $object'_method' = $parser->method;
+            }
 
             // store the message's sender address for comparisons
             $from = rcube_mime::decode_address_list($headers->from, 1, true, null, true);
@@ -1261,10 +1296,10 @@
     /**
      * Checks if specified message part is a vcalendar data
      *
-     * @param rcube_message_part Part object
-     * @param rcube_message      Message object
+     * @param rcube_message_part $part    Part object
+     * @param rcube_message      $message Message object
      *
-     * @return boolean True if part is of type vcard
+     * @return bool True if part is of type vcard
      */
     public static function part_is_vcalendar($part, $message = null)
     {
@@ -1273,7 +1308,7 @@
             $level = explode('.', $part->mime_id);
 
             while (array_pop($level) !== null) {
-                $id     = join('.', $level) ?: 0;
+                $id     = implode('.', $level) ?: 0;
                 $parent = !empty($message->mime_parts$id) ? $message->mime_parts$id : null;
                 if ($parent && $parent->mimetype == 'multipart/report') {
                     return false;
@@ -1282,7 +1317,7 @@
         }
 
         return (
-            in_array($part->mimetype, array('text/calendar', 'text/x-vcalendar', 'application/ics')) ||
+            in_array($part->mimetype, 'text/calendar', 'text/x-vcalendar', 'application/ics') ||
             // Apple sends files as application/x-any (!?)
             ($part->mimetype == 'application/x-any' && !empty($part->filename) && preg_match('/\.ics$/i', $part->filename))
         );
@@ -1302,15 +1337,13 @@
             unset($object'_instance', $object'recurrence_date');
         }
         // set instance and 'savemode' according to recurrence-id
-        else if (!empty($object'recurrence_date') && $object'recurrence_date' instanceof DateTimeInterface) {
+        elseif (!empty($object'recurrence_date') && $object'recurrence_date' instanceof DateTimeInterface) {
             $object'_instance' = self::recurrence_instance_identifier($object);
             $object'_savemode' = !empty($object'thisandfuture') ? 'future' : 'current';
-        }
-        else if (!empty($object'recurrence_id') && !empty($object'_instance')) {
+        } elseif (!empty($object'recurrence_id') && !empty($object'_instance')) {
             if (strlen($object'_instance') > 4) {
                 $object'recurrence_date' = rcube_utils::anytodatetime($object'_instance', $object'start'->getTimezone());
-            }
-            else {
+            } else {
                 $object'recurrence_date' = clone $object'start';
             }
         }
@@ -1319,7 +1352,8 @@
     /**
      * Return a date() format string to render identifiers for recurrence instances
      *
-     * @param array Hash array with event properties
+     * @param array $event Hash array with event properties
+     *
      * @return string Format string
      */
     public static function recurrence_id_format($event)
@@ -1330,8 +1364,8 @@
     /**
      * Return the identifer for the given instance of a recurring event
      *
-     * @param array Hash array with event properties
-     * @param bool  All-day flag from the main event
+     * @param array $event  Hash array with event properties
+     * @param ?bool $allday All-day flag from the main event
      *
      * @return mixed Format string or null if identifier cannot be generated
      */
@@ -1353,8 +1387,8 @@
     /**
      * Check if a specified event is "identical" to the specified recurrence exception
      *
-     * @param array Hash array with occurrence properties
-     * @param array Hash array with exception properties
+     * @param array $event     Hash array with occurrence properties
+     * @param array $exception Hash array with exception properties
      *
      * @return bool
      */
@@ -1381,7 +1415,7 @@
     {
         $id     = rcube_utils::get_input_value('id', rcube_utils::INPUT_POST);
         $data   = rcube_utils::get_input_value('data', rcube_utils::INPUT_POST, true);
-        $result = array('id' => $id, 'members' => array());
+        $result = 'id' => $id, 'members' => ;
         $maxnum = 500;
 
         // iterate over all autocomplete address books (we don't know the source of the group)
@@ -1402,7 +1436,7 @@
                             $res = false;
                         }
                         // check for maximum number of members (we don't wanna bloat the UI too much)
-                        else if ($res->count > $maxnum) {
+                        elseif ($res->count > $maxnum) {
                             $result'error' = $this->rc->gettext('expandattendeegroupsizelimit', 'libcalendaring');
                             $res = false;
                         }
@@ -1410,10 +1444,10 @@
                         while ($res && ($member = $res->iterate())) {
                             $emails = (array)$abook->get_col_values('email', $member, true);
                             if (!empty($emails) && ($email = array_shift($emails))) {
-                                $result'members' = array(
+                                $result'members' = 
                                     'email' => $email,
                                     'name' => rcube_addressbook::compose_list_name($member),
-                                );
+                                ;
                             }
                         }
 
@@ -1438,8 +1472,8 @@
     {
         if (empty($status)) {
             $emails    = $this->get_user_emails();
-            $delegates = array();
-            $attendees = array();
+            $delegates = ;
+            $attendees = ;
 
             // keep attendee status of the current user
             foreach ((array) $new'attendees' as $i => $attendee) {
@@ -1508,30 +1542,29 @@
         foreach ((array)$recurrence as $k => $val) {
             $k = strtoupper($k);
             switch ($k) {
-            case 'UNTIL':
-                // convert to UTC according to RFC 5545
-                if (is_a($val, 'DateTime')) {
-                    if (!$allday && empty($val->_dateonly)) {
-                        $until = clone $val;
-                        $until->setTimezone(new DateTimeZone('UTC'));
-                        $val = $until->format('Ymd\THis\Z');
-                    }
-                    else {
-                        $val = $val->format('Ymd');
+                case 'UNTIL':
+                    // convert to UTC according to RFC 5545
+                    if (is_a($val, 'DateTime')) {
+                        if (!$allday && empty($val->_dateonly)) {
+                            $until = clone $val;
+                            $until->setTimezone(new DateTimeZone('UTC'));
+                            $val = $until->format('Ymd\THis\Z');
+                        } else {
+                            $val = $val->format('Ymd');
+                        }
                     }
-                }
-                break;
-            case 'RDATE':
-            case 'EXDATE':
-                foreach ((array)$val as $i => $ex) {
-                    if (is_a($ex, 'DateTime')) {
-                        $val$i = $ex->format('Ymd\THis');
+                    break;
+                case 'RDATE':
+                case 'EXDATE':
+                    foreach ((array)$val as $i => $ex) {
+                        if (is_a($ex, 'DateTime')) {
+                            $val$i = $ex->format('Ymd\THis');
+                        }
                     }
-                }
-                $val = join(',', (array)$val);
-                break;
-            case 'EXCEPTIONS':
-                continue 2;
+                    $val = implode(',', (array)$val);
+                    break;
+                case 'EXCEPTIONS':
+                    continue 2;
             }
 
             if (strlen($val)) {
@@ -1552,7 +1585,7 @@
         }
 
         // "dd.MM.yyyy HH:mm:ss" => "d.m.Y H:i:s"
-        return strtr(strtr($from, array(
+        return strtr(strtr($from, 
             'YYYY' => 'Y',
             'YY'   => 'y',
             'yyyy' => 'Y',
@@ -1576,10 +1609,10 @@
             'T'    => 'A',
             't'    => 'a',
             'u'    => 'c',
-        )), array(
+        ), 
             '**'   => 'H',
             '%%'   => 'h',
-        ));
+        );
     }
 
     /**
@@ -1592,7 +1625,7 @@
         }
 
         // "d.m.Y H:i:s" => "dd.MM.yyyy HH:mm:ss"
-        return strtr($from, array(
+        return strtr($from, 
             'y' => 'YY',
             'Y' => 'YYYY',
             'M' => 'MMM',
@@ -1610,6 +1643,6 @@
             'i' => 'mm',
             's' => 'ss',
             'c' => '',
-        ));
+        );
     }
 }

roundcubemail-1.5.tar.gz/plugins/libcalendaring/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/libcalendaring/tests/LibcalendaringTest.php Changed

@@ -23,7 +23,7 @@
 
 class LibcalendaringTest extends PHPUnit\Framework\TestCase
 {
-    function setUp(): void
+    public function setUp(): void
     {
         require_once __DIR__ . '/../libcalendaring.php';
     }
@@ -31,7 +31,7 @@
     /**
      * libcalendaring::parse_alarm_value()
      */
-    function test_parse_alarm_value()
+    public function test_parse_alarm_value()
     {
         $alarm = libcalendaring::parse_alarm_value('-15M');
         $this->assertEquals('15', $alarm0);
@@ -39,11 +39,11 @@
         $this->assertEquals('-PT15M', $alarm3);
 
         $alarm = libcalendaring::parse_alarm_value('-PT5H');
-        $this->assertEquals('5',  $alarm0);
+        $this->assertEquals('5', $alarm0);
         $this->assertEquals('-H', $alarm1);
 
         $alarm = libcalendaring::parse_alarm_value('P0DT1H0M0S');
-        $this->assertEquals('1',  $alarm0);
+        $this->assertEquals('1', $alarm0);
         $this->assertEquals('+H', $alarm1);
 
         // FIXME: this should return something like (1140 + 120 + 30)M
@@ -58,52 +58,52 @@
     /**
      * libcalendaring::get_next_alarm()
      */
-    function test_get_next_alarm()
+    public function test_get_next_alarm()
     {
         // alarm 10 minutes before event
         $date = date('Ymd', strtotime('today + 2 days'));
-        $event = array(
+        $event = 
             'start' => new DateTime($date . 'T160000Z'),
             'end'   => new DateTime($date . 'T200000Z'),
-            'valarms' => array(
-                array(
+            'valarms' => 
+                
                     'trigger' => '-PT10M',
                     'action'  => 'DISPLAY',
-                ),
-            ),
-        );
+                ,
+            ,
+        ;
         $alarm = libcalendaring::get_next_alarm($event);
         $this->assertEquals($event'valarms'0'action', $alarm'action');
         $this->assertEquals(strtotime($date . 'T155000Z'), $alarm'time');
 
         // alarm 1 hour after event start
-        $event'valarms' = array(
-            array(
+        $event'valarms' = 
+            
                 'trigger' => '+PT1H',
-            ),
-        );
+            ,
+        ;
         $alarm = libcalendaring::get_next_alarm($event);
         $this->assertEquals('DISPLAY', $alarm'action');
         $this->assertEquals(strtotime($date . 'T170000Z'), $alarm'time');
 
         // alarm 1 hour before event end
-        $event'valarms' = array(
-            array(
+        $event'valarms' = 
+            
                 'trigger' => '-PT1H',
                 'related' => 'END',
-            ),
-        );
+            ,
+        ;
         $alarm = libcalendaring::get_next_alarm($event);
         $this->assertEquals('DISPLAY', $alarm'action');
         $this->assertEquals(strtotime($date . 'T190000Z'), $alarm'time');
 
         // alarm 1 hour after event end
-        $event'valarms' = array(
-            array(
+        $event'valarms' = 
+            
                 'trigger' => 'PT1H',
                 'related' => 'END',
-            ),
-        );
+            ,
+        ;
         $alarm = libcalendaring::get_next_alarm($event);
         $this->assertEquals('DISPLAY', $alarm'action');
         $this->assertEquals(strtotime($date . 'T210000Z'), $alarm'time');
@@ -111,24 +111,24 @@
         // ignore past alarms
         $event'start' = new DateTime('today 22:00:00');
         $event'end'   = new DateTime('today 23:00:00');
-        $event'valarms' = array(
-            array(
+        $event'valarms' = 
+            
                 'trigger' => '-P2D',
                 'action'  => 'EMAIL',
-            ),
-            array(
+            ,
+            
                 'trigger' => '-PT30M',
                 'action'  => 'DISPLAY',
-            ),
-        );
+            ,
+        ;
         $alarm = libcalendaring::get_next_alarm($event);
         $this->assertEquals('DISPLAY', $alarm'action');
         $this->assertEquals(strtotime('today 21:30:00'), $alarm'time');
 
         // absolute alarm date/time
-        $event'valarms' = array(
-            array('trigger' => new DateTime('today 20:00:00'))
-        );
+        $event'valarms' = 
+            'trigger' => new DateTime('today 20:00:00'),
+        ;
         $alarm = libcalendaring::get_next_alarm($event);
         $this->assertEquals($event'valarms'0'trigger'->format('U'), $alarm'time');
 
@@ -141,9 +141,9 @@
     /**
      * libcalendaring::part_is_vcalendar()
      */
-    function test_part_is_vcalendar()
+    public function test_part_is_vcalendar()
     {
-        $part = new StdClass;
+        $part = new StdClass();
         $part->mimetype = 'text/plain';
         $part->filename = 'event.ics';
 
@@ -165,20 +165,20 @@
     /**
      * libcalendaring::to_rrule()
      */
-    function test_to_rrule()
+    public function test_to_rrule()
     {
-        $rrule = array(
+        $rrule = 
             'FREQ' => 'MONTHLY',
             'BYDAY' => '2WE',
             'INTERVAL' => 2,
             'UNTIL' => new DateTime('2025-05-01 18:00:00 CEST'),
-        );
+        ;
 
         $s = libcalendaring::to_rrule($rrule);
 
-        $this->assertMatchesRegularExpression('/FREQ='.$rrule'FREQ'.'/',          $s, "Recurrence Frequence");
-        $this->assertMatchesRegularExpression('/INTERVAL='.$rrule'INTERVAL'.'/',  $s, "Recurrence Interval");
-        $this->assertMatchesRegularExpression('/BYDAY='.$rrule'BYDAY'.'/',        $s, "Recurrence BYDAY");
-        $this->assertMatchesRegularExpression('/UNTIL=20250501T160000Z/',           $s, "Recurrence End date (in UTC)");
+        $this->assertMatchesRegularExpression('/FREQ=' . $rrule'FREQ' . '/', $s, "Recurrence Frequence");
+        $this->assertMatchesRegularExpression('/INTERVAL=' . $rrule'INTERVAL' . '/', $s, "Recurrence Interval");
+        $this->assertMatchesRegularExpression('/BYDAY=' . $rrule'BYDAY' . '/', $s, "Recurrence BYDAY");
+        $this->assertMatchesRegularExpression('/UNTIL=20250501T160000Z/', $s, "Recurrence End date (in UTC)");
     }
 }

roundcubemail-1.5.tar.gz/plugins/libcalendaring/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/libcalendaring/tests/RecurrenceTest.php Changed

@@ -25,7 +25,7 @@
 {
     private $plugin;
 
-    function setUp(): void
+    public function setUp(): void
     {
         $rcube = rcmail::get_instance();
         $rcube->plugins->load_plugin('libcalendaring', true, true);
@@ -36,14 +36,14 @@
     /**
      * Data for test_end()
      */
-    function data_end()
+    public function data_end()
     {
         return 
             // non-recurring
             
                 
                     'recurrence' => ,
-                    'start' => new DateTime('2017-08-31 11:00:00')
+                    'start' => new DateTime('2017-08-31 11:00:00'),
                 ,
                 '2017-08-31 11:00:00', // expected result
             ,
@@ -51,7 +51,7 @@
             
                 
                     'recurrence' => 'FREQ' => 'DAILY', 'INTERVAL' => '1', 'COUNT' => 2,
-                    'start' => new DateTime('2017-08-31 11:00:00')
+                    'start' => new DateTime('2017-08-31 11:00:00'),
                 ,
                 '2017-09-01 11:00:00',
             ,
@@ -86,23 +86,23 @@
     /**
      * Data for test_first_occurrence()
      */
-    function data_first_occurrence()
+    public function data_first_occurrence()
     {
         // TODO: BYYEARDAY, BYWEEKNO, BYSETPOS, WKST
 
-        return array(
+        return 
             // non-recurring
-            array(
-                array(),                                     // recurrence data
+            
+                ,                                     // recurrence data
                 '2017-08-31 11:00:00',                       // start date
                 '2017-08-31 11:00:00',                       // expected result
-            ),
+            ,
             // daily
-            array(
-                array('FREQ' => 'DAILY', 'INTERVAL' => '1'), // recurrence data
+            
+                'FREQ' => 'DAILY', 'INTERVAL' => '1', // recurrence data
                 '2017-08-31 11:00:00',                       // start date
                 '2017-08-31 11:00:00',                       // expected result
-            ),
+            ,
             // TODO: this one is not supported by the Calendar UI
 /*
             array(
@@ -112,93 +112,93 @@
             ),
 */
             // weekly
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1'),
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-08-31 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-06 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'TH'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'TH',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-08-31 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'FR'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'FR',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-01 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '2'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '2',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-08-31 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '3', 'BYDAY' => 'WE'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '3', 'BYDAY' => 'WE',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-20 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'COUNT' => 1),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'COUNT' => 1,
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-06 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'UNTIL' => '2017-09-01'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'UNTIL' => '2017-09-01',
                 '2017-08-31 11:00:00', // Thursday
                 '',
-            ),
+            ,
             // monthly
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1'),
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1',
                 '2017-09-08 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9',
                 '2017-08-31 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9',
                 '2017-09-08 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '1WE'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '1WE',
                 '2017-08-16 11:00:00',
                 '2017-09-06 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '-1WE'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '-1WE',
                 '2017-08-16 11:00:00',
                 '2017-08-30 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '2',
                 '2017-09-08 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2', 'BYMONTHDAY' => '8'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '2', 'BYMONTHDAY' => '8',
                 '2017-08-31 11:00:00',
                 '2017-09-08 11:00:00', // ??????
-            ),
+            ,
             // yearly
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1'),
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1',
                 '2017-08-16 12:00:00',
                 '2017-08-16 12:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8',
                 '2017-08-16 12:00:00',
                 '2017-08-16 12:00:00',
-            ),
+            ,
 /*
             // Not supported by Sabre (requires BYMONTH too)
             array(
@@ -207,31 +207,31 @@
                 '2017-12-25 11:00:00',
             ),
 */
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8', 'BYDAY' => '-1MO'),
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8', 'BYDAY' => '-1MO',
                 '2017-08-16 11:00:00',
                 '2017-08-28 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1', 'BYDAY' => '1MO'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1', 'BYDAY' => '1MO',
                 '2017-08-16 11:00:00',
                 '2018-01-01 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1,9', 'BYDAY' => '1MO'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1,9', 'BYDAY' => '1MO',
                 '2017-08-16 11:00:00',
                 '2017-09-04 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '2'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '2',
                 '2017-08-16 11:00:00',
                 '2017-08-16 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYMONTH' => '8'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYMONTH' => '8',
                 '2017-08-16 11:00:00',
                 '2017-08-16 11:00:00',
-            ),
+            ,
 /*
             // Not supported by Sabre (requires BYMONTH too)
             array(
@@ -241,12 +241,12 @@
             ),
 */
             // on dates (FIXME: do we really expect the first occurrence to be on the start date?)
-            array(
-                array('RDATE' => array(new DateTime('2017-08-10 11:00:00 Europe/Warsaw'))),
+            
+                'RDATE' => new DateTime('2017-08-10 11:00:00 Europe/Warsaw'),
                 '2017-08-01 11:00:00',
                 '2017-08-01 11:00:00',
-            ),
-        );
+            ,
+        ;
     }
 
     /**
@@ -254,7 +254,7 @@
      *
      * @dataProvider data_end
      */
-    function test_end($event, $expected)
+    public function test_end($event, $expected)
     {
         $recurrence = new libcalendaring_recurrence($this->plugin, $event);
 
@@ -268,7 +268,7 @@
      *
      * @dataProvider data_first_occurrence
      */
-    function test_first_occurrence($recurrence_data, $start, $expected)
+    public function test_first_occurrence($recurrence_data, $start, $expected)
     {
         $start = new DateTime($start);
         if (!empty($recurrence_data'UNTIL')) {
@@ -288,7 +288,7 @@
      *
      * @dataProvider data_first_occurrence
      */
-    function test_first_occurrence_allday($recurrence_data, $start, $expected)
+    public function test_first_occurrence_allday($recurrence_data, $start, $expected)
     {
         $start = new libcalendaring_datetime($start);
         $start->_dateonly = true;
@@ -312,7 +312,7 @@
     /**
      * Test for libcalendaring_recurrence::next_instance()
      */
-    function test_next_instance()
+    public function test_next_instance()
     {
         date_default_timezone_set('America/New_York');
 
@@ -334,7 +334,7 @@
     /**
      * Test for libcalendaring_recurrence::next_instance()
      */
-    function test_next_instance_exdate()
+    public function test_next_instance_exdate()
     {
         date_default_timezone_set('America/New_York');
 
@@ -371,7 +371,7 @@
     /**
      * Test for libcalendaring_recurrence::next_instance()
      */
-    function test_next_instance_dst()
+    public function test_next_instance_dst()
     {
         date_default_timezone_set('America/New_York');

roundcubemail-1.5.tar.gz/plugins/libcalendaring/tests/VcalendarTest.php Changed

@@ -25,7 +25,7 @@
 {
     private $attachment_data;
 
-    function setUp(): void
+    public function setUp(): void
     {
         require_once __DIR__ . '/../libcalendaring.php';
         require_once __DIR__ . '/../lib/libcalendaring_vcalendar.php';
@@ -35,7 +35,7 @@
     /**
      * Simple iCal parsing test
      */
-    function test_import()
+    public function test_import()
     {
         $ical = new libcalendaring_vcalendar();
         $ics = file_get_contents(__DIR__ . '/resources/snd.ics');
@@ -66,7 +66,7 @@
     /**
      * Test parsing from files
      */
-    function test_import_from_file()
+    public function test_import_from_file()
     {
         $ical = new libcalendaring_vcalendar();
 
@@ -80,7 +80,7 @@
     /**
      * Test parsing from files with multiple VCALENDAR blocks (#2884)
      */
-    function test_import_from_file_multiple()
+    public function test_import_from_file_multiple()
     {
         $ical = new libcalendaring_vcalendar();
         $ical->fopen(__DIR__ . '/resources/multiple-rdate.ics', 'UTF-8');
@@ -94,7 +94,7 @@
         $this->assertEquals("AAAA1C572093EC3FC125799C004AFFFF-Lotus_Notes_Generated", $events1'uid');
     }
 
-    function test_invalid_dates()
+    public function test_invalid_dates()
     {
         $ical = new libcalendaring_vcalendar();
         $events = $ical->import_from_file(__DIR__ . '/resources/invalid-dates.ics', 'UTF-8');
@@ -108,7 +108,7 @@
     /**
      * Test some extended ical properties such as attendees, recurrence rules, alarms and attachments
      */
-    function test_extended()
+    public function test_extended()
     {
         $ical = new libcalendaring_vcalendar();
 
@@ -130,19 +130,19 @@
         $this->assertTrue($attendee'rsvp', 'Attendee RSVP');
 
         $delegator = $event'attendees'2;
-        $this->assertEquals('NON-PARTICIPANT',   $delegator'role', 'Delegator ROLE');
-        $this->assertEquals('DELEGATED',         $delegator'status', 'Delegator STATUS');
-        $this->assertEquals('INDIVIDUAL',        $delegator'cutype', 'Delegator CUTYPE');
-        $this->assertEquals('carl@mykolab.com',  $delegator'email', 'Delegator mailto:');
+        $this->assertEquals('NON-PARTICIPANT', $delegator'role', 'Delegator ROLE');
+        $this->assertEquals('DELEGATED', $delegator'status', 'Delegator STATUS');
+        $this->assertEquals('INDIVIDUAL', $delegator'cutype', 'Delegator CUTYPE');
+        $this->assertEquals('carl@mykolab.com', $delegator'email', 'Delegator mailto:');
         $this->assertEquals('rolf2@mykolab.com', $delegator'delegated-to', 'Delegator delegated-to');
-        $this->assertFalse($delegator'rsvp',   'Delegator RSVP');
+        $this->assertFalse($delegator'rsvp', 'Delegator RSVP');
 
         // attachments
         $this->assertEquals(1, count($event'attachments'), "Embedded attachments");
         $attachment = $event'attachments'0;
-        $this->assertEquals('text/html',                 $attachment'mimetype', "Attachment mimetype attribute");
-        $this->assertEquals('calendar.html',             $attachment'name',     "Attachment filename (X-LABEL) attribute");
-        $this->assertStringContainsString('<title>Kalender</title>', $attachment'data',     "Attachment content (decoded)");
+        $this->assertEquals('text/html', $attachment'mimetype', "Attachment mimetype attribute");
+        $this->assertEquals('calendar.html', $attachment'name', "Attachment filename (X-LABEL) attribute");
+        $this->assertStringContainsString('<title>Kalender</title>', $attachment'data', "Attachment content (decoded)");
 
         // recurrence rules
         $events = $ical->import_from_file(__DIR__ . '/resources/recurring.ics', 'UTF-8');
@@ -150,24 +150,24 @@
 
         $this->assertTrue(is_array($event'recurrence'), 'Recurrences rule as hash array');
         $rrule = $event'recurrence';
-        $this->assertEquals('MONTHLY',      $rrule'FREQ',     "Recurrence frequency");
-        $this->assertEquals('1',            $rrule'INTERVAL', "Recurrence interval");
-        $this->assertEquals('3WE',          $rrule'BYDAY',    "Recurrence frequency");
-        $this->assertInstanceOf('DateTimeInterface', $rrule'UNTIL',    "Recurrence end date");
+        $this->assertEquals('MONTHLY', $rrule'FREQ', "Recurrence frequency");
+        $this->assertEquals('1', $rrule'INTERVAL', "Recurrence interval");
+        $this->assertEquals('3WE', $rrule'BYDAY', "Recurrence frequency");
+        $this->assertInstanceOf('DateTimeInterface', $rrule'UNTIL', "Recurrence end date");
 
-        $this->assertEquals(2, count($rrule'EXDATE'),          "Recurrence EXDATEs");
+        $this->assertEquals(2, count($rrule'EXDATE'), "Recurrence EXDATEs");
         $this->assertInstanceOf('DateTimeInterface', $rrule'EXDATE'0, "Recurrence EXDATE as DateTime");
 
         $this->assertTrue(is_array($rrule'EXCEPTIONS'));
         $this->assertEquals(1, count($rrule'EXCEPTIONS'), "Recurrence Exceptions");
 
         $exception = $rrule'EXCEPTIONS'0;
-        $this->assertEquals($event'uid',  $event'uid', "Exception UID");
-        $this->assertEquals('Recurring Test (Exception)',  $exception'title', "Exception title");
+        $this->assertEquals($event'uid', $event'uid', "Exception UID");
+        $this->assertEquals('Recurring Test (Exception)', $exception'title', "Exception title");
         $this->assertInstanceOf('DateTimeInterface', $exception'start', "Exception start");
 
         // categories, class
-        $this->assertEquals('libcalendaring tests', join(',', (array)$event'categories'), "Event categories");
+        $this->assertEquals('libcalendaring tests', implode(',', (array)$event'categories'), "Event categories");
 
         // parse a recurrence chain instance
         $events = $ical->import_from_file(__DIR__ . '/resources/recurrence-id.ics', 'UTF-8');
@@ -181,9 +181,9 @@
     }
 
     /**
-     * 
+     *
      */
-    function test_alarms()
+    public function test_alarms()
     {
         $ical = new libcalendaring_vcalendar();
 
@@ -195,9 +195,9 @@
         $this->assertEquals('12', $alarm0, "Alarm value");
         $this->assertEquals('-H', $alarm1, "Alarm unit");
 
-        $this->assertEquals('DISPLAY', $event'valarms'0'action',  "Full alarm item (action)");
-        $this->assertEquals('-PT12H',  $event'valarms'0'trigger', "Full alarm item (trigger)");
-        $this->assertEquals('END',  $event'valarms'0'related', "Full alarm item (related)");
+        $this->assertEquals('DISPLAY', $event'valarms'0'action', "Full alarm item (action)");
+        $this->assertEquals('-PT12H', $event'valarms'0'trigger', "Full alarm item (trigger)");
+        $this->assertEquals('END', $event'valarms'0'related', "Full alarm item (related)");
 
         // alarm trigger with 0 values
         $events = $ical->import_from_file(__DIR__ . '/resources/alarms.ics', 'UTF-8');
@@ -210,33 +210,33 @@
         $this->assertEquals('-30M', $alarm2, "Alarm string");
         $this->assertEquals('-PT30M', $alarm3, "Unified alarm string (stripped zero-values)");
 
-        $this->assertEquals('DISPLAY', $event'valarms'0'action',  "First alarm action");
-        $this->assertTrue(empty($event'valarms'0'related'),  "First alarm related property");
-        $this->assertEquals('This is the first event reminder', $event'valarms'0'description',  "First alarm text");
+        $this->assertEquals('DISPLAY', $event'valarms'0'action', "First alarm action");
+        $this->assertTrue(empty($event'valarms'0'related'), "First alarm related property");
+        $this->assertEquals('This is the first event reminder', $event'valarms'0'description', "First alarm text");
 
         $this->assertEquals(3, count($event'valarms'), "List all VALARM blocks");
 
         $valarm = $event'valarms'1;
         $this->assertEquals(1, count($valarm'attendees'), "Email alarm attendees");
-        $this->assertEquals('EMAIL', $valarm'action',  "Second alarm item (action)");
-        $this->assertEquals('-P1D',  $valarm'trigger', "Second alarm item (trigger)");
-        $this->assertEquals('This is the reminder message',  $valarm'summary', "Email alarm text");
+        $this->assertEquals('EMAIL', $valarm'action', "Second alarm item (action)");
+        $this->assertEquals('-P1D', $valarm'trigger', "Second alarm item (trigger)");
+        $this->assertEquals('This is the reminder message', $valarm'summary', "Email alarm text");
         $this->assertInstanceOf('DateTimeInterface', $event'valarms'2'trigger', "Absolute trigger date/time");
 
         // test alarms export
         $ics = $ical->export($event);
-        $this->assertStringContainsString('ACTION:DISPLAY',   $ics, "Display alarm block");
-        $this->assertStringContainsString('ACTION:EMAIL',     $ics, "Email alarm block");
-        $this->assertStringContainsString('DESCRIPTION:This is the first event reminder',    $ics, "Alarm description");
-        $this->assertStringContainsString('SUMMARY:This is the reminder message',            $ics, "Email alarm summary");
-        $this->assertStringContainsString('ATTENDEE:mailto:reminder-recipient@example.org',  $ics, "Email alarm recipient");
-        $this->assertStringContainsString('TRIGGER;VALUE=DATE-TIME:20130812',  $ics, "Date-Time trigger");
+        $this->assertStringContainsString('ACTION:DISPLAY', $ics, "Display alarm block");
+        $this->assertStringContainsString('ACTION:EMAIL', $ics, "Email alarm block");
+        $this->assertStringContainsString('DESCRIPTION:This is the first event reminder', $ics, "Alarm description");
+        $this->assertStringContainsString('SUMMARY:This is the reminder message', $ics, "Email alarm summary");
+        $this->assertStringContainsString('ATTENDEE:mailto:reminder-recipient@example.org', $ics, "Email alarm recipient");
+        $this->assertStringContainsString('TRIGGER;VALUE=DATE-TIME:20130812', $ics, "Date-Time trigger");
     }
 
     /**
      * @depends test_import_from_file
      */
-    function test_attachment()
+    public function test_attachment()
     {
         $ical = new libcalendaring_vcalendar();
 
@@ -252,7 +252,7 @@
     /**
      * @depends test_import
      */
-    function test_apple_alarms()
+    public function test_apple_alarms()
     {
         $ical = new libcalendaring_vcalendar();
         $events = $ical->import_from_file(__DIR__ . '/resources/apple-alarms.ics', 'UTF-8');
@@ -265,15 +265,15 @@
         $this->assertEquals('-M', $alarm1, "Alarm unit");
 
         $this->assertEquals(1, count($event'valarms'), "Ignore invalid alarm blocks");
-        $this->assertEquals('AUDIO', $event'valarms'0'action',   "Full alarm item (action)");
+        $this->assertEquals('AUDIO', $event'valarms'0'action', "Full alarm item (action)");
         $this->assertEquals('-PT45M', $event'valarms'0'trigger', "Full alarm item (trigger)");
-        $this->assertEquals('Basso',  $event'valarms'0'uri',     "Full alarm item (attachment)");
+        $this->assertEquals('Basso', $event'valarms'0'uri', "Full alarm item (attachment)");
     }
 
     /**
-     * 
+     *
      */
-    function test_escaped_values()
+    public function test_escaped_values()
     {
         $ical = new libcalendaring_vcalendar();
         $events = $ical->import_from_file(__DIR__ . '/resources/escaped.ics', 'UTF-8');
@@ -290,7 +290,7 @@
     /**
      * Parse RDATE properties (#2885)
      */
-    function test_rdate()
+    public function test_rdate()
     {
         $ical = new libcalendaring_vcalendar();
         $events = $ical->import_from_file(__DIR__ . '/resources/multiple-rdate.ics', 'UTF-8');
@@ -304,7 +304,7 @@
     /**
      * @depends test_import
      */
-    function test_freebusy()
+    public function test_freebusy()
     {
         $ical = new libcalendaring_vcalendar();
         $ical->import_from_file(__DIR__ . '/resources/freebusy.ifb', 'UTF-8');
@@ -321,7 +321,7 @@
     /**
      * @depends test_import
      */
-    function test_freebusy_dummy()
+    public function test_freebusy_dummy()
     {
         $ical = new libcalendaring_vcalendar();
         $ical->import_from_file(__DIR__ . '/resources/dummy.ifb', 'UTF-8');
@@ -331,17 +331,17 @@
         $this->assertStringContainsString('dummy', $freebusy'comment', "Parse comment");
     }
 
-    function test_vtodo()
+    public function test_vtodo()
     {
         $ical = new libcalendaring_vcalendar();
         $tasks = $ical->import_from_file(__DIR__ . '/resources/vtodo.ics', 'UTF-8', true);
         $task = $tasks0;
 
-        $this->assertInstanceOf('DateTimeInterface', $task'start',   "'start' property is DateTime object");
-        $this->assertInstanceOf('DateTimeInterface', $task'due',     "'due' property is DateTime object");
-        $this->assertEquals('-1D:DISPLAY',  $task'alarms',  "Taks alarm value");
-        $this->assertEquals('IN-PROCESS',   $task'status',  "Task status property");
-        $this->assertEquals(1, count($task'x-custom'),      "Custom properties");
+        $this->assertInstanceOf('DateTimeInterface', $task'start', "'start' property is DateTime object");
+        $this->assertInstanceOf('DateTimeInterface', $task'due', "'due' property is DateTime object");
+        $this->assertEquals('-1D:DISPLAY', $task'alarms', "Taks alarm value");
+        $this->assertEquals('IN-PROCESS', $task'status', "Task status property");
+        $this->assertEquals(1, count($task'x-custom'), "Custom properties");
         $this->assertEquals(4, count($task'categories'));
         $this->assertEquals('1234567890-12345678-PARENT', $task'parent_id', "Parent Relation");
 
@@ -356,7 +356,7 @@
     /**
      * Test for iCal export from internal hash array representation
      */
-    function test_export()
+    public function test_export()
     {
         $ical = new libcalendaring_vcalendar();
 
@@ -375,7 +375,7 @@
 
         $ics = $ical->export($event, 'REQUEST', false, $this, 'get_attachment_data', true);
 
-        $this->assertStringContainsString('BEGIN:VCALENDAR',    $ics, "VCALENDAR encapsulation BEGIN");
+        $this->assertStringContainsString('BEGIN:VCALENDAR', $ics, "VCALENDAR encapsulation BEGIN");
 
         $this->assertStringContainsString('BEGIN:VTIMEZONE', $ics, "VTIMEZONE encapsulation BEGIN");
         $this->assertStringContainsString('TZID:Europe/Berlin', $ics, "Timezone ID");
@@ -385,41 +385,41 @@
         $this->assertStringContainsString('TZOFFSETTO:-0500', $ics, "TZOFFSETTO with negative offset (Bug T428)");
         $this->assertStringContainsString('END:VTIMEZONE', $ics, "VTIMEZONE encapsulation END");
 
-        $this->assertStringContainsString('BEGIN:VEVENT',       $ics, "VEVENT encapsulation BEGIN");
+        $this->assertStringContainsString('BEGIN:VEVENT', $ics, "VEVENT encapsulation BEGIN");
         $this->assertSame(2, substr_count($ics, 'DTSTAMP'), "Duplicate DTSTAMP (T1148)");
         $this->assertStringContainsString('UID:ac6b0aee-2519-4e5c-9a25-48c57064c9f0', $ics, "Event UID");
-        $this->assertStringContainsString('SEQUENCE:' . $event'sequence',           $ics, "Export Sequence number");
-        $this->assertStringContainsString('DESCRIPTION:*Exported by',                 $ics, "Export Description");
-        $this->assertStringContainsString('ORGANIZER;CN=Rolf Test:mailto:rolf@',      $ics, "Export organizer");
-        $this->assertMatchesRegularExpression('/ATTENDEE.*;ROLE=REQ-PARTICIPANT/',  $ics, "Export Attendee ROLE");
+        $this->assertStringContainsString('SEQUENCE:' . $event'sequence', $ics, "Export Sequence number");
+        $this->assertStringContainsString('DESCRIPTION:*Exported by', $ics, "Export Description");
+        $this->assertStringContainsString('ORGANIZER;CN=Rolf Test:mailto:rolf@', $ics, "Export organizer");
+        $this->assertMatchesRegularExpression('/ATTENDEE.*;ROLE=REQ-PARTICIPANT/', $ics, "Export Attendee ROLE");
         $this->assertMatchesRegularExpression('/ATTENDEE.*;PARTSTAT=NEEDS-ACTION/', $ics, "Export Attendee Status");
-        $this->assertMatchesRegularExpression('/ATTENDEE.*;RSVP=TRUE/',             $ics, "Export Attendee RSVP");
-        $this->assertMatchesRegularExpression('/:mailto:rolf2@/',                   $ics, "Export Attendee mailto:");
+        $this->assertMatchesRegularExpression('/ATTENDEE.*;RSVP=TRUE/', $ics, "Export Attendee RSVP");
+        $this->assertMatchesRegularExpression('/:mailto:rolf2@/', $ics, "Export Attendee mailto:");
 
         $rrule = $event'recurrence';
-        $this->assertMatchesRegularExpression('/RRULE:.*FREQ='.$rrule'FREQ'.'/',          $ics, "Export Recurrence Frequence");
-        $this->assertMatchesRegularExpression('/RRULE:.*INTERVAL='.$rrule'INTERVAL'.'/',  $ics, "Export Recurrence Interval");
-        $this->assertMatchesRegularExpression('/RRULE:.*UNTIL=20140718T215959Z/',           $ics, "Export Recurrence End date");
-        $this->assertMatchesRegularExpression('/RRULE:.*BYDAY='.$rrule'BYDAY'.'/',        $ics, "Export Recurrence BYDAY");
-        $this->assertMatchesRegularExpression('/EXDATE.*:20131218/',     $ics, "Export Recurrence EXDATE");
+        $this->assertMatchesRegularExpression('/RRULE:.*FREQ=' . $rrule'FREQ' . '/', $ics, "Export Recurrence Frequence");
+        $this->assertMatchesRegularExpression('/RRULE:.*INTERVAL=' . $rrule'INTERVAL' . '/', $ics, "Export Recurrence Interval");
+        $this->assertMatchesRegularExpression('/RRULE:.*UNTIL=20140718T215959Z/', $ics, "Export Recurrence End date");
+        $this->assertMatchesRegularExpression('/RRULE:.*BYDAY=' . $rrule'BYDAY' . '/', $ics, "Export Recurrence BYDAY");
+        $this->assertMatchesRegularExpression('/EXDATE.*:20131218/', $ics, "Export Recurrence EXDATE");
 
-        $this->assertStringContainsString('BEGIN:VALARM',   $ics, "Export VALARM");
+        $this->assertStringContainsString('BEGIN:VALARM', $ics, "Export VALARM");
         $this->assertStringContainsString('TRIGGER;RELATED=END:-PT12H', $ics, "Export Alarm trigger");
 
-        $this->assertMatchesRegularExpression('/ATTACH.*;VALUE=BINARY/',                    $ics, "Embed attachment");
-        $this->assertMatchesRegularExpression('/ATTACH.*;ENCODING=BASE64/',                 $ics, "Attachment B64 encoding");
-        $this->assertMatchesRegularExpression('!ATTACH.*;FMTTYPE=text/html!',               $ics, "Attachment mimetype");
-        $this->assertMatchesRegularExpression('!ATTACH.*;X-LABEL=calendar.html!',           $ics, "Attachment filename with X-LABEL");
+        $this->assertMatchesRegularExpression('/ATTACH.*;VALUE=BINARY/', $ics, "Embed attachment");
+        $this->assertMatchesRegularExpression('/ATTACH.*;ENCODING=BASE64/', $ics, "Attachment B64 encoding");
+        $this->assertMatchesRegularExpression('!ATTACH.*;FMTTYPE=text/html!', $ics, "Attachment mimetype");
+        $this->assertMatchesRegularExpression('!ATTACH.*;X-LABEL=calendar.html!', $ics, "Attachment filename with X-LABEL");
 
-        $this->assertStringContainsString('END:VEVENT',     $ics, "VEVENT encapsulation END");
-        $this->assertStringContainsString('END:VCALENDAR',  $ics, "VCALENDAR encapsulation END");
+        $this->assertStringContainsString('END:VEVENT', $ics, "VEVENT encapsulation END");
+        $this->assertStringContainsString('END:VCALENDAR', $ics, "VCALENDAR encapsulation END");
     }
 
     /**
      * @depends test_extended
      * @depends test_export
      */
-    function test_export_multiple()
+    public function test_export_multiple()
     {
         $ical = new libcalendaring_vcalendar();
         $events = array_merge(
@@ -431,15 +431,15 @@
         $ics = $ical->export($events, null, false);
 
         $this->assertStringContainsString('BEGIN:VCALENDAR', $ics, "VCALENDAR encapsulation BEGIN");
-        $this->assertStringContainsString('END:VCALENDAR',   $ics, "VCALENDAR encapsulation END");
+        $this->assertStringContainsString('END:VCALENDAR', $ics, "VCALENDAR encapsulation END");
         $this->assertEquals($num, substr_count($ics, 'BEGIN:VEVENT'), "VEVENT encapsulation BEGIN");
-        $this->assertEquals($num, substr_count($ics, 'END:VEVENT'),   "VEVENT encapsulation END");
+        $this->assertEquals($num, substr_count($ics, 'END:VEVENT'), "VEVENT encapsulation END");
     }
 
     /**
      * @depends test_export
      */
-    function test_export_recurrence_exceptions()
+    public function test_export_recurrence_exceptions()
     {
         $ical = new libcalendaring_vcalendar();
         $events = $ical->import_from_file(__DIR__ . '/resources/recurring.ics', 'UTF-8');
@@ -466,16 +466,16 @@
         $ics = $ical->export($events, null, false);
 
         $num = count($events0'recurrence''EXCEPTIONS') + 1;
-        $this->assertEquals($num, substr_count($ics, 'BEGIN:VEVENT'),       "VEVENT encapsulation BEGIN");
-        $this->assertEquals($num, substr_count($ics, 'UID:'.$event'uid'), "Recurrence Exceptions with same UID");
-        $this->assertEquals($num, substr_count($ics, 'END:VEVENT'),         "VEVENT encapsulation END");
+        $this->assertEquals($num, substr_count($ics, 'BEGIN:VEVENT'), "VEVENT encapsulation BEGIN");
+        $this->assertEquals($num, substr_count($ics, 'UID:' . $event'uid'), "Recurrence Exceptions with same UID");
+        $this->assertEquals($num, substr_count($ics, 'END:VEVENT'), "VEVENT encapsulation END");
 
         $this->assertStringContainsString('RECURRENCE-ID;TZID=Europe/Zurich:20130814', $ics, "Recurrence-ID (1) being the exception date");
         $this->assertStringContainsString('RECURRENCE-ID;TZID=Europe/Zurich:20131113', $ics, "Recurrence-ID (2) being the exception date");
-        $this->assertStringContainsString('SUMMARY:'.$exception2'title', $ics, "Exception title");
+        $this->assertStringContainsString('SUMMARY:' . $exception2'title', $ics, "Exception title");
     }
 
-    function test_export_valid_rrules()
+    public function test_export_valid_rrules()
     {
         $event = 
             'uid' => '1234567890',
@@ -499,7 +499,7 @@
     /**
      *
      */
-    function test_export_rdate()
+    public function test_export_rdate()
     {
         $ical = new libcalendaring_vcalendar();
         $events = $ical->import_from_file(__DIR__ . '/resources/multiple-rdate.ics', 'UTF-8');
@@ -511,7 +511,7 @@
     /**
      * @depends test_export
      */
-    function test_export_direct()
+    public function test_export_direct()
     {
         $ical = new libcalendaring_vcalendar();
         $events = $ical->import_from_file(__DIR__ . '/resources/multiple.ics', 'UTF-8');
@@ -524,12 +524,12 @@
 
         $this->assertTrue($return, "Return true on successful writing");
         $this->assertStringContainsString('BEGIN:VCALENDAR', $output, "VCALENDAR encapsulation BEGIN");
-        $this->assertStringContainsString('END:VCALENDAR',   $output, "VCALENDAR encapsulation END");
+        $this->assertStringContainsString('END:VCALENDAR', $output, "VCALENDAR encapsulation END");
         $this->assertEquals($num, substr_count($output, 'BEGIN:VEVENT'), "VEVENT encapsulation BEGIN");
-        $this->assertEquals($num, substr_count($output, 'END:VEVENT'),   "VEVENT encapsulation END");
+        $this->assertEquals($num, substr_count($output, 'END:VEVENT'), "VEVENT encapsulation END");
     }
 
-    function test_datetime()
+    public function test_datetime()
     {
         $ical = new libcalendaring_vcalendar();
         $cal  = new \Sabre\VObject\Component\VCalendar();
@@ -544,12 +544,12 @@
         $this->assertStringContainsString('20130901T100000Z', $asutctime->serialize());
     }
 
-    function test_get_vtimezone()
+    public function test_get_vtimezone()
     {
         $vtz = libcalendaring_vcalendar::get_vtimezone('Europe/Berlin', strtotime('2014-08-22T15:00:00+02:00'));
         $this->assertInstanceOf('\Sabre\VObject\Component', $vtz, "VTIMEZONE is a Component object");
-        $this->assertEquals('Europe/Berlin', $vtz->TZID);
-        $this->assertEquals('4', $vtz->{'X-MICROSOFT-CDO-TZID'});
+        $this->assertEquals('Europe/Berlin', $vtz->TZID); // @phpstan-ignore-line
+        $this->assertEquals('4', $vtz->{'X-MICROSOFT-CDO-TZID'}); // @phpstan-ignore-line
 
         // check for transition to daylight saving time which is BEFORE the given date
         $dst = array_first($vtz->select('DAYLIGHT'));
@@ -584,25 +584,25 @@
 
         // Making sure VTIMEZOONE contains at least one STANDARD/DAYLIGHT component
         // when there's only one transition in specified time period (T5626)
-        $vtz = libcalendaring_vcalendar::get_vtimezone('Europe/Istanbul', strtotime('2019-10-04T15:00:00'));
+        $vtz = libcalendaring_vcalendar::get_vtimezone('Europe/Warsaw', strtotime('2023-10-04T15:00:00'));
 
         $this->assertInstanceOf('\Sabre\VObject\Component', $vtz);
 
         $dst = $vtz->select('DAYLIGHT');
         $std = $vtz->select('STANDARD');
 
-        $this->assertEmpty($dst);
-        $this->assertCount(1, $std);
-
+        $this->assertCount(1, $dst);
+        $this->assertCount(2, $std);
         $std = end($std);
-        $this->assertEquals('STANDARD', $std->name);
-        $this->assertEquals('20181009T150000', $std->DTSTART);
-        $this->assertEquals('+0300', $std->TZOFFSETFROM);
-        $this->assertEquals('+0300', $std->TZOFFSETTO);
-        $this->assertEquals('+03', $std->TZNAME);
+
+        $this->assertSame('STANDARD', $std->name);
+        $this->assertSame('20231029T010000', (string) $std->DTSTART);
+        $this->assertSame('+0200', (string) $std->TZOFFSETFROM);
+        $this->assertSame('+0100', (string) $std->TZOFFSETTO);
+        $this->assertSame('CET', (string) $std->TZNAME);
     }
 
-    function get_attachment_data($id, $event)
+    public function get_attachment_data($id, $event)
     {
         return $this->attachment_data;
     }

roundcubemail-1.5.tar.gz/plugins/libkolab/config.inc.php Changed

@@ -30,7 +30,7 @@
 // Configuration of HTTP requests.
 // See http://pear.php.net/manual/en/package.http.http-request2.config.php
 // for list of supported configuration options (array keys)
-$config'kolab_http_request' = array();
+$config'kolab_http_request' = ;
 
 // When kolab_cache is enabled Roundcube's messages cache will be redundant
 // when working on kolab folders. Here we can:
@@ -41,11 +41,11 @@
 
 // These event properties contribute to a significant revision to the calendar component
 // and if changed will increment the sequence number relevant for scheduling according to RFC 5545
-$config'kolab_event_scheduling_properties' = array('start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled');
+$config'kolab_event_scheduling_properties' = 'start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled';
 
 // These task properties contribute to a significant revision to the calendar component
 // and if changed will increment the sequence number relevant for scheduling according to RFC 5545
-$config'kolab_task_scheduling_properties' = array('start', 'due', 'summary', 'status');
+$config'kolab_task_scheduling_properties' = 'start', 'due', 'summary', 'status';
 
 // LDAP directory to find avilable users for folder sharing.
 // Either contains an array with LDAP addressbook configuration or refers to entry in $config'ldap_public'.
@@ -62,7 +62,7 @@
 $config'kolab_users_id_attrib' = null;
 
 // Use these attributes when searching users in LDAP
-$config'kolab_users_search_attrib' = array('cn','mail','alias');
+$config'kolab_users_search_attrib' = 'cn','mail','alias';
 
 // Which property of the LDAP user record to use as a display name.
 // Defaults to the 'kolab_auth_name' configuration option.

roundcubemail-1.5.tar.gz/plugins/libkolab/config.inc.php.dist Changed

@@ -30,7 +30,7 @@
 // Configuration of HTTP requests.
 // See http://pear.php.net/manual/en/package.http.http-request2.config.php
 // for list of supported configuration options (array keys)
-$config'kolab_http_request' = array();
+$config'kolab_http_request' = ;
 
 // When kolab_cache is enabled Roundcube's messages cache will be redundant
 // when working on kolab folders. Here we can:
@@ -41,11 +41,11 @@
 
 // These event properties contribute to a significant revision to the calendar component
 // and if changed will increment the sequence number relevant for scheduling according to RFC 5545
-$config'kolab_event_scheduling_properties' = array('start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled');
+$config'kolab_event_scheduling_properties' = 'start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled';
 
 // These task properties contribute to a significant revision to the calendar component
 // and if changed will increment the sequence number relevant for scheduling according to RFC 5545
-$config'kolab_task_scheduling_properties' = array('start', 'due', 'summary', 'status');
+$config'kolab_task_scheduling_properties' = 'start', 'due', 'summary', 'status';
 
 // LDAP directory to find avilable users for folder sharing.
 // Either contains an array with LDAP addressbook configuration or refers to entry in $config'ldap_public'.
@@ -62,7 +62,7 @@
 $config'kolab_users_id_attrib' = null;
 
 // Use these attributes when searching users in LDAP
-$config'kolab_users_search_attrib' = array('cn','mail','alias');
+$config'kolab_users_search_attrib' = 'cn','mail','alias';
 
 // Which property of the LDAP user record to use as a display name.
 // Defaults to the 'kolab_auth_name' configuration option.

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_attachments_handler.php Changed

@@ -36,7 +36,7 @@
     public static function ui()
     {
         $rcmail = rcmail::get_instance();
-        $self   = new self;
+        $self   = new self();
 
         $rcmail->output->add_handler('plugin.attachments_form', $self, 'files_form');
         $rcmail->output->add_handler('plugin.attachments_list', $self, 'files_list');
@@ -148,13 +148,12 @@
 
                     if ($uploads_api) {
                         $err = !$this->rc->insert_uploaded_file($attachment);
-                    }
-                    else {
+                    } else {
                         $attachment = $this->rc->plugins->exec_hook('attachment_upload', $attachment);
                     }
                 }
 
-                if (!$err && $attachment'status' && !$attachment'abort') {
+                if (!$err && !empty($attachment'status') && empty($attachment'abort')) {
                     $id = $attachment'id';
 
                     unset($attachment'status', $attachment'abort');
@@ -165,23 +164,23 @@
                     }
 
                     if (!empty($_SESSION$session_key . '_deleteicon')
-                        && ($icon = $_SESSION$session_key . '_deleteicon')
-                        && is_file($icon)
+                        && is_file($icon = $_SESSION$session_key . '_deleteicon')
                     ) {
                         $button = html::img(
                             'src' => $icon,
-                            'alt' => $this->rc->gettext('delete')
+                            'alt' => $this->rc->gettext('delete'),
                         );
-                    }
-                    else if (!empty($_SESSION$session_key . '_textbuttons')) {
+                    } elseif (!empty($_SESSION$session_key . '_textbuttons')) {
                         $button = rcube::Q($this->rc->gettext('delete'));
-                    }
-                    else {
+                    } else {
                         $button = '';
                     }
 
-                    $link_content = sprintf('<span class="attachment-name">%s</span><span class="attachment-size">(%s)</span>',
-                        rcube::Q($attachment'name'), $this->rc->show_bytes($attachment'size'));
+                    $link_content = sprintf(
+                        '<span class="attachment-name">%s</span><span class="attachment-size">(%s)</span>',
+                        rcube::Q($attachment'name'),
+                        $this->rc->show_bytes($attachment'size')
+                    );
 
                     $delete_link = html::a(
                             'href'       => "#delete",
@@ -198,25 +197,22 @@
                          , $link_content);
 
                     $left = !empty($_SESSION$session_key . '_icon_pos') && $_SESSION$session_key . '_icon_pos' == 'left';
-                    $content = $left ? $delete_link.$content_link : $content_link.$delete_link;
+                    $content = $left ? $delete_link . $content_link : $content_link . $delete_link;
 
                     $this->rc->output->command('add2attachment_list', "rcmfile$id", 
                             'html'      => $content,
                             'name'      => $attachment'name',
                             'mimetype'  => $attachment'mimetype',
                             'classname' => 'no-menu ' . rcube_utils::file2class($attachment'mimetype', $attachment'name'),
-                            'complete'  => true
+                            'complete'  => true,
                         , $uploadid);
-                }
-                else {  // upload failed
+                } else {  // upload failed
                     if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
                         $msg = $this->rc->gettext('name' => 'filesizeerror', 'vars' => 
                             'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))));
-                    }
-                    else if (!empty($attachment'error')) {
+                    } elseif (!empty($attachment'error')) {
                         $msg = $attachment'error';
-                    }
-                    else {
+                    } else {
                         $msg = $this->rc->gettext('fileuploaderror');
                     }
 
@@ -224,15 +220,13 @@
                     $this->rc->output->command('remove_from_attachment_list', $uploadid);
                 }
             }
-        }
-        else if ($_SERVER'REQUEST_METHOD' == 'POST') {
+        } elseif ($_SERVER'REQUEST_METHOD' == 'POST') {
             // if filesize exceeds post_max_size then $_FILES array is empty,
             // show filesizeerror instead of fileuploaderror
             if ($maxsize = ini_get('post_max_size')) {
                 $msg = $this->rc->gettext('name' => 'filesizeerror', 'vars' => 
                     'size' => $this->rc->show_bytes(parse_bytes($maxsize)));
-            }
-            else {
+            } else {
                 $msg = $this->rc->gettext('fileuploaderror');
             }
 
@@ -254,7 +248,7 @@
 
         if ($attachment && !empty($attachment'body')) {
             // allow post-processing of the attachment body
-            $part = new rcube_message_part;
+            $part = new rcube_message_part();
             $part->filename  = $attachment'name';
             $part->size      = $attachment'size';
             $part->mimetype  = $attachment'mimetype';
@@ -271,20 +265,19 @@
             }
 
             $mimetype = $plugin'mimetype';
-            list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
+            $ctype_primary, $ctype_secondary = explode('/', $mimetype);
 
             $browser = $this->rc->output->browser;
 
             // send download headers
             if ($plugin'download') {
                 header("Content-Type: application/octet-stream");
-                if ($browser->ie)
+                if ($browser->ie) {
                     header("Content-Type: application/force-download");
-            }
-            else if ($ctype_primary == 'text') {
+                }
+            } elseif ($ctype_primary == 'text') {
                 header("Content-Type: text/$ctype_secondary");
-            }
-            else {
+            } else {
                 header("Content-Type: $mimetype");
                 header("Content-Transfer-Encoding: binary");
             }
@@ -294,8 +287,7 @@
                 $OUTPUT = new rcmail_html_page();
                 // @TODO: use washtml on $body
                 $OUTPUT->write($plugin'body');
-            }
-            else {
+            } else {
                 // don't kill the connection if download takes more than 30 sec.
                 @set_time_limit(0);
 
@@ -304,8 +296,7 @@
 
                 if ($browser->ie) {
                     $filename = rawurlencode($filename);
-                }
-                else {
+                } else {
                     $filename = addcslashes($filename, '"');
                 }
 
@@ -333,8 +324,8 @@
 
         header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
         print "<html>\n<head>\n"
-            . '<meta http-equiv="refresh" content="0; url='.rcube::Q($url).'">' . "\n"
-            . '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
+            . '<meta http-equiv="refresh" content="0; url=' . rcube::Q($url) . '">' . "\n"
+            . '<meta http-equiv="content-type" content="text/html; charset=' . RCUBE_CHARSET . '">' . "\n"
             . "</head>\n<body>\n$message\n</body>\n</html>";
         exit;
     }
@@ -345,7 +336,7 @@
     public function attachment_frame($attrib = )
     {
         $mimetype = strtolower($this->attachment'mimetype');
-        list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
+        $ctype_primary, $ctype_secondary = explode('/', $mimetype);
 
         $attrib'src' = './?' . str_replace('_frame=', ($ctype_primary == 'text' ? '_show=' : '_preload='), $_SERVER'QUERY_STRING');
 
@@ -359,7 +350,7 @@
      */
     public function attachment_header($attrib = )
     {
-        $rcmail  = rcmail::get_instance();
+        $rcmail  = rcube::get_instance();
         $dl_link = strtolower($attrib'downloadlink' ?? '') == 'true';
         $dl_url  = $this->rc->url('_frame' => null, '_download' => 1 + $_GET);
         $table   = new html_table('cols' => $dl_link ? 3 : 2);
@@ -396,8 +387,7 @@
         // Roundcube >= 1.7
         if (method_exists($this->rc, 'delete_uploaded_files')) {
             $this->rc->delete_uploaded_files($session_key);
-        }
-        else if (!empty($_SESSION$session_key) && ($group = $_SESSION$session_key'id')) {
+        } elseif (!empty($_SESSION$session_key) && ($group = $_SESSION$session_key'id')) {
             $this->rc->plugins->exec_hook('attachments_cleanup', 'group' => $group);
             $this->rc->session->remove($session_key);
         }
@@ -417,8 +407,7 @@
                     $attachments$attachment'id' = $attachment;
                 }
             }
-        }
-        else if (!empty($_SESSION$session_key) && $_SESSION$session_key'id' == $group) {
+        } elseif (!empty($_SESSION$session_key) && $_SESSION$session_key'id' == $group) {
             if (!empty($_SESSION$session_key'attachments')) {
                 foreach ($_SESSION$session_key'attachments' as $id => $attachment) {
                     if (is_array($ids) && in_array($id, $ids)) {
@@ -465,8 +454,7 @@
 
             if ($uploads_api) {
                 $attachment'status' = $this->rc->insert_uploaded_file($attachment, 'attachment_save');
-            }
-            else {
+            } else {
                 $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
             }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_bonnie_api.php Changed

@@ -27,7 +27,6 @@
 {
     public $ready = false;
 
-    private $config = array();
     private $client = null;
 
 
@@ -36,8 +35,6 @@
      */
     public function __construct($config)
     {
-        $this->config = $config;
-
         $this->client = new kolab_bonnie_api_client($config'uri', $config'timeout' ?: 30, (bool)$config'debug');
 
         $this->client->set_secret($config'secret');
@@ -50,46 +47,46 @@
     /**
      * Wrapper function for <object>.changelog() API call
      */
-    public function changelog($type, $uid, $mailbox, $msguid=null)
+    public function changelog($type, $uid, $mailbox, $msguid = null)
     {
-        return $this->client->execute($type.'.changelog', array('uid' => $uid, 'mailbox' => $mailbox, 'msguid' => $msguid));
+        return $this->client->execute($type . '.changelog', 'uid' => $uid, 'mailbox' => $mailbox, 'msguid' => $msguid);
     }
 
     /**
      * Wrapper function for <object>.diff() API call
      */
-    public function diff($type, $uid, $rev1, $rev2, $mailbox, $msguid=null, $instance=null)
+    public function diff($type, $uid, $rev1, $rev2, $mailbox, $msguid = null, $instance = null)
     {
-        return $this->client->execute($type.'.diff', array(
+        return $this->client->execute($type . '.diff', 
           'uid' => $uid,
           'rev1' => $rev1,
           'rev2' => $rev2,
           'mailbox' => $mailbox,
           'msguid' => $msguid,
           'instance' => $instance,
-        ));
+        );
     }
 
     /**
      * Wrapper function for <object>.get() API call
      */
-    public function get($type, $uid, $rev, $mailbox, $msguid=null)
+    public function get($type, $uid, $rev, $mailbox, $msguid = null)
     {
-      return $this->client->execute($type.'.get', array('uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox, 'msguid' => $msguid));
+        return $this->client->execute($type . '.get', 'uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox, 'msguid' => $msguid);
     }
 
     /**
      * Wrapper function for <object>.rawdata() API call
      */
-    public function rawdata($type, $uid, $rev, $mailbox, $msguid=null)
+    public function rawdata($type, $uid, $rev, $mailbox, $msguid = null)
     {
-      return $this->client->execute($type.'.rawdata', array('uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox, 'msguid' => $msguid));
+        return $this->client->execute($type . '.rawdata', 'uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox, 'msguid' => $msguid);
     }
 
     /**
      * Generic wrapper for direct API calls
      */
-    public function _execute($method, $params = array())
+    public function _execute($method, $params = )
     {
         return $this->client->execute($method, $params);
     }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_bonnie_api_client.php Changed

@@ -63,11 +63,11 @@
      * Default HTTP headers to send to the server
      * @var array
      */
-    protected $headers = array(
+    protected $headers = 
         'Connection' => 'close',
         'Content-Type' => 'application/json',
         'Accept' => 'application/json',
-    );
+    ;
 
     /**
      * Constructor
@@ -77,7 +77,7 @@
      * @param  bool    $debug    Enabled debug logging
      * @param  array   $headers  Custom HTTP headers
      */
-    public function __construct($url, $timeout = 5, $debug = false, $headers = array())
+    public function __construct($url, $timeout = 5, $debug = false, $headers = )
     {
         $this->url = $url;
         $this->timeout = $timeout;
@@ -132,15 +132,15 @@
      * @param  array  $params  Procedure arguments
      * @return mixed
      */
-    public function execute($method, array $params = array())
+    public function execute($method, array $params = )
     {
         $id = mt_rand();
 
-        $payload = array(
+        $payload = 
             'jsonrpc' => '2.0',
             'method' => $method,
             'id' => $id,
-        );
+        ;
 
         if (!empty($params)) {
             $payload'params' = $params;
@@ -150,8 +150,7 @@
 
         if (isset($result'id') && $result'id' == $id && array_key_exists('result', $result)) {
             return $result'result';
-        }
-        else if (isset($result'error')) {
+        } elseif (isset($result'error')) {
             $this->_debug('ERROR', $result);
         }
 
@@ -161,9 +160,12 @@
     /**
      * Do the HTTP request
      *
-     * @param  string  $payload  Data to send
+     * @param array $payload Data to send
+     * @param bool  $sign    Enable signed request
+     *
+     * @return array
      */
-    protected function send_request($payload, $sign = true)
+    protected function send_request(array $payload, $sign = true)
     {
         try {
             $payload_ = json_encode($payload);
@@ -171,13 +173,13 @@
             // add request signature
             if ($sign && !empty($this->secret)) {
                 $this->headers'X-Request-Sign' = $this->request_signature($payload_);
-            }
-            else if ($this->headers'X-Request-Sign') {
+            } elseif ($this->headers'X-Request-Sign') {
                 unset($this->headers'X-Request-Sign');
             }
 
             $this->_debug('REQUEST', $payload, $this->headers);
-            $request = libkolab::http_request($this->url, 'POST', array('timeout' => $this->timeout));
+
+            $request = libkolab::http_request($this->url, 'POST', 'timeout' => $this->timeout);
             $request->setHeader($this->headers);
             $request->setAuth($this->username, $this->password);
             $request->setBody($payload_);
@@ -187,22 +189,20 @@
             if ($response->getStatus() == 200) {
                 $result = json_decode($response->getBody(), true);
                 $this->_debug('RESPONSE', $result);
-            }
-            else {
+            } else {
                 throw new Exception(sprintf("HTTP %d %s", $response->getStatus(), $response->getReasonPhrase()));
             }
-        }
-        catch (Exception $e) {
-            rcube::raise_error(array(
+        } catch (Exception $e) {
+            rcube::raise_error(
                 'code' => 500,
                 'type' => 'php',
                 'message' => "Bonnie API request failed: " . $e->getMessage(),
-            ), true);
+            , true);
 
-            return array('id' => $payload'id', 'error' => $e->getMessage(), 'code' => -32000);
+            return 'id' => $payload'id', 'error' => $e->getMessage(), 'code' => -32000;
         }
 
-        return is_array($result) ? $result : array();
+        return isset($result) && is_array($result) ? $result : ;
     }
 
     /**
@@ -223,16 +223,17 @@
      */
     protected function _debug(/* $message, $data1, data2, ...*/)
     {
-        if (!$this->debug)
+        if (!$this->debug) {
             return;
+        }
 
         $args = func_get_args();
 
-        $msg = array();
+        $msg = ;
         foreach ($args as $arg) {
             $msg = !is_string($arg) ? var_export($arg, true) : $arg;
         }
 
-        rcube::write_log('bonnie', join(";\n", $msg));
+        rcube::write_log('bonnie', implode(";\n", $msg));
     }
 }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_date_recurrence.php Changed

@@ -27,21 +27,34 @@
 
 class kolab_date_recurrence
 {
-    private /* EventCal */ $engine;
-    private /* kolab_format_xcal */ $object;
-    private /* DateTime */ $start;
-    private /* DateTime */ $next;
-    private /* cDateTime */ $cnext;
-    private /* DateInterval */ $duration;
-    private /* bool */ $allday;
+    /** @var EventCal */
+    private $engine;
+
+    /* @var kolab_format_xcal */
+    private $object;
+
+    /** @var DateTime */
+    private $start;
+
+    /** @var DateTime */
+    private $next;
+
+    /** @var cDateTime */
+    private $cnext;
+
+    /** @var DateInterval */
+    private $duration;
+
+    /** @var bool */
+    private $allday;
 
 
     /**
      * Default constructor
      *
-     * @param kolab_format_xcal The Kolab object to operate on
+     * @param kolab_format_xcal $object The Kolab object to operate on
      */
-    function __construct($object)
+    public function __construct($object)
     {
         $data = $object->to_array();
 
@@ -53,8 +66,7 @@
 
         if (is_object($data'start') && is_object($data'end')) {
             $this->duration = $data'start'->diff($data'end');
-        }
-        else {
+        } else {
             // Prevent from errors when end date is not set (#5307) RFC5545 3.6.1
             $seconds = !empty($data'end') ? ($data'end' - $data'start') : 0;
             $this->duration = new DateInterval('PT' . $seconds . 'S');
@@ -64,7 +76,7 @@
     /**
      * Get date/time of the next occurence of this event
      *
-     * @param bool Return a Unix timestamp instead of a DateTime object
+     * @param bool $timestamp Return a Unix timestamp instead of a DateTime object
      *
      * @return DateTime|int|false Object/unix timestamp or False if recurrence ended
      */
@@ -73,7 +85,8 @@
         $time = false;
 
         if ($this->engine && $this->next) {
-            if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) {
+            $cnext = new cDateTime($this->engine->getNextOccurence($this->cnext));
+            if ($cnext->isValid()) {
                 $next = kolab_format::php_datetime($cnext, $this->start->getTimezone());
                 $time = $timestamp ? $next->format('U') : $next;
 
@@ -121,7 +134,7 @@
     /**
      * Get the end date of the last occurence of this recurrence cycle
      *
-     * @return DateTime|bool End datetime of the last event or False if recurrence exceeds limit
+     * @return DateTimeInterface|bool End datetime of the last event or False if recurrence exceeds limit
      */
     public function end()
     {
@@ -141,7 +154,7 @@
 
         // determine a reasonable end date for an infinite recurrence
         if (empty($event'recurrence''COUNT')) {
-            if (!empty($event'start') && $event'start' instanceof DateTimeInterface) {
+            if (!empty($event'start') && $event'start' instanceof DateTime) {
                 $start_dt = clone $event'start';
                 $start_dt->add(new DateInterval('P100Y'));
                 return $start_dt;
@@ -164,42 +177,43 @@
         $interval   = intval($event'recurrence''INTERVAL' ?: 1);
 
         switch ($event'recurrence''FREQ') {
-        case 'WEEKLY':
-            if (empty($event'recurrence''BYDAY')) {
-                return $orig_start;
-            }
-
-            $start->sub(new DateInterval("P{$interval}W"));
-            break;
+            case 'WEEKLY':
+                if (empty($event'recurrence''BYDAY')) {
+                    return $orig_start;
+                }
 
-        case 'MONTHLY':
-            if (empty($event'recurrence''BYDAY') && empty($event'recurrence''BYMONTHDAY')) {
-                return $orig_start;
-            }
+                $start->sub(new DateInterval("P{$interval}W"));
+                break;
 
-            $start->sub(new DateInterval("P{$interval}M"));
-            break;
+            case 'MONTHLY':
+                if (empty($event'recurrence''BYDAY') && empty($event'recurrence''BYMONTHDAY')) {
+                    return $orig_start;
+                }
 
-        case 'YEARLY':
-            if (empty($event'recurrence''BYDAY') && empty($event'recurrence''BYMONTH')) {
-                return $orig_start;
-            }
+                $start->sub(new DateInterval("P{$interval}M"));
+                break;
 
-            $start->sub(new DateInterval("P{$interval}Y"));
-            break;
+            case 'YEARLY':
+                if (empty($event'recurrence''BYDAY') && empty($event'recurrence''BYMONTH')) {
+                    return $orig_start;
+                }
 
-        case 'DAILY':
-            if (!empty($event'recurrence''BYMONTH')) {
+                $start->sub(new DateInterval("P{$interval}Y"));
                 break;
-            }
 
-        default:
-            return $orig_start;
+            case 'DAILY':
+                if (!empty($event'recurrence''BYMONTH')) {
+                    break;
+                }
+
+                // no break
+            default:
+                return $orig_start;
         }
 
         $event'start' = $start;
         $event'recurrence''INTERVAL' = $interval;
-        if ($event'recurrence''COUNT') {
+        if (!empty($event'recurrence''COUNT')) {
             // Increase count so we do not stop the loop to early
             $event'recurrence''COUNT' += 100;
         }
@@ -223,17 +237,20 @@
         }
 
         if (!$found) {
-            rcube::raise_error(array(
+            rcube::raise_error(
                 'file' => __FILE__,
                 'line' => __LINE__,
-                'message' => sprintf("Failed to find a first occurrence. Start: %s, Recurrence: %s",
-                    $orig_start->format(DateTime::ISO8601), json_encode($event'recurrence')),
-            ), true);
+                'message' => sprintf(
+                    "Failed to find a first occurrence. Start: %s, Recurrence: %s",
+                    $orig_start->format(DateTime::ISO8601),
+                    json_encode($event'recurrence')
+                ),
+            , true);
 
             return null;
         }
 
-        if ($this->allday) {
+        if ($this->allday && $start instanceof libcalendaring_datetime) {
             $start->_dateonly = true;
         }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_dav_client.php Changed

@@ -44,10 +44,9 @@
             $this->password = rawurldecode($parsedUrl'pass');
 
             $url = str_replace(rawurlencode($this->user) . ':' . rawurlencode($this->password) . '@', '', $url);
-        }
-        else {
-            $this->user     = $this->rc->user->get_username();
-            $this->password = $this->rc->decrypt($_SESSION'password');
+        } else {
+            $this->user     = $this->rc->get_user_name();
+            $this->password = $this->rc->get_user_password();
         }
 
         $this->url = $url;
@@ -59,7 +58,7 @@
     protected function request($path, $method, $body = '', $headers = )
     {
         $rcube = rcube::get_instance();
-        $debug = (array) $rcube->config->get('dav_debug');
+        $debug = (bool) $rcube->config->get('dav_debug');
 
         $request_config = 
             'store_body'       => true,
@@ -107,8 +106,7 @@
             $this->responseHeaders = $response->getHeader();
 
             return $this->parseXML($body);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, false);
             return false;
         }
@@ -148,6 +146,7 @@
         }
 
         $elements = $response->getElementsByTagName('response');
+        $principal_href = '';
 
         foreach ($elements as $element) {
             foreach ($element->getElementsByTagName('current-user-principal') as $prop) {
@@ -261,8 +260,7 @@
                 if (in_array('addressbook', $folder'resource_type')) {
                     $folders = $folder;
                 }
-            }
-            else if (in_array('calendar', $folder'resource_type') && in_array($component, (array) $folder'types')) {
+            } elseif (in_array('calendar', $folder'resource_type') && in_array($component, (array) $folder'types')) {
                 $folders = $folder;
             }
         }
@@ -383,8 +381,7 @@
         if ($component == 'VCARD') {
             $ns .= ' xmlns:c="urn:ietf:params:xml:ns:carddav"';
             $props = '<d:resourcetype><d:collection/><c:addressbook/></d:resourcetype>';
-        }
-        else {
+        } else {
             $ns .= ' xmlns:c="urn:ietf:params:xml:ns:caldav"';
             $props = '<d:resourcetype><d:collection/><c:calendar/></d:resourcetype>';
         }
@@ -439,8 +436,7 @@
             $ns .= ' xmlns:c="urn:ietf:params:xml:ns:carddav"';
             // Resourcetype property is protected
             // $props = '<d:resourcetype><d:collection/><c:addressbook/></d:resourcetype>';
-        }
-        else {
+        } else {
             $ns .= ' xmlns:c="urn:ietf:params:xml:ns:caldav"';
             // Resourcetype property is protected
             // $props = '<d:resourcetype><d:collection/><c:calendar/></d:resourcetype>';
@@ -459,16 +455,14 @@
         foreach ($properties as $name => $value) {
             if ($name == 'name') {
                 $props .= '<d:displayname>' . htmlspecialchars($value, ENT_XML1, 'UTF-8') . '</d:displayname>';
-            }
-            else if ($name == 'color' && strlen($value)) {
+            } elseif ($name == 'color' && strlen($value)) {
                 if ($value0 != '#') {
                     $value = '#' . $value;
                 }
 
                 $ns .= ' xmlns:a="http://apple.com/ns/ical/"';
                 $props .= '<a:calendar-color>' . htmlspecialchars($value, ENT_XML1, 'UTF-8') . '</a:calendar-color>';
-            }
-            else if ($name == 'alarms') {
+            } elseif ($name == 'alarms') {
                 if (!strpos($ns, 'Kolab:')) {
                     $ns .= ' xmlns:k="Kolab:"';
                 }
@@ -525,7 +519,7 @@
         }
 
         $body = '<?xml version="1.0" encoding="utf-8"?>'
-            .' <c:' . $queries$component . ' xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:' . $ns$component. '">'
+            . ' <c:' . $queries$component . ' xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:' . $ns$component . '">'
                 . '<d:prop>'
                     . '<d:getetag />'
                 . '</d:prop>'
@@ -586,10 +580,10 @@
         ;
 
         $body = '<?xml version="1.0" encoding="utf-8"?>'
-            .' <c:' . $queries$component . ' xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:' . $ns$component . '">'
+            . ' <c:' . $queries$component . ' xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:' . $ns$component . '">'
                 . '<d:prop>'
                     . '<d:getetag />'
-                    . '<c:' . $types$component. ' />'
+                    . '<c:' . $types$component . ' />'
                 . '</d:prop>'
                 . $body
             . '</c:' . $queries$component . '>';
@@ -656,17 +650,16 @@
     /**
      * Extract folder properties from a server 'response' element
      */
-    protected function getFolderPropertiesFromResponse(DOMNode $element)
+    protected function getFolderPropertiesFromResponse(DOMElement $element)
     {
-
         if ($href = $element->getElementsByTagName('href')->item(0)) {
             $href = $href->nodeValue;
-/*
-            $path = parse_url($this->url, PHP_URL_PATH);
-            if ($path && strpos($href, $path) === 0) {
-                $href = substr($href, strlen($path));
-            }
-*/
+            /*
+                        $path = parse_url($this->url, PHP_URL_PATH);
+                        if ($path && strpos($href, $path) === 0) {
+                            $href = substr($href, strlen($path));
+                        }
+            */
         }
 
         if ($color = $element->getElementsByTagName('calendar-color')->item(0)) {
@@ -723,26 +716,25 @@
     /**
      * Extract object properties from a server 'response' element
      */
-    protected function getObjectPropertiesFromResponse(DOMNode $element)
+    protected function getObjectPropertiesFromResponse(DOMElement $element)
     {
         $uid = null;
         if ($href = $element->getElementsByTagName('href')->item(0)) {
             $href = $href->nodeValue;
-/*
-            $path = parse_url($this->url, PHP_URL_PATH);
-            if ($path && strpos($href, $path) === 0) {
-                $href = substr($href, strlen($path));
-            }
-*/
+            /*
+                        $path = parse_url($this->url, PHP_URL_PATH);
+                        if ($path && strpos($href, $path) === 0) {
+                            $href = substr($href, strlen($path));
+                        }
+            */
             // Extract UID from the URL
             $href_parts = explode('/', $href);
-            $uid = preg_replace('/\.a-z+$/', '', $href_partscount($href_parts)-1);
+            $uid = preg_replace('/\.a-z+$/', '', $href_partscount($href_parts) - 1);
         }
 
         if ($data = $element->getElementsByTagName('calendar-data')->item(0)) {
             $data = $data->nodeValue;
-        }
-        else if ($data = $element->getElementsByTagName('address-data')->item(0)) {
+        } elseif ($data = $element->getElementsByTagName('address-data')->item(0)) {
             $data = $data->nodeValue;
         }
 
@@ -768,7 +760,7 @@
     {
         if ($response !== false) {
             // Note: ETag is not always returned, e.g. https://github.com/cyrusimap/cyrus-imapd/issues/2456
-            $etag = isset($this->responseHeaders'etag') ? $this->responseHeaders'etag' : null;
+            $etag = $this->responseHeaders'etag' ?? null;
 
             if (is_string($etag) && preg_match('|^".*"$|', $etag)) {
                 $etag = substr($etag, 1, -1);
@@ -783,14 +775,14 @@
     /**
      * Initialize HTTP request object
      */
-    protected function initRequest($url = '', $method = 'GET', $config = array())
+    protected function initRequest($url = '', $method = 'GET', $config = )
     {
         $rcube       = rcube::get_instance();
         $http_config = (array) $rcube->config->get('kolab_http_request');
 
         // deprecated configuration options
         if (empty($http_config)) {
-            foreach (array('ssl_verify_peer', 'ssl_verify_host') as $option) {
+            foreach ('ssl_verify_peer', 'ssl_verify_host' as $option) {
                 $value = $rcube->config->get('kolab_' . $option, true);
                 if (is_bool($value)) {
                     $http_config$option = $value;
@@ -812,7 +804,9 @@
             $request->setConfig($http_config);
 
             // proxy User-Agent string
-            $request->setHeader('user-agent', $_SERVER'HTTP_USER_AGENT');
+            if (isset($_SERVER'HTTP_USER_AGENT')) {
+                $request->setHeader('user-agent', $_SERVER'HTTP_USER_AGENT');
+            }
 
             // cleanup
             $request->setBody('');
@@ -820,8 +814,7 @@
             $request->setMethod($method);
 
             return $request;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, true);
         }
     }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format.php Changed

@@ -29,12 +29,12 @@
 {
     public static $timezone;
 
-    public /*abstract*/ $CTYPE;
-    public /*abstract*/ $CTYPEv2;
+    /*abstract*/ public $CTYPE;
+    /*abstract*/ public $CTYPEv2;
 
-    protected /*abstract*/ $objclass;
-    protected /*abstract*/ $read_func;
-    protected /*abstract*/ $write_func;
+    /*abstract*/ protected $objclass;
+    /*abstract*/ protected $read_func;
+    /*abstract*/ protected $write_func;
 
     protected $obj;
     protected $data;
@@ -44,12 +44,12 @@
     protected $loaded = false;
     protected $version = '3.0';
 
-    const KTYPE_PREFIX = 'application/x-vnd.kolab.';
-    const PRODUCT_ID   = 'Roundcube-libkolab-1.1';
+    public const KTYPE_PREFIX = 'application/x-vnd.kolab.';
+    public const PRODUCT_ID   = 'Roundcube-libkolab-1.1';
 
     // mapping table for valid PHP timezones not supported by libkolabxml
     // basically the entire list of ftp://ftp.iana.org/tz/data/backward
-    protected static $timezone_map = array(
+    protected static $timezone_map = 
         'Africa/Asmera' => 'Africa/Asmara',
         'Africa/Timbuktu' => 'Africa/Abidjan',
         'America/Argentina/ComodRivadavia' => 'America/Argentina/Catamarca',
@@ -156,43 +156,51 @@
         'Universal' => 'Etc/UTC',
         'W-SU' => 'Europe/Moscow',
         'Zulu' => 'Etc/UTC',
-    );
+    ;
 
     /**
      * Factory method to instantiate a kolab_format object of the given type and version
      *
-     * @param string Object type to instantiate
-     * @param float  Format version
-     * @param string Cached xml data to initialize with
-     * @return object kolab_format
+     * @param string $type    Object type to instantiate
+     * @param string $version Format version
+     * @param string $xmldata Cached xml data to initialize with
+     *
+     * @return kolab_format|PEAR_Error
      */
     public static function factory($type, $version = '3.0', $xmldata = null)
     {
-        if (!isset(self::$timezone))
+        if (!isset(self::$timezone)) {
             self::$timezone = new DateTimeZone('UTC');
+        }
 
-        if (!self::supports($version))
+        if (!self::supports($version)) {
+            // @phpstan-ignore-next-line
             return PEAR::raiseError("No support for Kolab format version " . $version);
+        }
 
         $type = preg_replace('/configuration\.a-z._+$/', 'configuration', $type);
         $suffix = preg_replace('/^a-z+/', '', $type);
         $classname = 'kolab_format_' . $suffix;
-        if (class_exists($classname))
+        if (class_exists($classname)) {
             return new $classname($xmldata, $version);
+        }
 
+        // @phpstan-ignore-next-line
         return PEAR::raiseError("Failed to load Kolab Format wrapper for type " . $type);
     }
 
     /**
      * Determine support for the given format version
      *
-     * @param float Format version to check
-     * @return boolean True if supported, False otherwise
+     * @param float $version Format version to check
+     *
+     * @return bool True if supported, False otherwise
      */
     public static function supports($version)
     {
-        if ($version == '2.0')
+        if ($version == '2.0') {
             return class_exists('kolabobject');
+        }
         // default is version 3
         return class_exists('kolabformat');
     }
@@ -200,10 +208,10 @@
     /**
      * Convert the given date/time value into a cDateTime object
      *
-     * @param mixed         Date/Time value either as unix timestamp, date string or PHP DateTime object
-     * @param DateTimeZone  The timezone the date/time is in. Use global default if Null, local time if False
-     * @param boolean       True of the given date has no time component
-     * @param DateTimeZone  The timezone to convert the date to before converting to cDateTime
+     * @param mixed        $datetime Date/Time value either as unix timestamp, date string or PHP DateTime object
+     * @param DateTimeZone $tz       The timezone the date/time is in. Use global default if Null, local time if False
+     * @param bool         $dateonly True of the given date has no time component
+     * @param DateTimeZone $dest_tz  The timezone to convert the date to before converting to cDateTime
      *
      * @return cDateTime The libkolabxml date/time object
      */
@@ -211,10 +219,12 @@
     {
         // use timezone information from datetime or global setting
         if (!$tz && $tz !== false) {
-            if ($datetime instanceof DateTimeInterface)
+            if ($datetime instanceof DateTimeInterface) {
                 $tz = $datetime->getTimezone();
-            if (!$tz)
+            }
+            if (!$tz) {
                 $tz = self::$timezone;
+            }
         }
 
         $result = new cDateTime();
@@ -222,20 +232,23 @@
         try {
             // got a unix timestamp (in UTC)
             if (is_numeric($datetime)) {
-                $datetime = new libcalendaring_datetime('@'.$datetime, new DateTimeZone('UTC'));
-                if ($tz) $datetime->setTimezone($tz);
-            }
-            else if (is_string($datetime) && strlen($datetime)) {
+                $datetime = new libcalendaring_datetime('@' . $datetime, new DateTimeZone('UTC'));
+                if ($tz) {
+                    $datetime->setTimezone($tz);
+                }
+            } elseif (is_string($datetime) && strlen($datetime)) {
                 $datetime = $tz ? new libcalendaring_datetime($datetime, $tz) : new libcalendaring_datetime($datetime);
-            }
-            else if ($datetime instanceof DateTimeInterface) {
+            } elseif ($datetime instanceof DateTimeInterface) {
                 $datetime = clone $datetime;
             }
+        } catch (Exception $e) {
         }
-        catch (Exception $e) {}
 
         if ($datetime instanceof DateTimeInterface) {
-            if ($dest_tz instanceof DateTimeZone && $dest_tz !== $datetime->getTimezone()) {
+            if ($dest_tz instanceof DateTimeZone
+                && $dest_tz !== $datetime->getTimezone()
+                && method_exists($datetime, 'setTimezone')
+            ) {
                 $datetime->setTimezone($dest_tz);
                 $tz = $dest_tz;
             }
@@ -250,15 +263,15 @@
             $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
 
             // libkolabxml throws errors on some deprecated timezone names
-            $utc_aliases = array('UTC', 'GMT', '+00:00', 'Z', 'Etc/GMT', 'Etc/UTC');
+            $utc_aliases = 'UTC', 'GMT', '+00:00', 'Z', 'Etc/GMT', 'Etc/UTC';
 
             if ($tz && in_array($tz->getName(), $utc_aliases)) {
                 $result->setUTC(true);
-            }
-            else if ($tz !== false) {
+            } elseif ($tz !== false) {
                 $tzid = $tz->getName();
-                if (array_key_exists($tzid, self::$timezone_map))
+                if (array_key_exists($tzid, self::$timezone_map)) {
                     $tzid = self::$timezone_map$tzid;
+                }
                 $result->setTimezone($tzid);
             }
         }
@@ -269,10 +282,10 @@
     /**
      * Convert the given cDateTime into a PHP DateTime object
      *
-     * @param cDateTime    The libkolabxml datetime object
-     * @param DateTimeZone The timezone to convert the date to
+     * @param cDateTime    $cdt     The libkolabxml datetime object
+     * @param DateTimeZone $dest_tz The timezone to convert the date to
      *
-     * @return libcalendaring_datetime PHP datetime instance
+     * @return libcalendaring_datetime|null PHP datetime instance, Null on invalid input
      */
     public static function php_datetime($cdt, $dest_tz = null)
     {
@@ -284,18 +297,16 @@
 
         if ($dest_tz) {
             $d->setTimezone($dest_tz);
-        }
-        else {
+        } else {
             try {
                 if ($tzs = $cdt->timezone()) {
                     $tz = new DateTimeZone($tzs);
                     $d->setTimezone($tz);
-                }
-                else if ($cdt->isUTC()) {
+                } elseif ($cdt->isUTC()) {
                     $d->setTimezone(new DateTimeZone('UTC'));
                 }
+            } catch (Exception $e) {
             }
-            catch (Exception $e) { }
         }
 
         $d->setDate($cdt->year(), $cdt->month(), $cdt->day());
@@ -303,8 +314,7 @@
         if ($cdt->isDateOnly()) {
             $d->_dateonly = true;
             $d->setTime(12, 0, 0);  // set time to noon to avoid timezone troubles
-        }
-        else {
+        } else {
             $d->setTime($cdt->hour(), $cdt->minute(), $cdt->second());
         }
 
@@ -314,29 +324,34 @@
     /**
      * Convert a libkolabxml vector to a PHP array
      *
-     * @param object vector Object
+     * @param vector $vec Object
+     * @param int    $max Max vector size
+     *
      * @return array Indexed array containing vector elements
      */
     public static function vector2array($vec, $max = PHP_INT_MAX)
     {
-        $arr = array();
-        for ($i=0; $i < $vec->size() && $i < $max; $i++)
+        $arr = ;
+        for ($i = 0; $i < $vec->size() && $i < $max; $i++) {
             $arr = $vec->get($i);
+        }
         return $arr;
     }
 
     /**
      * Build a libkolabxml vector (string) from a PHP array
      *
-     * @param array Array with vector elements
-     * @return object vectors
+     * @param array $arr Array with vector elements
+     *
+     * @return vectors
      */
     public static function array2vector($arr)
     {
-        $vec = new vectors;
+        $vec = new vectors();
         foreach ((array)$arr as $val) {
-            if (strlen($val))
+            if (strlen($val)) {
                 $vec->push($val);
+            }
         }
         return $vec;
     }
@@ -344,15 +359,16 @@
     /**
      * Parse the X-Kolab-Type header from MIME messages and return the object type in short form
      *
-     * @param string X-Kolab-Type header value
+     * @param string $type X-Kolab-Type header value
+     *
      * @return string Kolab object type (contact,event,task,note,etc.)
      */
-    public static function mime2object_type($x_kolab_type)
+    public static function mime2object_type($type)
     {
         return preg_replace(
-            array('/dictionary.a-z.+$/', '/contact.distlist$/'),
-            array( 'dictionary',            'distribution-list'),
-            substr($x_kolab_type, strlen(self::KTYPE_PREFIX))
+            '/dictionary.a-z.+$/', '/contact.distlist$/',
+             'dictionary',            'distribution-list',
+            substr($type, strlen(self::KTYPE_PREFIX))
         );
     }
 
@@ -362,21 +378,23 @@
      */
     public function __construct($xmldata = null, $version = null)
     {
-        $this->obj = new $this->objclass;
+        $this->obj = new $this->objclass();
         $this->xmldata = $xmldata;
 
-        if ($version)
+        if ($version) {
             $this->version = $version;
+        }
 
         // use libkolab module if available
-        if (class_exists('kolabobject'))
+        if (class_exists('kolabobject')) {
             $this->xmlobject = new XMLObject();
+        }
     }
 
     /**
      * Check for format errors after calling kolabformat::write*()
      *
-     * @return boolean True if there were errors, False if OK
+     * @return bool True if there were errors, False if OK
      */
     protected function format_errors()
     {
@@ -396,13 +414,13 @@
         }
 
         if ($log && !isset($this->formaterror)) {
-            rcube::raise_error(array(
+            rcube::raise_error(
                 'code' => 660,
                 'type' => 'php',
                 'file' => __FILE__,
                 'line' => __LINE__,
                 'message' => "kolabformat $log: " . kolabformat::errorMessage(),
-            ), true);
+            , true);
 
             $this->formaterror = $ret;
         }
@@ -445,17 +463,19 @@
     /**
      * Get constant value for libkolab's version parameter
      *
-     * @param float Version value to convert
-     * @return int Constant value of either kolabobject::KolabV2 or kolabobject::KolabV3 or false if kolabobject module isn't available
+     * @param float $v Version value to convert
+     *
+     * @return int|false Constant value of either kolabobject::KolabV2 or kolabobject::KolabV3 or false if kolabobject module isn't available
      */
     protected function libversion($v = null)
     {
         if (class_exists('kolabobject')) {
             $version = $v ?: $this->version;
-            if ($version <= '2.0')
+            if ($version <= '2.0') {
                 return kolabobject::KolabV2;
-            else
+            } else {
                 return kolabobject::KolabV3;
+            }
         }
 
         return false;
@@ -467,12 +487,13 @@
      */
     protected function libfunc($func)
     {
-        if (is_array($func) || strpos($func, '::'))
+        if (is_array($func) || strpos($func, '::')) {
             return $func;
-        else if (class_exists('kolabobject'))
-            return array($this->xmlobject, $func);
-        else
+        } elseif (class_exists('kolabobject')) {
+            return $this->xmlobject, $func;
+        } else {
             return 'kolabformat::' . $func;
+        }
     }
 
     /**
@@ -486,23 +507,24 @@
     /**
      * Load Kolab object data from the given XML block
      *
-     * @param string XML data
-     * @return boolean True on success, False on failure
+     * @param string $xml XML data
      */
     public function load($xml)
     {
         $this->formaterror = null;
         $read_func = $this->libfunc($this->read_func);
 
-        if (is_array($read_func))
+        if (is_array($read_func)) {
             $r = call_user_func($read_func, $xml, $this->libversion());
-        else
+        } else {
             $r = call_user_func($read_func, $xml, false);
+        }
 
-        if (is_resource($r))
+        if (is_resource($r)) {
             $this->obj = new $this->objclass($r);
-        else if (is_a($r, $this->objclass))
+        } elseif (is_a($r, $this->objclass)) {
             $this->obj = $r;
+        }
 
         $this->loaded = !$this->format_errors();
     }
@@ -510,7 +532,8 @@
     /**
      * Write object data to XML format
      *
-     * @param float Format version to write
+     * @param float $version Format version to write
+     *
      * @return string XML data
      */
     public function write($version = null)
@@ -519,15 +542,17 @@
 
         $this->init();
         $write_func = $this->libfunc($this->write_func);
-        if (is_array($write_func))
+        if (is_array($write_func)) {
             $this->xmldata = call_user_func($write_func, $this->obj, $this->libversion($version), self::PRODUCT_ID);
-        else
+        } else {
             $this->xmldata = call_user_func($write_func, $this->obj, self::PRODUCT_ID);
+        }
 
-        if (!$this->format_errors())
+        if (!$this->format_errors()) {
             $this->update_uid();
-        else
+        } else {
             $this->xmldata = null;
+        }
 
         return $this->xmldata;
     }
@@ -535,7 +560,7 @@
     /**
      * Set properties to the kolabformat object
      *
-     * @param array  Object data as hash array
+     * @param array $object Object data as hash array
      */
     public function set(&$object)
     {
@@ -559,20 +584,21 @@
 
         // Save custom properties of the given object
         if (isset($object'x-custom') && method_exists($this->obj, 'setCustomProperties')) {
-            $vcustom = new vectorcs;
+            $vcustom = new vectorcs();
             foreach ((array)$object'x-custom' as $cp) {
-                if (is_array($cp))
+                if (is_array($cp)) {
                     $vcustom->push(new CustomProperty($cp0, $cp1));
+                }
             }
             $this->obj->setCustomProperties($vcustom);
         }
         // load custom properties from XML for caching (#2238) if method exists (#3125)
-        else if (method_exists($this->obj, 'customProperties')) {
-            $object'x-custom' = array();
+        elseif (method_exists($this->obj, 'customProperties')) {
+            $object'x-custom' = ;
             $vcustom = $this->obj->customProperties();
-            for ($i=0; $i < $vcustom->size(); $i++) {
+            for ($i = 0; $i < $vcustom->size(); $i++) {
                 $cp = $vcustom->get($i);
-                $object'x-custom' = array($cp->identifier, $cp->value);
+                $object'x-custom' = $cp->identifier, $cp->value;
             }
         }
     }
@@ -580,19 +606,19 @@
     /**
      * Convert the Kolab object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Kolab object data as hash array
+     * @return array Kolab object data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         $this->init();
 
         // read object properties into local data object
-        $object = array(
+        $object = 
             'uid'     => $this->obj->uid(),
             'changed' => self::php_datetime($this->obj->lastModified()),
-        );
+        ;
 
         // not all container support the created property
         if (method_exists($this->obj, 'created')) {
@@ -602,9 +628,9 @@
         // read custom properties
         if (method_exists($this->obj, 'customProperties')) {
             $vcustom = $this->obj->customProperties();
-            for ($i=0; $i < $vcustom->size(); $i++) {
+            for ($i = 0; $i < $vcustom->size(); $i++) {
                 $cp = $vcustom->get($i);
-                $object'x-custom' = array($cp->identifier, $cp->value);
+                $object'x-custom' = $cp->identifier, $cp->value;
             }
         }
 
@@ -613,8 +639,7 @@
             foreach ($data as $idx => $value) {
                 if (is_array($value)) {
                     $object$idx = array_merge((array)($object$idx ?? ), $value);
-                }
-                else {
+                } else {
                     $object$idx = $value;
                 }
             }
@@ -635,7 +660,7 @@
      */
     public function get_tags()
     {
-        return array();
+        return ;
     }
 
     /**
@@ -645,13 +670,13 @@
      */
     public function get_words()
     {
-        return array();
+        return ;
     }
 
     /**
      * Utility function to extract object attachment data
      *
-     * @param array Hash array reference to append attachment data into
+     * @param array $object Hash array reference to append attachment data into
      */
     public function get_attachments(&$object, $all = false)
     {
@@ -659,31 +684,29 @@
 
         // handle attachments
         $vattach = $this->obj->attachments();
-        for ($i=0; $i < $vattach->size(); $i++) {
+        for ($i = 0; $i < $vattach->size(); $i++) {
             $attach = $vattach->get($i);
 
             // skip cid: attachments which are mime message parts handled by kolab_storage_folder
             if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
                 $name    = $attach->label();
-                $key     = $name . (isset($object'_attachments'$name) ? '.'.$i : '');
+                $key     = $name . (isset($object'_attachments'$name) ? '.' . $i : '');
                 $content = $attach->data();
-                $object'_attachments'$key = array(
-                    'id'       => 'i:'.$i,
+                $object'_attachments'$key = 
+                    'id'       => 'i:' . $i,
                     'name'     => $name,
                     'mimetype' => $attach->mimetype(),
                     'size'     => strlen($content),
                     'content'  => $content,
-                );
-            }
-            else if ($all && substr($attach->uri(), 0, 4) == 'cid:') {
+                ;
+            } elseif ($all && substr($attach->uri(), 0, 4) == 'cid:') {
                 $key = $attach->uri();
-                $object'_attachments'$key = array(
+                $object'_attachments'$key = 
                     'id'       => $key,
                     'name'     => $attach->label(),
                     'mimetype' => $attach->mimetype(),
-                );
-            }
-            else if (in_array(substr($attach->uri(), 0, 4), array('http','imap'))) {
+                ;
+            } elseif (in_array(substr($attach->uri(), 0, 4), 'http','imap')) {
                 $object'links' = $attach->uri();
             }
         }
@@ -692,36 +715,36 @@
     /**
      * Utility function to set attachment properties to the kolabformat object
      *
-     * @param array  Object data as hash array
-     * @param boolean True to always overwrite attachment information
+     * @param array $object Object data as hash array
+     * @param bool  $write  True to always overwrite attachment information
      */
     protected function set_attachments($object, $write = true)
     {
         // save attachments
-        $vattach = new vectorattachment;
+        $vattach = new vectorattachment();
         foreach ((array)($object'_attachments' ?? ) as $cid => $attr) {
-            if (empty($attr))
+            if (empty($attr)) {
                 continue;
-            $attach = new Attachment;
+            }
+            $attach = new Attachment();
             $attach->setLabel((string)$attr'name');
             $attach->setUri('cid:' . $cid, $attr'mimetype' ?: 'application/octet-stream');
             if ($attach->isValid()) {
                 $vattach->push($attach);
                 $write = true;
-            }
-            else {
-                rcube::raise_error(array(
+            } else {
+                rcube::raise_error(
                     'code' => 660,
                     'type' => 'php',
                     'file' => __FILE__,
                     'line' => __LINE__,
                     'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
-                ), true);
+                , true);
             }
         }
 
         foreach ((array)($object'links' ?? ) as $link) {
-            $attach = new Attachment;
+            $attach = new Attachment();
             $attach->setUri($link, 'unknown');
             $vattach->push($attach);
             $write = true;
@@ -768,8 +791,7 @@
                         $key = $cid;
                     }
                 }
-            }
-            else {
+            } else {
                 // find attachment by name, so we can update it if exists
                 // and make sure there are no duplicates
                 foreach ($object'_attachments' as $cid => $att) {
@@ -783,7 +805,7 @@
                 $object'_attachments'$key = false;
             }
             // replace existing entry
-            else if ($key) {
+            elseif ($key) {
                 $object'_attachments'$key = $attachment;
             }
             // append as new attachment

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_configuration.php Changed

@@ -31,95 +31,95 @@
     protected $read_func  = 'readConfiguration';
     protected $write_func = 'writeConfiguration';
 
-    private $type_map = array(
+    private $type_map = 
         'category'    => Configuration::TypeCategoryColor,
         'dictionary'  => Configuration::TypeDictionary,
         'file_driver' => Configuration::TypeFileDriver,
         'relation'    => Configuration::TypeRelation,
         'snippet'     => Configuration::TypeSnippet,
-    );
+    ;
 
-    private $driver_settings_fields = array('host', 'port', 'username', 'password');
+    private $driver_settings_fields = 'host', 'port', 'username', 'password';
 
     /**
      * Set properties to the kolabformat object
      *
-     * @param array  Object data as hash array
+     * @param array $object Object data as hash array
      */
     public function set(&$object)
     {
         // read type-specific properties
         switch ($object'type') {
-        case 'dictionary':
-            $dict = new Dictionary($object'language');
-            $dict->setEntries(self::array2vector($object'e'));
-            $this->obj = new Configuration($dict);
-            break;
-
-        case 'category':
-            // TODO: implement this
-            $categories = new vectorcategorycolor;
-            $this->obj = new Configuration($categories);
-            break;
-
-        case 'file_driver':
-            $driver = new FileDriver($object'driver', $object'title');
-
-            $driver->setEnabled(!empty($object'enabled'));
-
-            foreach ($this->driver_settings_fields as $field) {
-                $value = $object$field;
-                if ($value !== null) {
-                    $driver->{'set' . ucfirst($field)}($value);
+            case 'dictionary':
+                $dict = new Dictionary($object'language');
+                $dict->setEntries(self::array2vector($object'e'));
+                $this->obj = new Configuration($dict);
+                break;
+
+            case 'category':
+                // TODO: implement this
+                $categories = new vectorcategorycolor();
+                $this->obj = new Configuration($categories);
+                break;
+
+            case 'file_driver':
+                $driver = new FileDriver($object'driver', $object'title');
+
+                $driver->setEnabled(!empty($object'enabled'));
+
+                foreach ($this->driver_settings_fields as $field) {
+                    $value = $object$field;
+                    if ($value !== null) {
+                        $driver->{'set' . ucfirst($field)}($value);
+                    }
                 }
-            }
 
-            $this->obj = new Configuration($driver);
-            break;
+                $this->obj = new Configuration($driver);
+                break;
 
-        case 'relation':
-            $relation = new Relation(strval($object'name' ?? ''), strval($object'category' ?? ''));
+            case 'relation':
+                $relation = new Relation(strval($object'name' ?? ''), strval($object'category' ?? ''));
 
-            if (!empty($object'color')) {
-                $relation->setColor($object'color');
-            }
-            if (!empty($object'parent')) {
-                $relation->setParent($object'parent');
-            }
-            if (!empty($object'iconName')) {
-                $relation->setIconName($object'iconName');
-            }
-            if (!empty($object'priority')) {
-                $relation->setPriority((int) $object'priority');
-            }
-            if (!empty($object'members')) {
-                $relation->setMembers(self::array2vector($object'members'));
-            }
+                if (!empty($object'color')) {
+                    $relation->setColor($object'color');
+                }
+                if (!empty($object'parent')) {
+                    $relation->setParent($object'parent');
+                }
+                if (!empty($object'iconName')) {
+                    $relation->setIconName($object'iconName');
+                }
+                if (!empty($object'priority')) {
+                    $relation->setPriority((int) $object'priority');
+                }
+                if (!empty($object'members')) {
+                    $relation->setMembers(self::array2vector($object'members'));
+                }
 
-            $this->obj = new Configuration($relation);
-            break;
+                $this->obj = new Configuration($relation);
+                break;
 
-        case 'snippet':
-            $collection = new SnippetCollection($object'name');
-            $snippets   = new vectorsnippets;
+            case 'snippet':
+                $collection = new SnippetCollection($object'name');
+                $snippets   = new vectorsnippets();
 
-            foreach ((array)($object'snippets' ?? ) as $item) {
-                $snippet = new snippet($item'name', $item'text');
-                $snippet->setTextType(strtolower($item'type') == 'html' ? Snippet::HTML : Snippet::Plain);
-                if (!empty($item'shortcut')) {
-                    $snippet->setShortCut($item'shortcut');
-                }
+                foreach ((array)($object'snippets' ?? ) as $item) {
+                    $snippet = new snippet($item'name', $item'text');
+                    $snippet->setTextType(strtolower($item'type') == 'html' ? Snippet::HTML : Snippet::Plain);
+                    if (!empty($item'shortcut')) {
+                        $snippet->setShortCut($item'shortcut');
+                    }
 
-                $snippets->push($snippet);
-            }
+                    $snippets->push($snippet);
+                }
 
-            $collection->setSnippets($snippets);
+                $collection->setSnippets($snippets);
 
-            $this->obj = new Configuration($collection);
-            break;
+                $this->obj = new Configuration($collection);
+                break;
 
-        default:
-            return false;
+            default:
+                return false;
         }
 
         // adjust content-type string
@@ -146,11 +146,11 @@
     /**
      * Convert the Configuration object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Config object data as hash array
+     * @return array Config object data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // return cached result
         if (!empty($this->data)) {
@@ -166,60 +166,60 @@
 
         // read type-specific properties
         switch ($object'type') {
-        case 'dictionary':
-            $dict = $this->obj->dictionary();
-            $object'language' = $dict->language();
-            $object'e' = self::vector2array($dict->entries());
-            break;
+            case 'dictionary':
+                $dict = $this->obj->dictionary();
+                $object'language' = $dict->language();
+                $object'e' = self::vector2array($dict->entries());
+                break;
 
-        case 'category':
-            // TODO: implement this
-            break;
+            case 'category':
+                // TODO: implement this
+                break;
 
-        case 'file_driver':
-            $driver = $this->obj->fileDriver();
+            case 'file_driver':
+                $driver = $this->obj->fileDriver();
 
-            $object'driver'  = $driver->driver();
-            $object'title'   = $driver->title();
-            $object'enabled' = $driver->enabled();
+                $object'driver'  = $driver->driver();
+                $object'title'   = $driver->title();
+                $object'enabled' = $driver->enabled();
 
-            foreach ($this->driver_settings_fields as $field) {
-                $object$field = $driver->{$field}();
-            }
+                foreach ($this->driver_settings_fields as $field) {
+                    $object$field = $driver->{$field}();
+                }
 
-            break;
+                break;
 
-        case 'relation':
-            $relation = $this->obj->relation();
+            case 'relation':
+                $relation = $this->obj->relation();
 
-            $object'name'     = $relation->name();
-            $object'category' = $relation->type();
-            $object'color'    = $relation->color();
-            $object'parent'   = $relation->parent();
-            $object'iconName' = $relation->iconName();
-            $object'priority' = $relation->priority();
-            $object'members'  = self::vector2array($relation->members());
+                $object'name'     = $relation->name();
+                $object'category' = $relation->type();
+                $object'color'    = $relation->color();
+                $object'parent'   = $relation->parent();
+                $object'iconName' = $relation->iconName();
+                $object'priority' = $relation->priority();
+                $object'members'  = self::vector2array($relation->members());
 
-            break;
+                break;
 
-        case 'snippet':
-            $collection = $this->obj->snippets();
+            case 'snippet':
+                $collection = $this->obj->snippets();
 
-            $object'name'     = $collection->name();
-            $object'snippets' = array();
+                $object'name'     = $collection->name();
+                $object'snippets' = ;
 
-            $snippets = $collection->snippets();
-            for ($i=0; $i < $snippets->size(); $i++) {
-                $snippet = $snippets->get($i);
-                $object'snippets' = array(
-                    'name'     => $snippet->name(),
-                    'text'     => $snippet->text(),
-                    'type'     => $snippet->textType() == Snippet::HTML ? 'html' : 'plain',
-                    'shortcut' => $snippet->shortCut(),
-                );
-            }
+                $snippets = $collection->snippets();
+                for ($i = 0; $i < $snippets->size(); $i++) {
+                    $snippet = $snippets->get($i);
+                    $object'snippets' = 
+                        'name'     => $snippet->name(),
+                        'text'     => $snippet->text(),
+                        'type'     => $snippet->textType() == Snippet::HTML ? 'html' : 'plain',
+                        'shortcut' => $snippet->shortCut(),
+                    ;
+                }
 
-            break;
+                break;
         }
 
         // adjust content-type string
@@ -238,16 +238,16 @@
      */
     public function get_tags()
     {
-        $tags = array();
+        $tags = ;
 
         switch ($this->data'type') {
-        case 'dictionary':
-            $tags = array($this->data'language');
-            break;
+            case 'dictionary':
+                $tags = $this->data'language';
+                break;
 
-        case 'relation':
-            $tags = array('category:' . $this->data'category');
-            break;
+            case 'relation':
+                $tags = 'category:' . $this->data'category';
+                break;
         }
 
         return $tags;
@@ -260,7 +260,7 @@
      */
     public function get_words()
     {
-        $words = array();
+        $words = ;
 
         foreach ((array)$this->data'members' as $url) {
             $member = kolab_storage_config::parse_member_url($url);
@@ -269,11 +269,9 @@
                 if (strpos($url, 'urn:uuid:') === 0) {
                     $words = substr($url, 9);
                 }
-            }
-            else if (!empty($member'params''message-id')) {
+            } elseif (!empty($member'params''message-id')) {
                 $words = $member'params''message-id';
-            }
-            else {
+            } else {
                 // derive message identifier from URI
                 $words = md5($url);
             }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_contact.php Changed

@@ -31,9 +31,9 @@
     protected $read_func = 'readContact';
     protected $write_func = 'writeContact';
 
-    public static $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'email:address');
+    public static $fulltext_cols = 'name', 'firstname', 'surname', 'middlename', 'email:address';
 
-    public $phonetypes = array(
+    public $phonetypes = 
         'home'    => Telephone::Home,
         'work'    => Telephone::Work,
         'text'    => Telephone::Text,
@@ -45,37 +45,37 @@
         'pager'   => Telephone::Pager,
         'car'     => Telephone::Car,
         'other'   => Telephone::Textphone,
-    );
+    ;
 
-    public $emailtypes = array(
+    public $emailtypes = 
         'home' => Email::Home,
         'work' => Email::Work,
         'other' => Email::NoType,
-    );
+    ;
 
-    public $addresstypes = array(
+    public $addresstypes = 
         'home' => Address::Home,
         'work' => Address::Work,
         'office' => 0,
-    );
+    ;
 
-    private $gendermap = array(
+    private $gendermap = 
         'female' => Contact::Female,
         'male'   => Contact::Male,
-    );
+    ;
 
-    private $relatedmap = array(
+    private $relatedmap = 
         'manager'   => Related::Manager,
         'assistant' => Related::Assistant,
         'spouse'    => Related::Spouse,
         'children'  => Related::Child,
-    );
+    ;
 
 
     /**
      * Default constructor
      */
-    function __construct($xmldata = null, $version = 3.0)
+    public function __construct($xmldata = null, $version = 3.0)
     {
         parent::__construct($xmldata, $version);
 
@@ -87,7 +87,7 @@
     /**
      * Set contact properties to the kolabformat object
      *
-     * @param array  Contact data as hash array
+     * @param array $object Contact data as hash array
      */
     public function set(&$object)
     {
@@ -95,7 +95,7 @@
         parent::set($object);
 
         // do the hard work of setting object values
-        $nc = new NameComponents;
+        $nc = new NameComponents();
         $nc->setSurnames(self::array2vector($object'surname' ?? null));
         $nc->setGiven(self::array2vector($object'firstname' ?? null));
         $nc->setAdditional(self::array2vector($object'middlename' ?? null));
@@ -105,23 +105,28 @@
         $this->obj->setName($object'name' ?? null);
         $this->obj->setCategories(self::array2vector($object'categories' ?? null));
 
-        if (isset($object'nickname'))
+        if (isset($object'nickname')) {
             $this->obj->setNickNames(self::array2vector($object'nickname'));
-        if (isset($object'jobtitle'))
+        }
+        if (isset($object'jobtitle')) {
             $this->obj->setTitles(self::array2vector($object'jobtitle'));
+        }
 
         // organisation related properties (affiliation)
-        $org = new Affiliation;
-        $offices = new vectoraddress;
-        if (!empty($object'organization'))
+        $org = new Affiliation();
+        $offices = new vectoraddress();
+        if (!empty($object'organization')) {
             $org->setOrganisation($object'organization');
-        if (!empty($object'department'))
+        }
+        if (!empty($object'department')) {
             $org->setOrganisationalUnits(self::array2vector($object'department'));
-        if (!empty($object'profession'))
+        }
+        if (!empty($object'profession')) {
             $org->setRoles(self::array2vector($object'profession'));
+        }
 
-        $rels = new vectorrelated;
-        foreach (array('manager','assistant') as $field) {
+        $rels = new vectorrelated();
+        foreach ('manager','assistant' as $field) {
             if (!empty($object$field)) {
                 $reltype = $this->relatedmap$field;
                 foreach ((array)$object$field as $value) {
@@ -135,18 +140,17 @@
         $this->obj->setIMaddresses(self::array2vector($object'im' ?? null));
 
         if (class_exists('vectoremail')) {
-            $vemails = new vectoremail;
+            $vemails = new vectoremail();
             foreach ((array)($object'email' ?? ) as $email) {
                 $type = $this->emailtypes$email'type';
                 $vemails->push(new Email($email'address', intval($type)));
             }
-        }
-        else {
-            $vemails = self::array2vector(array_map(function($v){ return $v'address'; }, $object'email'));
+        } else {
+            $vemails = self::array2vector(array_map(function ($v) { return $v'address'; }, $object'email'));
         }
         $this->obj->setEmailAddresses($vemails);
 
-        $vurls = new vectorurl;
+        $vurls = new vectorurl();
         foreach ((array)($object'website' ?? ) as $url) {
             $type = $url'type' == 'blog' ? Url::Blog : Url::NoType;
             $vurls->push(new Url($url'url', $type));
@@ -154,74 +158,89 @@
         $this->obj->setUrls($vurls);
 
         // addresses
-        $adrs = new vectoraddress;
+        $adrs = new vectoraddress();
         foreach ((array)($object'address' ?? )as $address) {
-            $adr = new Address;
+            $adr = new Address();
             $type = $this->addresstypes$address'type';
-            if (isset($type))
+            if (isset($type)) {
                 $adr->setTypes($type);
-            else if (!empty($address'type'))
+            } elseif (!empty($address'type')) {
                 $adr->setLabel($address'type');
-            if (!empty($address'street'))
+            }
+            if (!empty($address'street')) {
                 $adr->setStreet($address'street');
-            if (!empty($address'locality'))
+            }
+            if (!empty($address'locality')) {
                 $adr->setLocality($address'locality');
-            if (!empty($address'code'))
+            }
+            if (!empty($address'code')) {
                 $adr->setCode($address'code');
-            if (!empty($address'region'))
+            }
+            if (!empty($address'region')) {
                 $adr->setRegion($address'region');
-            if (!empty($address'country'))
+            }
+            if (!empty($address'country')) {
                 $adr->setCountry($address'country');
+            }
 
-            if (($address'type' ?? null) == 'office')
+            if (($address'type' ?? null) == 'office') {
                 $offices->push($adr);
-            else
+            } else {
                 $adrs->push($adr);
+            }
         }
         $this->obj->setAddresses($adrs);
         $org->setAddresses($offices);
 
         // add org affiliation after addresses are set
-        $orgs = new vectoraffiliation;
+        $orgs = new vectoraffiliation();
         $orgs->push($org);
         $this->obj->setAffiliations($orgs);
 
         // telephones
-        $tels = new vectortelephone;
+        $tels = new vectortelephone();
         foreach ((array)($object'phone' ?? ) as $phone) {
-            $tel = new Telephone;
-            if (isset($this->phonetypes$phone'type' ?? null))
+            $tel = new Telephone();
+            if (isset($this->phonetypes$phone'type' ?? null)) {
                 $tel->setTypes($this->phonetypes$phone'type');
+            }
             $tel->setNumber($phone'number' ?? null);
             $tels->push($tel);
         }
         $this->obj->setTelephones($tels);
 
-        if (isset($object'gender'))
+        if (isset($object'gender')) {
             $this->obj->setGender($this->gendermap$object'gender' ? $this->gendermap$object'gender' : Contact::NotSet);
-        if (isset($object'notes'))
+        }
+        if (isset($object'notes')) {
             $this->obj->setNote($object'notes');
-        if (isset($object'freebusyurl'))
+        }
+        if (isset($object'freebusyurl')) {
             $this->obj->setFreeBusyUrl($object'freebusyurl');
-        if (isset($object'lang'))
+        }
+        if (isset($object'lang')) {
             $this->obj->setLanguages(self::array2vector($object'lang'));
-        if (isset($object'birthday'))
+        }
+        if (isset($object'birthday')) {
             $this->obj->setBDay(self::get_datetime($object'birthday', false, true));
-        if (isset($object'anniversary'))
+        }
+        if (isset($object'anniversary')) {
             $this->obj->setAnniversary(self::get_datetime($object'anniversary', false, true));
+        }
 
         if (!empty($object'photo')) {
-            if ($type = rcube_mime::image_content_type($object'photo'))
+            if ($type = rcube_mime::image_content_type($object'photo')) {
                 $this->obj->setPhoto($object'photo', $type);
-        }
-        else if (isset($object'photo'))
-            $this->obj->setPhoto('','');
-        else if ($this->obj->photoMimetype())  // load saved photo for caching
+            }
+        } elseif (isset($object'photo')) {
+            $this->obj->setPhoto('', '');
+        } elseif ($this->obj->photoMimetype()) {  // load saved photo for caching
             $object'photo' = $this->obj->photo();
+        }
 
         // spouse and children are relateds
-        $rels = new vectorrelated;
-        foreach (array('spouse','children') as $field) {
+        $rels = new vectorrelated();
+        foreach ('spouse','children' as $field) {
             if (!empty($object$field)) {
                 $reltype = $this->relatedmap$field;
                 foreach ((array)$object$field as $value) {
@@ -240,25 +259,28 @@
         // insert/replace crypto keys
         $pgp_index = $pkcs7_index = -1;
         $keys = $this->obj->keys();
-        for ($i=0; $i < $keys->size(); $i++) {
+        for ($i = 0; $i < $keys->size(); $i++) {
             $key = $keys->get($i);
-            if ($pgp_index < 0 && $key->type() == Key::PGP)
+            if ($pgp_index < 0 && $key->type() == Key::PGP) {
                 $pgp_index = $i;
-            else if ($pkcs7_index < 0 && $key->type() == Key::PKCS7_MIME)
+            } elseif ($pkcs7_index < 0 && $key->type() == Key::PKCS7_MIME) {
                 $pkcs7_index = $i;
+            }
         }
 
         $pgpkey   = !empty($object'pgppublickey') ? new Key($object'pgppublickey', Key::PGP) : new Key();
         $pkcs7key = !empty($object'pkcs7publickey') ? new Key($object'pkcs7publickey', Key::PKCS7_MIME) : new Key();
 
-        if ($pgp_index >= 0)
+        if ($pgp_index >= 0) {
             $keys->set($pgp_index, $pgpkey);
-        else if (!empty($object'pgppublickey'))
+        } elseif (!empty($object'pgppublickey')) {
             $keys->push($pgpkey);
-        if ($pkcs7_index >= 0)
+        }
+        if ($pkcs7_index >= 0) {
             $keys->set($pkcs7_index, $pkcs7key);
-        else if (!empty($object'pkcs7publickey'))
+        } elseif (!empty($object'pkcs7publickey')) {
             $keys->push($pkcs7key);
+        }
 
         $this->obj->setKeys($keys);
 
@@ -283,15 +305,16 @@
     /**
      * Convert the Contact object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Contact data as hash array
+     * @return array Contact data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // return cached result
-        if (!empty($this->data))
+        if (!empty($this->data)) {
             return $this->data;
+        }
 
         // read common object props into local data object
         $object = parent::to_array($data);
@@ -299,13 +322,13 @@
         $object'name' = $this->obj->name();
 
         $nc = $this->obj->nameComponents();
-        $object'surname'    = join(' ', self::vector2array($nc->surnames()));
-        $object'firstname'  = join(' ', self::vector2array($nc->given()));
-        $object'middlename' = join(' ', self::vector2array($nc->additional()));
-        $object'prefix'     = join(' ', self::vector2array($nc->prefixes()));
-        $object'suffix'     = join(' ', self::vector2array($nc->suffixes()));
-        $object'nickname'   = join(' ', self::vector2array($this->obj->nickNames()));
-        $object'jobtitle'   = join(' ', self::vector2array($this->obj->titles()));
+        $object'surname'    = implode(' ', self::vector2array($nc->surnames()));
+        $object'firstname'  = implode(' ', self::vector2array($nc->given()));
+        $object'middlename' = implode(' ', self::vector2array($nc->additional()));
+        $object'prefix'     = implode(' ', self::vector2array($nc->prefixes()));
+        $object'suffix'     = implode(' ', self::vector2array($nc->suffixes()));
+        $object'nickname'   = implode(' ', self::vector2array($this->obj->nickNames()));
+        $object'jobtitle'   = implode(' ', self::vector2array($this->obj->titles()));
         $object'categories' = self::vector2array($this->obj->categories());
 
         // organisation related properties (affiliation)
@@ -314,8 +337,8 @@
         if ($orgs->size()) {
             $org = $orgs->get(0);
             $object'organization'   = $org->organisation();
-            $object'profession'     = join(' ', self::vector2array($org->roles()));
-            $object'department'     = join(' ', self::vector2array($org->organisationalUnits()));
+            $object'profession'     = implode(' ', self::vector2array($org->roles()));
+            $object'department'     = implode(' ', self::vector2array($org->organisationalUnits()));
             $this->read_relateds($org->relateds(), $object);
         }
 
@@ -324,65 +347,70 @@
         $emails = $this->obj->emailAddresses();
         if ($emails instanceof vectoremail) {
             $emailtypes = array_flip($this->emailtypes);
-            for ($i=0; $i < $emails->size(); $i++) {
+            for ($i = 0; $i < $emails->size(); $i++) {
                 $email = $emails->get($i);
-                $object'email' = array('address' => $email->address(), 'type' => $emailtypes$email->types());
+                $object'email' = 'address' => $email->address(), 'type' => $emailtypes$email->types();
             }
-        }
-        else {
+        } else {
             $object'email' = self::vector2array($emails);
         }
 
         $urls = $this->obj->urls();
-        for ($i=0; $i < $urls->size(); $i++) {
+        for ($i = 0; $i < $urls->size(); $i++) {
             $url = $urls->get($i);
             $subtype = $url->type() == Url::Blog ? 'blog' : 'homepage';
-            $object'website' = array('url' => $url->url(), 'type' => $subtype);
+            $object'website' = 'url' => $url->url(), 'type' => $subtype;
         }
 
         // addresses
         $this->read_addresses($this->obj->addresses(), $object);
-        if ($org && ($offices = $org->addresses()))
+        if ($org && ($offices = $org->addresses())) {
             $this->read_addresses($offices, $object, 'office');
+        }
 
         // telehones
         $tels = $this->obj->telephones();
         $teltypes = array_flip($this->phonetypes);
-        for ($i=0; $i < $tels->size(); $i++) {
+        for ($i = 0; $i < $tels->size(); $i++) {
             $tel = $tels->get($i);
-            $object'phone' = array('number' => $tel->number(), 'type' => $teltypes$tel->types());
+            $object'phone' = 'number' => $tel->number(), 'type' => $teltypes$tel->types() ?? null;
         }
 
         $object'notes' = $this->obj->note();
         $object'freebusyurl' = $this->obj->freeBusyUrl();
         $object'lang' = self::vector2array($this->obj->languages());
 
-        if ($bday = self::php_datetime($this->obj->bDay()))
+        if ($bday = self::php_datetime($this->obj->bDay())) {
             $object'birthday' = $bday;
+        }
 
-        if ($anniversary = self::php_datetime($this->obj->anniversary()))
+        if ($anniversary = self::php_datetime($this->obj->anniversary())) {
             $object'anniversary' = $anniversary;
+        }
 
         $gendermap = array_flip($this->gendermap);
-        if (($g = $this->obj->gender()) && $gendermap$g)
+        if (($g = $this->obj->gender()) && $gendermap$g) {
             $object'gender' = $gendermap$g;
+        }
 
-        if ($this->obj->photoMimetype())
+        if ($this->obj->photoMimetype()) {
             $object'photo' = $this->obj->photo();
-        else if ($this->xmlobject && ($photo_name = $this->xmlobject->pictureAttachmentName()))
+        } elseif ($this->xmlobject && ($photo_name = $this->xmlobject->pictureAttachmentName())) {
             $object'photo' = $photo_name;
+        }
 
         // relateds -> spouse, children
         $this->read_relateds($this->obj->relateds(), $object, 'related');
 
         // crypto settings: currently only key values are supported
         $keys = $this->obj->keys();
-        for ($i=0; is_object($keys) && $i < $keys->size(); $i++) {
+        for ($i = 0; is_object($keys) && $i < $keys->size(); $i++) {
             $key = $keys->get($i);
-            if ($key->type() == Key::PGP)
+            if ($key->type() == Key::PGP) {
                 $object'pgppublickey' = $key->key();
-            else if ($key->type() == Key::PKCS7_MIME)
+            } elseif ($key->type() == Key::PKCS7_MIME) {
                 $object'pkcs7publickey' = $key->key();
+            }
         }
 
         $this->data = $object;
@@ -398,20 +426,21 @@
     {
         $data = '';
         foreach (self::$fulltext_cols as $colname) {
-            list($col, $field) = array_pad(explode(':', $colname), 2, null);
+            $col, $field = array_pad(explode(':', $colname), 2, null);
 
             if ($field) {
-                $a = array();
-                foreach ((array)($this->data$col ?? ) as $attr)
+                $a = ;
+                foreach ((array)($this->data$col ?? ) as $attr) {
                     $a = $attr$field;
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($this->data$col ?? null) ? join(' ', $this->data$col ?? null) : ($this->data$col ?? null);
+                }
+                $val = implode(' ', $a);
+            } else {
+                $val = is_array($this->data$col ?? null) ? implode(' ', $this->data$col ?? null) : ($this->data$col ?? null);
             }
 
-            if (strlen($val))
+            if (strlen($val)) {
                 $data .= $val . ' ';
+            }
         }
 
         return array_unique(rcube_utils::normalize_string($data, true));
@@ -424,7 +453,7 @@
      */
     public function get_tags()
     {
-        $tags = array();
+        $tags = ;
 
         if (!empty($this->data'birthday')) {
             $tags = 'x-has-birthday';
@@ -440,16 +469,16 @@
     {
         $adrtypes = array_flip($this->addresstypes);
 
-        for ($i=0; $i < $addresses->size(); $i++) {
+        for ($i = 0; $i < $addresses->size(); $i++) {
             $adr = $addresses->get($i);
-            $object'address' = array(
+            $object'address' = 
                 'type'     => $type ? $type : ($adrtypes$adr->types() ? $adrtypes$adr->types() : ''), /*$adr->label()),*/
                 'street'   => $adr->street(),
                 'code'     => $adr->code(),
                 'locality' => $adr->locality(),
                 'region'   => $adr->region(),
-                'country'  => $adr->country()
-            );
+                'country'  => $adr->country(),
+            ;
         }
     }
 
@@ -460,10 +489,11 @@
     {
         $typemap = array_flip($this->relatedmap);
 
-        for ($i=0; $i < $rels->size(); $i++) {
+        for ($i = 0; $i < $rels->size(); $i++) {
             $rel = $rels->get($i);
-            if ($rel->type() != Related::Text)  // we can't handle UID relations yet
+            if ($rel->type() != Related::Text) {  // we can't handle UID relations yet
                 continue;
+            }
 
             $known = false;
             $types = $rel->relationTypes();

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_distributionlist.php Changed

@@ -35,7 +35,7 @@
     /**
      * Set properties to the kolabformat object
      *
-     * @param array  Object data as hash array
+     * @param array $object Object data as hash array
      */
     public function set(&$object)
     {
@@ -44,27 +44,24 @@
 
         $this->obj->setName($object'name');
 
-        $seen = array();
-        $members = new vectorcontactref;
+        $seen = ;
+        $members = new vectorcontactref();
         foreach ((array)$object'member' as $i => $member) {
             if ($member'uid') {
                 $key = 'uid:' . $member'uid';
                 $m = new ContactReference(ContactReference::UidReference, $member'uid');
-            }
-            else if ($member'email') {
+            } elseif ($member'email') {
                 $key = 'mailto:' . $member'email';
                 $m = new ContactReference(ContactReference::EmailReference, $member'email');
                 $m->setName($member'name');
-            }
-            else {
+            } else {
                 continue;
             }
 
             if (empty($seen$key)) {
                 $members->push($m);
                 $seen$key = true;
-            }
-            else {
+            } else {
                 // remove dupes for caching
                 unset($object'member'$i);
             }
@@ -88,39 +85,39 @@
     /**
      * Convert the Distlist object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Distribution list data as hash array
+     * @return array Distribution list data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // return cached result
-        if (!empty($this->data))
+        if (!empty($this->data)) {
             return $this->data;
+        }
 
         // read common object props into local data object
         $object = parent::to_array($data);
 
         // add object properties
-        $object += array(
+        $object += 
             'name'      => $this->obj->name(),
-            'member'    => array(),
+            'member'    => ,
             '_type'     => 'distribution-list',
-        );
+        ;
 
         $members = $this->obj->members();
-        for ($i=0; $i < $members->size(); $i++) {
+        for ($i = 0; $i < $members->size(); $i++) {
             $member = $members->get($i);
-//            if ($member->type() == ContactReference::UidReference && ($uid = $member->uid()))
-                $object'member' = array(
-                    'uid'   => $member->uid(),
-                    'email' => $member->email(),
-                    'name'  => $member->name(),
-                );
+            //            if ($member->type() == ContactReference::UidReference && ($uid = $member->uid()))
+            $object'member' = 
+                'uid'   => $member->uid(),
+                'email' => $member->email(),
+                'name'  => $member->name(),
+            ;
         }
 
         $this->data = $object;
         return $this->data;
     }
-
 }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_event.php Changed

@@ -26,7 +26,7 @@
 {
     public $CTYPEv2 = 'application/x-vnd.kolab.event';
 
-    public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled');
+    public static $scheduling_properties = 'start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled';
 
     protected $objclass = 'Event';
     protected $read_func = 'readEvent';
@@ -35,7 +35,7 @@
     /**
      * Default constructor
      */
-    function __construct($data = null, $version = 3.0)
+    public function __construct($data = null, $version = 3.0)
     {
         parent::__construct(is_string($data) ? $data : null, $version);
 
@@ -52,7 +52,7 @@
     /**
      * Set event properties to the kolabformat object
      *
-     * @param array  Event data as hash array
+     * @param array $object Event data as hash array
      */
     public function set(&$object)
     {
@@ -70,8 +70,7 @@
         }
         if (!empty($object'cancelled')) {
             $status = kolabformat::StatusCancelled;
-        }
-        else if (!empty($object'status') && array_key_exists($object'status', $this->status_map)) {
+        } elseif (!empty($object'status') && array_key_exists($object'status', $this->status_map)) {
             $status = $this->status_map$object'status';
         }
         $this->obj->setStatus($status);
@@ -81,40 +80,37 @@
             $object'exceptions' = $object'recurrence''EXCEPTIONS';
         }
 
-        if (!empty($object'exceptions')) {
-            $recurrence_id_format = libkolab::recurrence_id_format($object);
-            $vexceptions = new vectorevent;
-            foreach ($object'exceptions' as $i => $exception) {
-                $exevent = new kolab_format_event;
-                $compacted = $this->compact_exception($exception, $object);
-                $exevent->set($compacted);  // only save differing values
-
-                // get value for recurrence-id
-                $recurrence_id = null;
-                if (!empty($exception'recurrence_date') && $exception'recurrence_date' instanceof DateTimeInterface) {
-                    $recurrence_id = $exception'recurrence_date';
-                    $compacted'_instance' = $recurrence_id->format($recurrence_id_format);
-                }
-                else if (!empty($exception'_instance') && strlen($exception'_instance') > 4) {
-                    $recurrence_id = rcube_utils::anytodatetime($exception'_instance', $object'start'->getTimezone());
-                    $compacted'recurrence_date' = $recurrence_id;
-                }
+        $recurrence_id_format = libkolab::recurrence_id_format($object);
+        $vexceptions = new vectorevent();
+        foreach (($object'exceptions' ?? ) as $i => $exception) {
+            $exevent = new kolab_format_event();
+            $compacted = $this->compact_exception($exception, $object);
+            $exevent->set($compacted);  // only save differing values
+
+            // get value for recurrence-id
+            $recurrence_id = null;
+            if (!empty($exception'recurrence_date') && $exception'recurrence_date' instanceof DateTimeInterface) {
+                $recurrence_id = $exception'recurrence_date';
+                $compacted'_instance' = $recurrence_id->format($recurrence_id_format);
+            } elseif (!empty($exception'_instance') && strlen($exception'_instance') > 4) {
+                $recurrence_id = rcube_utils::anytodatetime($exception'_instance', $object'start'->getTimezone());
+                $compacted'recurrence_date' = $recurrence_id;
+            }
 
-                $ex_dt = self::get_datetime($recurrence_id ?: $exception'start', null,  !empty($object'allday'));
-                $exevent->obj->setRecurrenceID($ex_dt, !empty($exception'thisandfuture'));
+            $ex_dt = self::get_datetime($recurrence_id ?: $exception'start', null, !empty($object'allday'));
+            $exevent->obj->setRecurrenceID($ex_dt, !empty($exception'thisandfuture'));
 
-                $vexceptions->push($exevent->obj);
+            $vexceptions->push($exevent->obj);
 
-                // write cleaned-up exception data back to memory/cache
-                $object'exceptions'$i = $this->expand_exception($exevent->data, $object);
-                $object'exceptions'$i'_instance' = $compacted'_instance';
-            }
-            $this->obj->setExceptions($vexceptions);
+            // write cleaned-up exception data back to memory/cache
+            $object'exceptions'$i = $this->expand_exception($exevent->data, $object);
+            $object'exceptions'$i'_instance' = $compacted'_instance';
+        }
+        $this->obj->setExceptions($vexceptions);
 
-            // link with recurrence.EXCEPTIONS for compatibility
-            if (is_array($object'recurrence' ?? null)) {
-                $object'recurrence''EXCEPTIONS' = &$object'exceptions';
-            }
+        // link with recurrence.EXCEPTIONS for compatibility
+        if (isset($object'exceptions') && is_array($object'recurrence' ?? null)) {
+            $object'recurrence''EXCEPTIONS' = &$object'exceptions';
         }
 
         if (!empty($object'recurrence_date') && $object'recurrence_date' instanceof DateTimeInterface) {
@@ -143,26 +139,27 @@
     /**
      * Convert the Event object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Event data as hash array
+     * @return array Event data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // return cached result
-        if (!empty($this->data))
+        if (!empty($this->data)) {
             return $this->data;
+        }
 
         // read common xcal props
         $object = parent::to_array($data);
 
         // read object properties
-        $object += array(
+        $object += 
             'end'         => self::php_datetime($this->obj->end()),
             'allday'      => $this->obj->start()->isDateOnly(),
             'free_busy'   => $this->obj->transparency() ? 'free' : 'busy',  // TODO: transparency is only boolean
-            'attendees'   => array(),
-        );
+            'attendees'   => ,
+        ;
 
         // derive event end from duration (#1916)
         if (!$object'end' && $object'start' && ($duration = $this->obj->duration()) && $duration->isValid()) {
@@ -175,7 +172,7 @@
             $object'end'->add($interval);
         }
         // make sure end date is specified (#5307) RFC5545 3.6.1
-        else if (!$object'end' && $object'start') {
+        elseif (!$object'end' && $object'start') {
             $object'end' = clone $object'start';
         }
 
@@ -187,10 +184,11 @@
 
         // status defines different event properties...
         $status = $this->obj->status();
-        if ($status == kolabformat::StatusTentative)
+        if ($status == kolabformat::StatusTentative) {
             $object'free_busy' = 'tentative';
-        else if ($status == kolabformat::StatusCancelled)
+        } elseif ($status == kolabformat::StatusCancelled) {
             $object'cancelled' = true;
+        }
 
         // this is an exception object
         if ($this->obj->recurrenceID()->isValid()) {
@@ -199,9 +197,9 @@
         }
         // read exception event objects
         if (($exceptions = $this->obj->exceptions()) && is_object($exceptions) && $exceptions->size()) {
-            $recurrence_exceptions = array();
+            $recurrence_exceptions = ;
             $recurrence_id_format = libkolab::recurrence_id_format($object);
-            for ($i=0; $i < $exceptions->size(); $i++) {
+            for ($i = 0; $i < $exceptions->size(); $i++) {
                 if (($exobj = $exceptions->get($i))) {
                     $exception = new kolab_format_event($exobj);
                     if ($exception->is_valid()) {
@@ -222,7 +220,7 @@
             $object'exceptions' = $recurrence_exceptions;
 
             // also link with recurrence.EXCEPTIONS for compatibility
-            if (!empty($object'recurrence') && isset($object'exceptions')) {
+            if (!empty($object'recurrence')) {
                 $object'recurrence''EXCEPTIONS' = &$object'exceptions';
             }
         }
@@ -233,7 +231,8 @@
     /**
      * Getter for a single instance from a recurrence series or stored subcomponents
      *
-     * @param mixed The recurrence-id of the requested instance, either as string or a DateTime object
+     * @param mixed $recurrence_id The recurrence-id of the requested instance, either as string or a DateTime object
+     *
      * @return array Event data as hash array or null if not found
      */
     public function get_instance($recurrence_id)
@@ -288,7 +287,7 @@
      */
     private function compact_exception($exception, $master)
     {
-        $forbidden = array('recurrence','exceptions','organizer','_attachments');
+        $forbidden = 'recurrence','exceptions','organizer','_attachments';
 
         foreach ($forbidden as $prop) {
             if (array_key_exists($prop, $exception)) {
@@ -312,13 +311,13 @@
         // Note: If an exception has no attendees it means there's "no attendees
         // for this occurrence", not "attendees are the same as in the event" (#5300)
 
-        $forbidden    = array('exceptions', 'attendees', 'allday');
+        $forbidden    = 'exceptions', 'attendees', 'allday';
         $is_recurring = !empty($master'recurrence');
 
         foreach ($master as $prop => $value) {
             if (empty($exception$prop) && !empty($value) && $prop0 != '_'
                 && !in_array($prop, $forbidden)
-                && ($is_recurring || in_array($prop, array('uid','organizer')))
+                && ($is_recurring || in_array($prop, 'uid','organizer'))
             ) {
                 $exception$prop = $value;
                 if ($prop == 'recurrence') {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_file.php Changed

@@ -34,7 +34,7 @@
     /**
      * Set properties to the kolabformat object
      *
-     * @param array  Object data as hash array
+     * @param array $object Object data as hash array
      */
     public function set(&$object)
     {
@@ -51,7 +51,7 @@
         if (!empty($object'_attachments')) {
             $cid         = key($object'_attachments');
             $attach_attr = $object'_attachments'$cid;
-            $attach      = new Attachment;
+            $attach      = new Attachment();
 
             $attach->setLabel((string)$attach_attr'name');
             $attach->setUri('cid:' . $cid, $attach_attr'mimetype');
@@ -65,12 +65,10 @@
                     if (is_resource($attach_attr'content')) {
                         $stat = fstat($attach_attr'content');
                         $size = $stat ? $stat'size' : 0;
-                    }
-                    else {
+                    } else {
                         $size = strlen($attach_attr'content');
                     }
-                }
-                else if (isset($attach_attr'path')) {
+                } elseif (isset($attach_attr'path')) {
                     $size = @filesize($attach_attr'path');
                 }
 
@@ -94,9 +92,9 @@
     /**
      * Convert the Configuration object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Config object data as hash array
+     * @return array Config object data as hash array
      */
     public function to_array($data = )
     {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_journal.php Changed

@@ -35,7 +35,7 @@
     /**
      * Set properties to the kolabformat object
      *
-     * @param array  Object data as hash array
+     * @param array $object Object data as hash array
      */
     public function set(&$object)
     {
@@ -60,15 +60,16 @@
     /**
      * Convert the Configuration object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Config object data as hash array
+     * @return array Config object data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // return cached result
-        if (!empty($this->data))
+        if (!empty($this->data)) {
             return $this->data;
+        }
 
         // read common object props into local data object
         $object = parent::to_array($data);
@@ -78,5 +79,4 @@
         $this->data = $object;
         return $this->data;
     }
-
 }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_note.php Changed

@@ -27,7 +27,7 @@
     public $CTYPE = 'application/vnd.kolab+xml';
     public $CTYPEv2 = 'application/x-vnd.kolab.note';
 
-    public static $fulltext_cols = array('title', 'description', 'categories');
+    public static $fulltext_cols = 'title', 'description', 'categories';
 
     protected $objclass = 'Note';
     protected $read_func = 'readNote';
@@ -36,7 +36,7 @@
     /**
      * Set properties to the kolabformat object
      *
-     * @param array  Object data as hash array
+     * @param array $object Object data as hash array
      */
     public function set(&$object)
     {
@@ -65,25 +65,26 @@
     /**
      * Convert the Configuration object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Config object data as hash array
+     * @return array Config object data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // return cached result
-        if (!empty($this->data))
+        if (!empty($this->data)) {
             return $this->data;
+        }
 
         // read common object props into local data object
         $object = parent::to_array($data);
 
         // read object properties
-        $object += array(
+        $object += 
             'categories'  => self::vector2array($this->obj->categories()),
             'title'       => $this->obj->summary(),
             'description' => $this->obj->description(),
-        );
+        ;
 
         $this->get_attachments($object);
 
@@ -97,7 +98,7 @@
      */
     public function get_tags()
     {
-        $tags = array();
+        $tags = ;
 
         foreach ((array)($this->data'categories' ?? null) as $cat) {
             $tags = rcube_utils::normalize_string($cat);
@@ -129,12 +130,11 @@
             }
 
             // convert HTML content to plain text
-            if ($col == 'description' && preg_match('/<(html|body)(\sa-z|>)/', $this->data$col, $m) && strpos($this->data$col, '</'.$m1.'>')) {
+            if ($col == 'description' && preg_match('/<(html|body)(\sa-z|>)/', $this->data$col, $m) && strpos($this->data$col, '</' . $m1 . '>')) {
                 $converter = new rcube_html2text($this->data$col, false, false, 0);
                 $val = $converter->get_text();
-            }
-            else {
-                $val = is_array($this->data$col) ? join(' ', $this->data$col) : $this->data$col;
+            } else {
+                $val = is_array($this->data$col) ? implode(' ', $this->data$col) : $this->data$col;
             }
 
             if (strlen($val)) {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_task.php Changed

@@ -26,7 +26,7 @@
 {
     public $CTYPEv2 = 'application/x-vnd.kolab.task';
 
-    public static $scheduling_properties = array('start', 'due', 'summary', 'status');
+    public static $scheduling_properties = 'start', 'due', 'summary', 'status';
 
     protected $objclass = 'Todo';
     protected $read_func = 'readTodo';
@@ -35,7 +35,7 @@
     /**
      * Default constructor
      */
-    function __construct($data = null, $version = 3.0)
+    public function __construct($data = null, $version = 3.0)
     {
         parent::__construct(is_string($data) ? $data : null, $version);
 
@@ -46,20 +46,23 @@
     /**
      * Set properties to the kolabformat object
      *
-     * @param array  Object data as hash array
+     * @param array $object Object data as hash array
      */
     public function set(&$object)
     {
         // set common xcal properties
         parent::set($object);
 
-        $this->obj->setPercentComplete(intval($object'complete'));
+        $object'complete' = (int) ($object'complete' ?? 0);
+
+        $this->obj->setPercentComplete($object'complete');
 
         $status = kolabformat::StatusUndefined;
-        if ($object'complete' == 100 && !array_key_exists('status', $object))
+        if ($object'complete' == 100 && !array_key_exists('status', $object)) {
             $status = kolabformat::StatusCompleted;
-        else if (!empty($object'status') && array_key_exists($object'status', $this->status_map))
+        } elseif (!empty($object'status') && array_key_exists($object'status', $this->status_map)) {
             $status = $this->status_map$object'status';
+        }
         $this->obj->setStatus($status);
 
         if (!empty($object'start')) {
@@ -69,9 +72,10 @@
             $this->obj->setDue(self::get_datetime($object'due', null, !empty($object'due'->_dateonly)));
         }
 
-        $related = new vectors;
-        if (!empty($object'parent_id'))
+        $related = new vectors();
+        if (!empty($object'parent_id')) {
             $related->push($object'parent_id');
+        }
         $this->obj->setRelatedTo($related);
 
         // cache this data
@@ -90,15 +94,16 @@
     /**
      * Convert the Configuration object into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Config object data as hash array
+     * @return array Config object data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // return cached result
-        if (!empty($this->data))
+        if (!empty($this->data)) {
             return $this->data;
+        }
 
         // read common xcal props
         $object = parent::to_array($data);
@@ -106,13 +111,15 @@
         $object'complete' = intval($this->obj->percentComplete());
 
         // if due date is set
-        if ($due = $this->obj->due())
+        if ($due = $this->obj->due()) {
             $object'due' = self::php_datetime($due);
+        }
 
         // related-to points to parent task; we only support one relation
         $related = self::vector2array($this->obj->relatedTo());
-        if (count($related))
+        if (count($related)) {
             $object'parent_id' = $related0;
+        }
 
         // TODO: map more properties
 
@@ -144,14 +151,17 @@
         $tags = parent::get_tags($obj);
         $object = $obj ?: $this->data;
 
-        if (($object'status' ?? null) == 'COMPLETED' || (($object'complete' ?? null) == 100 && empty($object'status' ?? null)))
+        if (($object'status' ?? null) == 'COMPLETED' || (($object'complete' ?? null) == 100 && empty($object'status' ?? null))) {
             $tags = 'x-complete';
+        }
 
-        if (!empty($object'priority'))
+        if (!empty($object'priority')) {
             $tags = 'x-flagged';
+        }
 
-        if (!empty($object'parent_id'))
+        if (!empty($object'parent_id')) {
             $tags = 'x-parent:' . $object'parent_id';
+        }
 
         return array_unique($tags);
     }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php Changed

@@ -28,37 +28,37 @@
 {
     public $CTYPE = 'application/calendar+xml';
 
-    public static $fulltext_cols = array('title', 'description', 'location', 'attendees:name', 'attendees:email', 'categories');
+    public static $fulltext_cols = 'title', 'description', 'location', 'attendees:name', 'attendees:email', 'categories';
 
-    public static $scheduling_properties = array('start', 'end', 'location');
+    public static $scheduling_properties = 'start', 'end', 'location';
 
     protected $_scheduling_properties = null;
 
-    protected $role_map = array(
+    protected $role_map = 
         'REQ-PARTICIPANT' => kolabformat::Required,
         'OPT-PARTICIPANT' => kolabformat::Optional,
         'NON-PARTICIPANT' => kolabformat::NonParticipant,
         'CHAIR' => kolabformat::Chair,
-    );
+    ;
 
-    protected $cutype_map = array(
+    protected $cutype_map = 
         'INDIVIDUAL' => kolabformat::CutypeIndividual,
         'GROUP'      => kolabformat::CutypeGroup,
         'ROOM'       => kolabformat::CutypeRoom,
         'RESOURCE'   => kolabformat::CutypeResource,
         'UNKNOWN'    => kolabformat::CutypeUnknown,
-    );
+    ;
 
-    protected $rrule_type_map = array(
+    protected $rrule_type_map = 
         'MINUTELY' => RecurrenceRule::Minutely,
         'HOURLY' => RecurrenceRule::Hourly,
         'DAILY' => RecurrenceRule::Daily,
         'WEEKLY' => RecurrenceRule::Weekly,
         'MONTHLY' => RecurrenceRule::Monthly,
         'YEARLY' => RecurrenceRule::Yearly,
-    );
+    ;
 
-    protected $weekday_map = array(
+    protected $weekday_map = 
         'MO' => kolabformat::Monday,
         'TU' => kolabformat::Tuesday,
         'WE' => kolabformat::Wednesday,
@@ -66,15 +66,15 @@
         'FR' => kolabformat::Friday,
         'SA' => kolabformat::Saturday,
         'SU' => kolabformat::Sunday,
-    );
+    ;
 
-    protected $alarm_type_map = array(
+    protected $alarm_type_map = 
         'DISPLAY' => Alarm::DisplayAlarm,
         'EMAIL' => Alarm::EMailAlarm,
         'AUDIO' => Alarm::AudioAlarm,
-    );
+    ;
 
-    protected $status_map = array(
+    protected $status_map = 
         'NEEDS-ACTION' => kolabformat::StatusNeedsAction,
         'IN-PROCESS'   => kolabformat::StatusInProcess,
         'COMPLETED'    => kolabformat::StatusCompleted,
@@ -83,9 +83,9 @@
         'CONFIRMED'    => kolabformat::StatusConfirmed,
         'DRAFT'        => kolabformat::StatusDraft,
         'FINAL'        => kolabformat::StatusFinal,
-    );
+    ;
 
-    protected $part_status_map = array(
+    protected $part_status_map = 
         'UNKNOWN'      => kolabformat::PartNeedsAction,
         'NEEDS-ACTION' => kolabformat::PartNeedsAction,
         'TENTATIVE'    => kolabformat::PartTentative,
@@ -94,24 +94,24 @@
         'DELEGATED'    => kolabformat::PartDelegated,
         'IN-PROCESS'   => kolabformat::PartInProcess,
         'COMPLETED'    => kolabformat::PartCompleted,
-      );
+      ;
 
 
     /**
      * Convert common xcard properties into a hash array data structure
      *
-     * @param array Additional data for merge
+     * @param array $data Additional data for merge
      *
-     * @return array  Object data as hash array
+     * @return array Object data as hash array
      */
-    public function to_array($data = array())
+    public function to_array($data = )
     {
         // read common object props
         $object = parent::to_array($data);
 
         $status_map = array_flip($this->status_map);
 
-        $object += array(
+        $object += 
             'sequence'    => intval($this->obj->sequence()),
             'title'       => $this->obj->summary(),
             'location'    => $this->obj->location(),
@@ -121,7 +121,7 @@
             'priority'    => $this->obj->priority(),
             'categories'  => self::vector2array($this->obj->categories()),
             'start'       => self::php_datetime($this->obj->start()),
-        );
+        ;
 
         if (method_exists($this->obj, 'comment')) {
             $object'comment' = $this->obj->comment();
@@ -129,10 +129,10 @@
 
         // read organizer and attendees
         if (($organizer = $this->obj->organizer()) && ($organizer->email() || $organizer->name())) {
-            $object'organizer' = array(
+            $object'organizer' = 
                 'email' => $organizer->email(),
                 'name' => $organizer->name(),
-            );
+            ;
         }
 
         // Get the list of attendees (excluding the organizer)
@@ -140,21 +140,21 @@
         $cutype_map = array_flip($this->cutype_map);
         $part_status_map = array_flip($this->part_status_map);
         $attvec = $this->obj->attendees();
-        for ($i=0; $i < $attvec->size(); $i++) {
+        for ($i = 0; $i < $attvec->size(); $i++) {
             $attendee = $attvec->get($i);
             $cr = $attendee->contact();
             if (empty($object'organizer''email') || strcasecmp($cr->email(), $object'organizer''email')) {
-                $delegators = $delegatees = array();
+                $delegators = $delegatees = ;
                 $vdelegators = $attendee->delegatedFrom();
-                for ($j=0; $j < $vdelegators->size(); $j++) {
+                for ($j = 0; $j < $vdelegators->size(); $j++) {
                     $delegators = $vdelegators->get($j)->email();
                 }
                 $vdelegatees = $attendee->delegatedTo();
-                for ($j=0; $j < $vdelegatees->size(); $j++) {
+                for ($j = 0; $j < $vdelegatees->size(); $j++) {
                     $delegatees = $vdelegatees->get($j)->email();
                 }
 
-                $object'attendees' = array(
+                $object'attendees' = 
                     'role' => $role_map$attendee->role(),
                     'cutype' => $cutype_map$attendee->cutype(),
                     'status' => $part_status_map$attendee->partStat(),
@@ -163,10 +163,11 @@
                     'name' => $cr->name(),
                     'delegated-from' => $delegators,
                     'delegated-to' => $delegatees,
-                );
+                ;
             }
         }
 
+        $start_tz = null;
         if ($object'start' instanceof DateTimeInterface) {
             $start_tz = $object'start'->getTimezone();
         }
@@ -174,15 +175,15 @@
         // read recurrence rule
         if (($rr = $this->obj->recurrenceRule()) && $rr->isValid()) {
             $rrule_type_map = array_flip($this->rrule_type_map);
-            $object'recurrence' = array('FREQ' => $rrule_type_map$rr->frequency());
+            $object'recurrence' = 'FREQ' => $rrule_type_map$rr->frequency();
 
-            if ($intvl = $rr->interval())
+            if ($intvl = $rr->interval()) {
                 $object'recurrence''INTERVAL' = $intvl;
+            }
 
             if (($count = $rr->count()) && $count > 0) {
                 $object'recurrence''COUNT' = $count;
-            }
-            else if ($until = self::php_datetime($rr->end(), $start_tz)) {
+            } elseif ($until = self::php_datetime($rr->end(), $start_tz)) {
                 $refdate = $this->get_reference_date();
                 if ($refdate && $refdate instanceof DateTimeInterface && empty($refdate->_dateonly)) {
                     $until->setTime($refdate->format('G'), $refdate->format('i'), 0);
@@ -192,25 +193,25 @@
 
             if (($byday = $rr->byday()) && $byday->size()) {
                 $weekday_map = array_flip($this->weekday_map);
-                $weekdays = array();
-                for ($i=0; $i < $byday->size(); $i++) {
+                $weekdays = ;
+                for ($i = 0; $i < $byday->size(); $i++) {
                     $daypos = $byday->get($i);
                     $prefix = $daypos->occurence();
                     $weekdays = ($prefix ?: '') . $weekday_map$daypos->weekday();
                 }
-                $object'recurrence''BYDAY' = join(',', $weekdays);
+                $object'recurrence''BYDAY' = implode(',', $weekdays);
             }
 
             if (($bymday = $rr->bymonthday()) && $bymday->size()) {
-                $object'recurrence''BYMONTHDAY' = join(',', self::vector2array($bymday));
+                $object'recurrence''BYMONTHDAY' = implode(',', self::vector2array($bymday));
             }
 
             if (($bymonth = $rr->bymonth()) && $bymonth->size()) {
-                $object'recurrence''BYMONTH' = join(',', self::vector2array($bymonth));
+                $object'recurrence''BYMONTH' = implode(',', self::vector2array($bymonth));
             }
 
             if ($exdates = $this->obj->exceptionDates()) {
-                for ($i=0; $i < $exdates->size(); $i++) {
+                for ($i = 0; $i < $exdates->size(); $i++) {
                     if ($exdate = self::php_datetime($exdates->get($i), $start_tz)) {
                         $object'recurrence''EXDATE' = $exdate;
                     }
@@ -219,7 +220,7 @@
         }
 
         if ($rdates = $this->obj->recurrenceDates()) {
-            for ($i=0; $i < $rdates->size(); $i++) {
+            for ($i = 0; $i < $rdates->size(); $i++) {
                 if ($rdate = self::php_datetime($rdates->get($i), $start_tz)) {
                     $object'recurrence''RDATE' = $rdate;
                 }
@@ -229,27 +230,26 @@
         // read alarm
         $valarms = $this->obj->alarms();
         $alarm_types = array_flip($this->alarm_type_map);
-        $object'valarms' = array();
-        for ($i=0; $i < $valarms->size(); $i++) {
+        $object'valarms' = ;
+        for ($i = 0; $i < $valarms->size(); $i++) {
             $alarm = $valarms->get($i);
             $type  = $alarm_types$alarm->type();
 
             if ($type == 'DISPLAY' || $type == 'EMAIL' || $type == 'AUDIO') {  // only some alarms are supported
-                $valarm = array(
+                $valarm = 
                     'action'      => $type,
                     'summary'     => $alarm->summary(),
                     'description' => $alarm->description(),
-                );
+                ;
 
                 if ($type == 'EMAIL') {
-                    $valarm'attendees' = array();
+                    $valarm'attendees' = ;
                     $attvec = $alarm->attendees();
-                    for ($j=0; $j < $attvec->size(); $j++) {
+                    for ($j = 0; $j < $attvec->size(); $j++) {
                         $cr = $attvec->get($j);
                         $valarm'attendees' = $cr->email();
                     }
-                }
-                else if ($type == 'AUDIO') {
+                } elseif ($type == 'AUDIO') {
                     $attach = $alarm->audioFile();
                     $valarm'uri' = $attach->uri();
                 }
@@ -257,17 +257,22 @@
                 if ($start = self::php_datetime($alarm->start())) {
                     $object'alarms'  = '@' . $start->format('U');
                     $valarm'trigger' = $start;
-                }
-                else if ($offset = $alarm->relativeStart()) {
+                } elseif ($offset = $alarm->relativeStart()) {
                     $prefix = $offset->isNegative() ? '-' : '+';
                     $value  = '';
                     $time   = '';
 
-                    if      ($w = $offset->weeks())     $value .= $w . 'W';
-                    else if ($d = $offset->days())      $value .= $d . 'D';
-                    else if ($h = $offset->hours())     $time  .= $h . 'H';
-                    else if ($m = $offset->minutes())   $time  .= $m . 'M';
-                    else if ($s = $offset->seconds())   $time  .= $s . 'S';
+                    if      ($w = $offset->weeks()) {
+                        $value .= $w . 'W';
+                    } elseif ($d = $offset->days()) {
+                        $value .= $d . 'D';
+                    } elseif ($h = $offset->hours()) {
+                        $time  .= $h . 'H';
+                    } elseif ($m = $offset->minutes()) {
+                        $time  .= $m . 'M';
+                    } elseif ($s = $offset->seconds()) {
+                        $time  .= $s . 'S';
+                    }
 
                     // assume 'at event time'
                     if (empty($value) && empty($time)) {
@@ -287,11 +292,17 @@
                 if (($duration = $alarm->duration()) && $duration->isValid()) {
                     $value = $time = '';
 
-                    if      ($w = $duration->weeks())     $value .= $w . 'W';
-                    else if ($d = $duration->days())      $value .= $d . 'D';
-                    else if ($h = $duration->hours())     $time  .= $h . 'H';
-                    else if ($m = $duration->minutes())   $time  .= $m . 'M';
-                    else if ($s = $duration->seconds())   $time  .= $s . 'S';
+                    if      ($w = $duration->weeks()) {
+                        $value .= $w . 'W';
+                    } elseif ($d = $duration->days()) {
+                        $value .= $d . 'D';
+                    } elseif ($h = $duration->hours()) {
+                        $time  .= $h . 'H';
+                    } elseif ($m = $duration->minutes()) {
+                        $time  .= $m . 'M';
+                    } elseif ($s = $duration->seconds()) {
+                        $time  .= $s . 'S';
+                    }
 
                     $valarm'duration' = 'P' . $value . ($time ? 'T' . $time : '');
                     $valarm'repeat'   = $alarm->numrepeat();
@@ -311,7 +322,7 @@
     /**
      * Set common xcal properties to the kolabformat object
      *
-     * @param array  Event data as hash array
+     * @param array $object Event data as hash array
      */
     public function set(&$object)
     {
@@ -328,8 +339,7 @@
         if (!isset($object'sequence')) {
             if ($is_new) {
                 $object'sequence' = 0;
-            }
-            else {
+            } else {
                 $object'sequence' = $old_sequence;
 
                 // increment sequence when updating properties relevant for scheduling.
@@ -357,12 +367,11 @@
         }
 
         // process event attendees
-        $attendees = new vectorattendee;
+        $attendees = new vectorattendee();
         foreach ((array)($object'attendees' ?? ) as $i => $attendee) {
             if (!empty($attendee'role') && $attendee'role' == 'ORGANIZER') {
                 $object'organizer' = $attendee;
-            }
-            else if (
+            } elseif (
                 !empty($attendee'email')
                 && (empty($object'organizer''email') || $attendee'email' != $object'organizer''email')
             ) {
@@ -378,7 +387,7 @@
                 $partstat = $this->part_status_map$attendee'status' ?? -1 ?? null;
                 $role     = $this->role_map$attendee'role' ?? -1 ?? null;
 
-                $att = new Attendee;
+                $att = new Attendee();
                 $att->setContact($cr);
                 $att->setPartStat($partstat);
                 $att->setRole($role ?: kolabformat::Required);
@@ -386,14 +395,14 @@
                 $att->setRSVP(!empty($attendee'rsvp'));
 
                 if (!empty($attendee'delegated-from')) {
-                    $vdelegators = new vectorcontactref;
+                    $vdelegators = new vectorcontactref();
                     foreach ((array)$attendee'delegated-from' as $delegator) {
                         $vdelegators->push(new ContactReference(ContactReference::EmailReference, $delegator));
                     }
                     $att->setDelegatedFrom($vdelegators);
                 }
                 if (!empty($attendee'delegated-to')) {
-                    $vdelegatees = new vectorcontactref;
+                    $vdelegatees = new vectorcontactref();
                     foreach ((array)$attendee'delegated-to' as $delegatee) {
                         $vdelegatees->push(new ContactReference(ContactReference::EmailReference, $delegatee));
                     }
@@ -402,13 +411,12 @@
 
                 if ($att->isValid()) {
                     $attendees->push($att);
-                }
-                else {
-                    rcube::raise_error(array(
+                } else {
+                    rcube::raise_error(
                         'code' => 600, 'type' => 'php',
                         'file' => __FILE__, 'line' => __LINE__,
                         'message' => "Invalid event attendee: " . json_encode($attendee),
-                    ), true);
+                    , true);
                 }
             }
         }
@@ -420,12 +428,13 @@
             $this->obj->setOrganizer($organizer);
         }
 
+        $start_tz = null;
         if (($object'start' ?? null) instanceof DateTimeInterface) {
             $start_tz = $object'start'->getTimezone();
         }
 
         // save recurrence rule
-        $rr = new RecurrenceRule;
+        $rr = new RecurrenceRule();
         $rr->setFrequency(RecurrenceRule::FreqNone);
 
         if (!empty($object'recurrence''FREQ')) {
@@ -434,11 +443,12 @@
 
             $rr->setFrequency($this->rrule_type_map$freq);
 
-            if ($object'recurrence''INTERVAL')
+            if ($object'recurrence''INTERVAL') {
                 $rr->setInterval(intval($object'recurrence''INTERVAL'));
+            }
 
             if (!empty($object'recurrence''BYDAY')) {
-                $byday = new vectordaypos;
+                $byday = new vectordaypos();
                 foreach (explode(',', $object'recurrence''BYDAY') as $day) {
                     $occurrence = 0;
                     if (preg_match('/^(\d-+)(A-Z+)$/', $day, $m)) {
@@ -453,8 +463,7 @@
                             foreach ($bysetpos as $pos) {
                                 $byday->push(new DayPos(intval($pos), $this->weekday_map$day));
                             }
-                        }
-                        else {
+                        } else {
                             $byday->push(new DayPos($occurrence, $this->weekday_map$day));
                         }
                     }
@@ -463,7 +472,7 @@
             }
 
             if (!empty($object'recurrence''BYMONTHDAY')) {
-                $bymday = new vectori;
+                $bymday = new vectori();
                 foreach (explode(',', $object'recurrence''BYMONTHDAY') as $day) {
                     $bymday->push(intval($day));
                 }
@@ -471,35 +480,34 @@
             }
 
             if (!empty($object'recurrence''BYMONTH')) {
-                $bymonth = new vectori;
-                foreach (explode(',', $object'recurrence''BYMONTH') as $month)
+                $bymonth = new vectori();
+                foreach (explode(',', $object'recurrence''BYMONTH') as $month) {
                     $bymonth->push(intval($month));
+                }
                 $rr->setBymonth($bymonth);
             }
 
             if (!empty($object'recurrence''COUNT')) {
                 $rr->setCount(intval($object'recurrence''COUNT'));
-            }
-            else if (!empty($object'recurrence''UNTIL')) {
+            } elseif (!empty($object'recurrence''UNTIL')) {
                 $rr->setEnd(self::get_datetime($object'recurrence''UNTIL', null, true, $start_tz));
             }
 
             if ($rr->isValid()) {
                 // add exception dates (only if recurrence rule is valid)
                 if (!empty($object'recurrence''EXDATE')) {
-                    $exdates = new vectordatetime;
+                    $exdates = new vectordatetime();
                     foreach ((array)$object'recurrence''EXDATE' as $exdate) {
                         $exdates->push(self::get_datetime($exdate, null, true, $start_tz));
                     }
                     $this->obj->setExceptionDates($exdates);
                 }
-            }
-            else {
-                rcube::raise_error(array(
+            } else {
+                rcube::raise_error(
                     'code' => 600, 'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
                     'message' => "Invalid event recurrence rule: " . json_encode($object'recurrence'),
-                ), true);
+                , true);
             }
         }
 
@@ -507,7 +515,7 @@
 
         // save recurrence dates (aka RDATE)
         if (!empty($object'recurrence''RDATE')) {
-            $rdates = new vectordatetime;
+            $rdates = new vectordatetime();
             foreach ((array)$object'recurrence''RDATE' as $rdate) {
                 $rdates->push(self::get_datetime($rdate, null, true, $start_tz));
             }
@@ -515,8 +523,8 @@
         }
 
         // save alarm(s)
-        $valarms = new vectoralarm;
-        $valarm_hashes = array();
+        $valarms = new vectoralarm();
+        $valarm_hashes = ;
         if (!empty($object'valarms')) {
             foreach ($object'valarms' as $valarm) {
                 if (empty($valarm'action') || empty($valarm'trigger')) {
@@ -535,8 +543,8 @@
                 $valarm_hashes = $hash;
 
                 if ($valarm'action' == 'EMAIL') {
-                    $recipients = new vectorcontactref;
-                    foreach (($valarm'attendees' ?: array($object'_owner')) as $email) {
+                    $recipients = new vectorcontactref();
+                    foreach (($valarm'attendees' ?: $object'_owner') as $email) {
                         $recipients->push(new ContactReference(ContactReference::EmailReference, $email));
                     }
                     $alarm = new Alarm(
@@ -544,13 +552,11 @@
                         strval(!empty($valarm'description') ? $valarm'description' : $object'description'),
                         $recipients
                     );
-                }
-                else if ($valarm'action' == 'AUDIO') {
-                    $attach = new Attachment;
+                } elseif ($valarm'action' == 'AUDIO') {
+                    $attach = new Attachment();
                     $attach->setUri($valarm'uri' ?: 'null', 'unknown');
                     $alarm = new Alarm($attach);
-                }
-                else {
+                } else {
                     // action == DISPLAY
                     $title = !empty($valarm'summary') ? $valarm'summary' : ($object'title' ?? '');
                     $alarm = new Alarm($title);
@@ -558,21 +564,18 @@
 
                 if ($valarm'trigger' instanceof DateTimeInterface) {
                     $alarm->setStart(self::get_datetime($valarm'trigger', new DateTimeZone('UTC')));
-                }
-                else if (preg_match('/^@(0-9+)$/', $valarm'trigger', $m)) {
+                } elseif (preg_match('/^@(0-9+)$/', $valarm'trigger', $m)) {
                     $alarm->setStart(self::get_datetime($m1, new DateTimeZone('UTC')));
-                }
-                else {
+                } else {
                     // Support also interval in format without PT, e.g. -10M
                     if (preg_match('/^(-+*)(0-9+DHMS)$/', strtoupper($valarm'trigger'), $m)) {
-                        $valarm'trigger' = $m1 . ($m2strlen($m2)-1 == 'D' ? 'P' : 'PT') . $m2;
+                        $valarm'trigger' = $m1 . ($m2strlen($m2) - 1 == 'D' ? 'P' : 'PT') . $m2;
                     }
 
                     try {
                         $period   = new DateInterval(preg_replace('/^0-9PTWDHMS/', '', $valarm'trigger'));
                         $duration = new Duration($period->d, $period->h, $period->i, $period->s, $valarm'trigger'0 == '-');
-                    }
-                    catch (Exception $e) {
+                    } catch (Exception $e) {
                         // skip alarm with invalid trigger values
                         rcube::raise_error($e, true);
                         continue;
@@ -587,8 +590,7 @@
                         $d = new DateInterval($valarm'duration');
                         $duration = new Duration($d->d, $d->h, $d->i, $d->s);
                         $alarm->setDuration($duration, intval($valarm'repeat' ?? 0));
-                    }
-                    catch (Exception $e) {
+                    } catch (Exception $e) {
                         // ignore, but log
                         rcube::raise_error($e, true);
                     }
@@ -598,29 +600,32 @@
             }
         }
         // legacy support
-        else if (!empty($object'alarms')) {
-            list($offset, $type) = explode(":", $object'alarms');
+        elseif (!empty($object'alarms')) {
+            $offset, $type = explode(":", $object'alarms');
 
             if ($type == 'EMAIL' && !empty($object'_owner')) {  // email alarms implicitly go to event owner
-                $recipients = new vectorcontactref;
+                $recipients = new vectorcontactref();
                 $recipients->push(new ContactReference(ContactReference::EmailReference, $object'_owner'));
                 $alarm = new Alarm($object'title', strval($object'description'), $recipients);
-            }
-            else {  // default: display alarm
+            } else {  // default: display alarm
                 $alarm = new Alarm($object'title');
             }
 
             if (preg_match('/^@(\d+)/', $offset, $d)) {
                 $alarm->setStart(self::get_datetime($d1, new DateTimeZone('UTC')));
-            }
-            else if (preg_match('/^(-+?)P?T?(\d+)(SMHDW)/', $offset, $d)) {
+            } elseif (preg_match('/^(-+?)P?T?(\d+)(SMHDW)/', $offset, $d)) {
                 $days = $hours = $minutes = $seconds = 0;
                 switch ($d3) {
-                    case 'W': $days  = 7*intval($d2); break;
-                    case 'D': $days    = intval($d2); break;
-                    case 'H': $hours   = intval($d2); break;
-                    case 'M': $minutes = intval($d2); break;
-                    case 'S': $seconds = intval($d2); break;
+                    case 'W': $days  = 7 * intval($d2);
+                        break;
+                    case 'D': $days    = intval($d2);
+                        break;
+                    case 'H': $hours   = intval($d2);
+                        break;
+                    case 'M': $minutes = intval($d2);
+                        break;
+                    case 'S': $seconds = intval($d2);
+                        break;
                 }
                 $alarm->setRelativeStart(new Duration($days, $hours, $minutes, $seconds, $d1 == '-'), $d1 == '-' ? kolabformat::Start : kolabformat::End);
             }
@@ -657,25 +662,25 @@
         $object = $obj ?: $this->data;
 
         foreach (self::$fulltext_cols as $colname) {
-            list($col, $field) = array_pad(explode(':', $colname), 2, null);
+            $col, $field = array_pad(explode(':', $colname), 2, null);
 
             if (empty($object$col)) {
                 continue;
             }
 
             if ($field) {
-                $a = array();
+                $a = ;
                 foreach ((array) $object$col as $attr) {
                     $a = $attr$field ?? null;
                 }
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($object$col) ? join(' ', $object$col) : $object$col;
+                $val = implode(' ', $a);
+            } else {
+                $val = is_array($object$col) ? implode(' ', $object$col) : $object$col;
             }
 
-            if (strlen($val))
+            if (strlen($val)) {
                 $data .= $val . ' ';
+            }
         }
 
         $words = rcube_utils::normalize_string($data, true);
@@ -697,7 +702,7 @@
      */
     public function get_tags($obj = null)
     {
-        $tags = array();
+        $tags = ;
         $object = $obj ?: $this->data;
 
         if (!empty($object'valarms')) {
@@ -707,8 +712,9 @@
         // create tags reflecting participant status
         if (!empty($object'attendees')) {
             foreach ($object'attendees' as $attendee) {
-                if (!empty($attendee'email') && !empty($attendee'status'))
+                if (!empty($attendee'email') && !empty($attendee'status')) {
                     $tags = 'x-partstat:' . $attendee'email' . ':' . strtolower($attendee'status');
+                }
             }
         }
 
@@ -728,11 +734,11 @@
 
     /**
      * Identify changes considered relevant for scheduling
-     * 
-     * @param array Hash array with NEW object properties
-     * @param array Hash array with OLD object properties
      *
-     * @return boolean True if changes affect scheduling, False otherwise
+     * @param array $object Hash array with NEW object properties
+     * @param array $old    Hash array with OLD object properties
+     *
+     * @return bool True if changes affect scheduling, False otherwise
      */
     public function check_rescheduling($object, $old = null)
     {
@@ -761,10 +767,9 @@
 
                 // advanced rrule comparison: no rescheduling if series was shortened
                 if ($a'COUNT' && $b'COUNT' && $b'COUNT' < $a'COUNT') {
-                  unset($a'COUNT', $b'COUNT');
-                }
-                else if ($a'UNTIL' && $b'UNTIL' && $b'UNTIL' < $a'UNTIL') {
-                  unset($a'UNTIL', $b'UNTIL');
+                    unset($a'COUNT', $b'COUNT');
+                } elseif ($a'UNTIL' && $b'UNTIL' && $b'UNTIL' < $a'UNTIL') {
+                    unset($a'UNTIL', $b'UNTIL');
                 }
             }
             if ($a != $b) {
@@ -788,12 +793,13 @@
         if (class_exists('kolabcalendaring')) {
             return new EventCal($this->obj);
         }
-        else if (!$error_logged) {
+
+        if (!$error_logged) {
             $error_logged = true;
-            rcube::raise_error(array(
+            rcube::raise_error(
                 'code'    => 900,
-                'message' => "Required kolabcalendaring module not found"
-            ), true);
+                'message' => "Required kolabcalendaring module not found",
+            , true);
         }
 
         return false;

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_ldap.php Changed

@@ -26,12 +26,14 @@
  */
 class kolab_ldap extends rcube_ldap_generic
 {
-    private $conf     = array();
-    private $fieldmap = array();
-    private $rcache;
+    private $conf = ;
+    private $debug = false;
+    private $fieldmap = ;
+    private $parse_replaces = ;
+    private $ready = false;
 
 
-    function __construct($p)
+    public function __construct($p)
     {
         $rcmail = rcube::get_instance();
 
@@ -49,11 +51,13 @@
             $this->cache = $rcmail->get_cache('LDAP.kolab_cache', $cache_type, $cache_ttl);
         }
 
+        $this->debug = $p'debug';
+
         // Connect to the server (with bind)
         parent::__construct($p);
         $this->_connect();
 
-        $rcmail->add_shutdown_function(array($this, 'close'));
+        $rcmail->add_shutdown_function($this, 'close');
     }
 
     /**
@@ -88,13 +92,12 @@
                 $u = null;
                 // Get the pieces needed for variable replacement.
                 if ($fu = ($rcube->get_user_email() ?: ($this->config'username' ?? null))) {
-                    list($u, $d) = explode('@', $fu);
-                }
-                else {
+                    $u, $d = explode('@', $fu);
+                } else {
                     $d = $this->config'mail_domain' ?? null;
                 }
 
-                $dc = 'dc=' . strtr($d, array('.' => ',dc=')); // hierarchal domain string
+                $dc = 'dc=' . strtr($d, '.' => ',dc='); // hierarchal domain string
 
                 // resolve $dc through LDAP
                 if (!empty($this->config'domain_filter') && !empty($this->config'search_bind_dn')) {
@@ -102,13 +105,13 @@
                     $dc = $this->domain_root_dn($d);
                 }
 
-                $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
+                $replaces = '%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u;
 
                 // Search for the dn to use to authenticate
                 if (($this->config'search_base_dn' ?? false) && ($this->config'search_filter' ?? false)
                     && (strstr($bind_dn, '%dn') || strstr($base_dn, '%dn') || strstr($groups_base_dn, '%dn'))
                 ) {
-                    $search_attribs = array('uid');
+                    $search_attribs = 'uid';
                     if ($search_bind_attrib = (array) $this->config'search_bind_attrib') {
                         foreach ($search_bind_attrib as $r => $attr) {
                             $search_attribs = $attr;
@@ -124,15 +127,14 @@
 
                     if ($this->cache && ($dn = $this->cache->get($cache_key))) {
                         $replaces'%dn' = $dn;
-                    }
-                    else {
+                    } else {
                         $ldap = $this;
                         if (!empty($search_bind_dn) && !empty($this->config'search_bind_pw')) {
                             // To protect from "Critical extension is unavailable" error
                             // we need to use a separate LDAP connection
                             if (!empty($this->config'vlv')) {
                                 $ldap = new rcube_ldap_generic($this->config);
-                                $ldap->config_set(array('cache' => $this->cache, 'debug' => $this->debug));
+                                $ldap->config_set('cache' => $this->cache, 'debug' => $this->debug);
                                 if (!$ldap->connect($host)) {
                                     continue;
                                 }
@@ -164,13 +166,13 @@
 
                     // DN not found
                     if (empty($replaces'%dn')) {
-                        if (!empty($this->config'search_dn_default'))
+                        if (!empty($this->config'search_dn_default')) {
                             $replaces'%dn' = $this->config'search_dn_default';
-                        else {
-                            rcube::raise_error(array(
+                        } else {
+                            rcube::raise_error(
                                 'code' => 100, 'type' => 'ldap',
                                 'file' => __FILE__, 'line' => __LINE__,
-                                'message' => "DN not found using LDAP search."), true);
+                                'message' => "DN not found using LDAP search.", true);
                             continue;
                         }
                     }
@@ -190,7 +192,7 @@
                     $this->config'filter' = strtr($this->config'filter', $replaces);
                 }
 
-                foreach (array('base_dn', 'filter', 'member_filter') as $k) {
+                foreach ('base_dn', 'filter', 'member_filter' as $k) {
                     if (!empty($this->config'groups'$k)) {
                         $this->config'groups'$k = strtr($this->config'groups'$k, $replaces);
                     }
@@ -203,15 +205,12 @@
 
             if (empty($bind_pass)) {
                 $this->ready = true;
-            }
-            else {
+            } else {
                 if (!empty($this->config'auth_cid')) {
                     $this->ready = $this->sasl_bind($this->config'auth_cid', $bind_pass, $bind_dn);
-                }
-                else if (!empty($bind_dn)) {
+                } elseif (!empty($bind_dn)) {
                     $this->ready = $this->bind($bind_dn, $bind_pass);
-                }
-                else {
+                } else {
                     $this->ready = $this->sasl_bind($bind_user, $bind_pass);
                 }
             }
@@ -224,9 +223,9 @@
         }  // end foreach hosts
 
         if (!is_resource($this->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
+            rcube::raise_error('code' => 100, 'type' => 'ldap',
                 'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $host"), true);
+                'message' => "Could not connect to any LDAP server", true);
 
             $this->ready = false;
         }
@@ -237,7 +236,7 @@
     /**
      * Fetches user data from LDAP addressbook
      */
-    function get_user_record($user, $host)
+    public function get_user_record($user, $host)
     {
         $rcmail  = rcube::get_instance();
         $filter  = $rcmail->config->get('kolab_auth_filter');
@@ -263,10 +262,10 @@
     /**
      * Fetches user data from LDAP addressbook
      */
-    function get_user_groups($dn, $user, $host)
+    public function get_user_groups($dn, $user, $host)
     {
         if (empty($dn) || empty($this->config'groups')) {
-            return array();
+            return ;
         }
 
         $base_dn     = $this->parse_vars($this->config'groups''base_dn', $user, $host);
@@ -274,17 +273,18 @@
         $member_attr = $this->get_group_member_attr();
         $filter      = "(member=$dn)(uniqueMember=$dn)";
 
-        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
+        if ($member_attr != 'member' && $member_attr != 'uniqueMember') {
             $filter .= "($member_attr=$dn)";
-        $filter = strtr("(|$filter)", array("\\" => "\\\\"));
+        }
+        $filter = strtr("(|$filter)", "\\" => "\\\\");
 
-        $result = parent::search($base_dn, $filter, 'sub', array('dn', $name_attr));
+        $result = parent::search($base_dn, $filter, 'sub', 'dn', $name_attr);
 
         if (!$result) {
-            return array();
+            return ;
         }
 
-        $groups = array();
+        $groups = ;
         foreach ($result as $entry) {
             $dn    = $entry'dn';
             $entry = rcube_ldap_generic::normalize_entry($entry);
@@ -298,14 +298,14 @@
     /**
      * Get a specific LDAP record
      *
-     * @param string DN
+     * @param string $dn DN
      *
-     * @return array Record data
+     * @return array|null Record data
      */
-    function get_record($dn)
+    public function get_record($dn)
     {
         if (!$this->ready) {
-            return;
+            return null;
         }
 
         if ($rec = $this->get_entry($dn, $this->attributes)) {
@@ -324,7 +324,7 @@
      *
      * return bool True on success, False on failure
      */
-    function replace($dn, $entry)
+    public function replace($dn, $entry)
     {
         // fields mapping
         foreach ($this->fieldmap as $field => $attr) {
@@ -354,17 +354,17 @@
      *
      * @return array List of LDAP records found
      */
-    function dosearch($fields, $value, $mode=1, $required = array(), $limit = 0, &$count = 0)
+    public function dosearch($fields, $value, $mode = 1, $required = , $limit = 0, &$count = 0)
     {
         if (empty($fields)) {
-            return array();
+            return ;
         }
 
         $mode  = intval($mode);
 
         // try to resolve field names into ldap attributes
         $fieldmap = $this->fieldmap;
-        $attrs = array_map(function($f) use ($fieldmap) {
+        $attrs = array_map(function ($f) use ($fieldmap) {
             return array_key_exists($f, $fieldmap) ? $fieldmap$f : $f;
         }, (array)$fields);
 
@@ -405,7 +405,7 @@
         $base_dn = $this->parse_vars($this->config'base_dn');
         $scope   = $this->config'scope';
         $attrs   = array_values($this->fieldmap);
-        $list    = array();
+        $list    = ;
 
         if ($result = $this->search($base_dn, $filter, $scope, $attrs)) {
             $count = $result->count();
@@ -428,7 +428,7 @@
     /**
      * Set filter used in search()
      */
-    function set_filter($filter)
+    public function set_filter($filter)
     {
         $this->config'filter' = $filter;
     }
@@ -446,8 +446,7 @@
             $attr_lc = strtolower($attr);
             if (isset($entry$attr_lc)) {
                 $entry$field = $entry$attr_lc;
-            }
-            else if (isset($entry$attr)) {
+            } elseif (isset($entry$attr)) {
                 $entry$field = $entry$attr;
             }
         }
@@ -468,7 +467,7 @@
     /**
      * Detects group member attribute name
      */
-    private function get_group_member_attr($object_classes = array())
+    private function get_group_member_attr($object_classes = )
     {
         if (empty($object_classes)) {
             $object_classes = $this->config'groups''object_classes';
@@ -504,7 +503,7 @@
     /**
      * Prepares filter query for LDAP search
      */
-    function parse_vars($str, $user = null, $host = null)
+    public function parse_vars($str, $user = null, $host = null)
     {
         // When authenticating user $user is always set
         // if not set it means we use this LDAP object for other
@@ -516,47 +515,45 @@
 
         $dc = null;
         if (isset($this->icache$user)) {
-            list($user, $dc) = $this->icache$user;
-        }
-        else {
+            $user, $dc = $this->icache$user;
+        } else {
             $orig_user = $user;
+            $domain = null;
             $rcmail = rcube::get_instance();
 
             // get default domain
             if ($username_domain = $rcmail->config->get('username_domain')) {
                 if ($host && is_array($username_domain) && isset($username_domain$host)) {
                     $domain = rcube_utils::parse_host($username_domain$host, $host);
-                }
-                else if (is_string($username_domain)) {
+                } elseif (is_string($username_domain)) {
                     $domain = rcube_utils::parse_host($username_domain, $host);
                 }
             }
 
             // realmed username (with domain)
             if ($user && strpos($user, '@')) {
-                list($usr, $dom) = explode('@', $user);
+                $usr, $dom = explode('@', $user);
 
                 // unrealm domain, user login can contain a domain alias
                 if ($dom != $domain && ($dc = $this->domain_root_dn($dom))) {
                     // @FIXME: we should replace domain in $user, I suppose
                 }
-            }
-            else if ($domain) {
+            } elseif ($domain) {
                 $user .= '@' . $domain;
             }
 
-            $this->icache$orig_user = array($user, $dc);
+            $this->icache$orig_user = $user, $dc;
         }
 
         // replace variables in filter
-        list($u, $d) = explode('@', $user);
+        $u, $d = explode('@', $user);
 
         // hierarchal domain string
         if (empty($dc)) {
-            $dc = 'dc=' . strtr($d, array('.' => ',dc='));
+            $dc = 'dc=' . strtr($d, '.' => ',dc=');
         }
 
-        $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u);
+        $replaces = '%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u;
 
         $this->parse_replaces = $replaces;
 
@@ -593,7 +590,7 @@
      *
      * @return string Encoded HTML identifier string
      */
-    static function dn_encode($str)
+    public static function dn_encode($str)
     {
         return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
     }
@@ -605,7 +602,7 @@
      *
      * @return string DN string
      */
-    static function dn_decode($str)
+    public static function dn_decode($str)
     {
         $str = str_pad(strtr($str, '-_', '+/'), strlen($str) % 4, '=', STR_PAD_RIGHT);
         return base64_decode($str);

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage.php Changed

@@ -25,19 +25,19 @@
 
 class kolab_storage
 {
-    const CTYPE_KEY         = '/shared/vendor/kolab/folder-type';
-    const CTYPE_KEY_PRIVATE = '/private/vendor/kolab/folder-type';
-    const COLOR_KEY_SHARED  = '/shared/vendor/kolab/color';
-    const COLOR_KEY_PRIVATE = '/private/vendor/kolab/color';
-    const NAME_KEY_SHARED   = '/shared/vendor/kolab/displayname';
-    const NAME_KEY_PRIVATE  = '/private/vendor/kolab/displayname';
-    const UID_KEY_SHARED    = '/shared/vendor/kolab/uniqueid';
-    const UID_KEY_CYRUS     = '/shared/vendor/cmu/cyrus-imapd/uniqueid';
-
-    const ERROR_IMAP_CONN      = 1;
-    const ERROR_CACHE_DB       = 2;
-    const ERROR_NO_PERMISSION  = 3;
-    const ERROR_INVALID_FOLDER = 4;
+    public const CTYPE_KEY         = '/shared/vendor/kolab/folder-type';
+    public const CTYPE_KEY_PRIVATE = '/private/vendor/kolab/folder-type';
+    public const COLOR_KEY_SHARED  = '/shared/vendor/kolab/color';
+    public const COLOR_KEY_PRIVATE = '/private/vendor/kolab/color';
+    public const NAME_KEY_SHARED   = '/shared/vendor/kolab/displayname';
+    public const NAME_KEY_PRIVATE  = '/private/vendor/kolab/displayname';
+    public const UID_KEY_SHARED    = '/shared/vendor/kolab/uniqueid';
+    public const UID_KEY_CYRUS     = '/shared/vendor/cmu/cyrus-imapd/uniqueid';
+
+    public const ERROR_IMAP_CONN      = 1;
+    public const ERROR_CACHE_DB       = 2;
+    public const ERROR_NO_PERMISSION  = 3;
+    public const ERROR_INVALID_FOLDER = 4;
 
     public static $version = '3.0';
     public static $last_error;
@@ -46,15 +46,15 @@
     private static $ready = false;
     private static $with_tempsubs = true;
     private static $subscriptions;
-    private static $ldapcache = array();
-    private static $ldap = array();
+    private static $ldapcache = ;
+    private static $ldap = ;
     private static $states;
     private static $config;
     private static $imap;
 
 
     // Default folder names
-    private static $default_folders = array(
+    private static $default_folders = 
         'event'         => 'Calendar',
         'contact'       => 'Contacts',
         'task'          => 'Tasks',
@@ -68,7 +68,7 @@
         'mail.wastebasket' => 'Trash',
         'mail.outbox'      => 'Outbox',
         'mail.junkemail'   => 'Junk',
-    );
+    ;
 
 
     /**
@@ -76,8 +76,9 @@
      */
     public static function setup()
     {
-        if (self::$ready)
+        if (self::$ready) {
             return true;
+        }
 
         $rcmail = rcube::get_instance();
         self::$config  = $rcmail->config;
@@ -88,17 +89,15 @@
 
         if (self::$ready) {
             // do nothing
-        }
-        else if (!class_exists('kolabformat')) {
-            rcube::raise_error(array(
+        } elseif (!class_exists('kolabformat')) {
+            rcube::raise_error(
                 'code' => 900, 'type' => 'php',
-                'message' => "required kolabformat module not found"
-            ), true);
-        }
-        else if (self::$imap->get_error_code()) {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php', 'message' => "IMAP error"
-            ), true);
+                'message' => "required kolabformat module not found",
+            , true);
+        } elseif (self::$imap->get_error_code()) {
+            rcube::raise_error(
+                'code' => 900, 'type' => 'php', 'message' => "IMAP error",
+            , true);
         }
 
         // adjust some configurable settings
@@ -157,7 +156,7 @@
         }
 
         if ($user_field && $user_attrib) {
-            $ldap->extend_fieldmap(array($user_field => $user_attrib));
+            $ldap->extend_fieldmap($user_field => $user_attrib);
         }
 
         self::$ldap$name = $ldap;
@@ -168,14 +167,14 @@
     /**
      * Get a list of storage folders for the given data type
      *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
-     * @param bool   Enable to return subscribed folders only (null to use configured subscription mode)
+     * @param string $type       Data type to list folders for (contact,distribution-list,event,task,note)
+     * @param ?bool  $subscribed Enable to return subscribed folders only (null to use configured subscription mode)
      *
      * @return array List of Kolab_Folder objects (folder names in UTF7-IMAP)
      */
     public static function get_folders($type, $subscribed = null)
     {
-        $folders = $folderdata = array();
+        $folders = $folderdata = ;
 
         if (self::setup()) {
             foreach ((array)self::list_folders('', '*', $type, $subscribed, $folderdata) as $foldername) {
@@ -189,8 +188,9 @@
     /**
      * Getter for the storage folder for the given type
      *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
-     * @return object kolab_storage_folder  The folder object
+     * @param string $type Data type to list folders for (contact,distribution-list,event,task,note)
+     *
+     * @return kolab_storage_folder|null The folder object
      */
     public static function get_default_folder($type)
     {
@@ -206,10 +206,10 @@
     /**
      * Getter for a specific storage folder
      *
-     * @param string IMAP folder to access (UTF7-IMAP)
-     * @param string Expected folder type
+     * @param string $folder IMAP folder to access (UTF7-IMAP)
+     * @param string $type   Expected folder type
      *
-     * @return object kolab_storage_folder  The folder object
+     * @return kolab_storage_folder|null The folder object
      */
     public static function get_folder($folder, $type = null)
     {
@@ -220,22 +220,25 @@
      * Getter for a single Kolab object, identified by its UID.
      * This will search all folders storing objects of the given type.
      *
-     * @param string Object UID
-     * @param string Object type (contact,event,task,journal,file,note,configuration)
-     * @return array The Kolab object represented as hash array or false if not found
+     * @param string $uid  Object UID
+     * @param string $type Object type (contact,event,task,journal,file,note,configuration)
+     *
+     * @return array|false The Kolab object represented as hash array or false if not found
      */
     public static function get_object($uid, $type)
     {
         self::setup();
         $folder = null;
         foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
-            if (!$folder)
+            if (!$folder) {
                 $folder = new kolab_storage_folder($foldername, $type, $folderdata$foldername);
-            else
+            } else {
                 $folder->set_folder($foldername, $type, $folderdata$foldername);
+            }
 
-            if ($object = $folder->get_object($uid))
+            if ($object = $folder->get_object($uid)) {
                 return $object;
+            }
         }
 
         return false;
@@ -244,9 +247,9 @@
     /**
      * Execute cross-folder searches with the given query.
      *
-     * @param array  Pseudo-SQL query as list of filter parameter triplets
-     * @param string Folder type (contact,event,task,journal,file,note,configuration)
-     * @param int    Expected number of records or limit (for performance reasons)
+     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
+     * @param string $type  Folder type (contact,event,task,journal,file,note,configuration)
+     * @param ?int   $limit Expected number of records or limit (for performance reasons)
      *
      * @return array List of Kolab data objects (each represented as hash array)
      * @see kolab_storage_format::select()
@@ -255,7 +258,7 @@
     {
         self::setup();
         $folder = null;
-        $result = array();
+        $result = ;
 
         foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
             $folder = new kolab_storage_folder($foldername, $type, $folderdata$foldername);
@@ -290,9 +293,9 @@
     /**
      * Compose an URL to query the free/busy status for the given user
      *
-     * @param string Email address of the user to get free/busy data for
-     * @param object DateTime Start of the query range (optional)
-     * @param object DateTime End of the query range (optional)
+     * @param string    $email Email address of the user to get free/busy data for
+     * @param ?DateTime $start Start of the query range (optional)
+     * @param ?DateTime $end   End of the query range (optional)
      *
      * @return ?string Fully qualified URL to query free/busy data
      */
@@ -305,7 +308,7 @@
         }
 
         $query = '';
-        $param = array();
+        $param = ;
         $utc = new \DateTimeZone('UTC');
 
         // https://www.calconnect.org/pubdocs/CD0903%20Freebusy%20Read%20URL.pdf
@@ -328,8 +331,7 @@
             // Expected configured full URL, just replace the %u variable
             // Note: Cyrus v3 Free-Busy service does not use .ifb extension
             $url = str_replace('%u', rawurlencode($email), $url);
-        }
-        else {
+        } else {
             $url .= '/' . $email . '.ifb';
         }
 
@@ -367,17 +369,19 @@
      * Convert the given identifier back to it's raw value
      *
      * @param string $id Ascii identifier
+     *
      * @return string Raw identifier string
      */
     public static function id_decode($id)
     {
-      return base64_decode(str_pad(strtr($id, '-_', '+/'), strlen($id) % 4, '=', STR_PAD_RIGHT));
+        return base64_decode(str_pad(strtr($id, '-_', '+/'), strlen($id) % 4, '=', STR_PAD_RIGHT));
     }
 
     /**
      * Return the (first) path of the requested IMAP namespace
      *
-     * @param string  Namespace name (personal, shared, other)
+     * @param string $name Namespace name (personal, shared, other)
+     *
      * @return string IMAP root path for that namespace
      */
     public static function namespace_root($name)
@@ -403,11 +407,12 @@
     public static function folder_delete($name)
     {
         // clear cached entries first
-        if ($folder = self::get_folder($name))
+        if ($folder = self::get_folder($name)) {
             $folder->cache->purge();
+        }
 
         $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_delete', array('name' => $name));
+        $plugin = $rcmail->plugins->exec_hook('folder_delete', 'name' => $name);
 
         $success = self::$imap->delete_folder($name);
         self::$last_error = self::$imap->get_error_str();
@@ -430,10 +435,10 @@
         self::setup();
 
         $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_create', array('record' => array(
+        $plugin = $rcmail->plugins->exec_hook('folder_create', 'record' => 
             'name' => $name,
             'subscribe' => $subscribed,
-        )));
+        );
 
         if ($saved = self::$imap->create_folder($name, $subscribed)) {
             // set metadata for folder type
@@ -445,7 +450,7 @@
                     self::$imap->delete_folder($name);
                 }
                 // activate folder
-                else if ($active) {
+                elseif ($active) {
                     self::set_state($name, true);
                 }
             }
@@ -472,8 +477,8 @@
         self::setup();
 
         $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_rename', array(
-            'oldname' => $oldname, 'newname' => $newname));
+        $plugin = $rcmail->plugins->exec_hook('folder_rename', 
+            'oldname' => $oldname, 'newname' => $newname);
 
         $oldfolder = self::get_folder($oldname);
         $active    = self::folder_is_active($oldname);
@@ -516,8 +521,8 @@
         self::setup();
 
         $folder    = rcube_charset::convert($prop'name', RCUBE_CHARSET, 'UTF7-IMAP');
-        $oldfolder = $prop'oldname'; // UTF7
-        $parent    = $prop'parent'; // UTF7
+        $oldfolder = $prop'oldname' ?? ''; // UTF7
+        $parent    = $prop'parent' ?? ''; // UTF7
         $delimiter = self::$imap->get_hierarchy_delimiter();
 
         if (strlen($oldfolder)) {
@@ -527,17 +532,15 @@
         if (!empty($options) && ($options'norename' || $options'protected')) {
         }
         // sanity checks (from steps/settings/save_folder.inc)
-        else if (!strlen($folder)) {
+        elseif (!strlen($folder)) {
             self::$last_error = 'cannotbeempty';
             return false;
-        }
-        else if (strlen($folder) > 128) {
+        } elseif (strlen($folder) > 128) {
             self::$last_error = 'nametoolong';
             return false;
-        }
-        else {
+        } else {
             // these characters are problematic e.g. when used in LIST/LSUB
-            foreach (array($delimiter, '%', '*') as $char) {
+            foreach ($delimiter, '%', '*' as $char) {
                 if (strpos($folder, $char) !== false) {
                     self::$last_error = 'forbiddencharacter';
                     return false;
@@ -547,11 +550,9 @@
 
         if (!empty($options) && (!empty($options'protected') || !empty($options'norename'))) {
             $folder = $oldfolder;
-        }
-        else if (strlen($parent)) {
+        } elseif (strlen($parent)) {
             $folder = $parent . $delimiter . $folder;
-        }
-        else {
+        } else {
             // add namespace prefix (when needed)
             $folder = self::$imap->mod_folder($folder, 'in');
         }
@@ -560,7 +561,7 @@
         if (strlen($parent) && (!strlen($oldfolder) || $oldfolder != $folder)) {
             $parent_opts = self::$imap->folder_info($parent);
             if ($parent_opts'namespace' != 'personal'
-                && (empty($parent_opts'rights') || !preg_match('/ck/', implode($parent_opts'rights')))
+                && (empty($parent_opts'rights') || !preg_match('/ck/', implode('', $parent_opts'rights')))
             ) {
                 self::$last_error = 'No permission to create folder';
                 return false;
@@ -571,8 +572,7 @@
         if (strlen($oldfolder)) {
             if ($oldfolder != $folder) {
                 $result = self::folder_rename($oldfolder, $folder);
-            }
-            else {
+            } else {
                 $result = true;
             }
         }
@@ -598,7 +598,7 @@
      *
      * @return string Name of the folder-object
      */
-    public static function object_name($folder, &$folder_ns=null)
+    public static function object_name($folder, &$folder_ns = null)
     {
         // find custom display name in folder METADATA
         if ($name = self::custom_displayname($folder)) {
@@ -619,8 +619,7 @@
         if (self::$config->get('kolab_custom_display_names', true) && self::setup()) {
             if ($_metadata !== null) {
                 $metadata = $_metadata;
-            }
-            else {
+            } else {
                 // For performance reasons ask for all folders, it will be cached as one cache entry
                 $metadata = self::$imap->get_metadata("*", self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED);
 
@@ -735,7 +734,7 @@
         $name = $origname;
 
         // find folder prefix to truncate
-        for ($i = count($names)-1; $i >= 0; $i--) {
+        for ($i = count($names) - 1; $i >= 0; $i--) {
             if (strpos($name, $names$i . ' &raquo; ') === 0) {
                 $length = strlen($names$i . ' &raquo; ');
                 $prefix = substr($name, 0, $length);
@@ -743,7 +742,7 @@
                 $diff   = 1;
 
                 // check if prefix folder is in other users namespace
-                for ($n = count($names)-1; $n >= 0; $n--) {
+                for ($n = count($names) - 1; $n >= 0; $n--) {
                     if (strpos($prefix, '(' . $names$n . ') ') === 0) {
                         $diff = 0;
                         break;
@@ -754,7 +753,7 @@
                 break;
             }
             // other users namespace and parent folder exists
-            else if (strpos($name, '(' . $names$i . ') ') === 0) {
+            elseif (strpos($name, '(' . $names$i . ') ') === 0) {
                 $length = strlen('(' . $names$i . ') ');
                 $prefix = substr($name, 0, $length);
                 $count  = count(explode(' &raquo; ', $prefix));
@@ -783,8 +782,9 @@
         $folders = self::get_folders($type, true);
 
         $delim = self::$imap->get_hierarchy_delimiter();
-        $names = array();
+        $names = ;
         $len   = strlen($current);
+        $parent = '';
         $p_len = 0;
 
         if ($len && ($rpos = strrpos($current, $delim))) {
@@ -805,15 +805,14 @@
                     }
                     continue;
                 }
-                if (strpos($name, $current.$delim) === 0) {
+                if (strpos($name, $current . $delim) === 0) {
                     continue;
                 }
             }
 
             if ($p_len && $name == $parent) {
                 // always show the parent of current folder
-            }
-            else if ($c_folder->get_owner() != $_SESSION'username') {
+            } elseif ($c_folder->get_owner() != $_SESSION'username') {
                 // skip folders where user have no rights to create subfolders
                 $rights = $c_folder->get_myrights();
                 if (!preg_match('/ck/', $rights)) {
@@ -829,17 +828,17 @@
         $select = new html_select($attrs);
         $select->add('---', '');
 
-        $listnames = array();
+        $listnames = ;
         foreach (array_keys($names) as $imap_name) {
             $name = $origname = $names$imap_name;
 
             // find folder prefix to truncate
-            for ($i = count($listnames)-1; $i >= 0; $i--) {
-                if (strpos($name, $listnames$i.' &raquo; ') === 0) {
-                    $length = strlen($listnames$i.' &raquo; ');
+            for ($i = count($listnames) - 1; $i >= 0; $i--) {
+                if (strpos($name, $listnames$i . ' &raquo; ') === 0) {
+                    $length = strlen($listnames$i . ' &raquo; ');
                     $prefix = substr($name, 0, $length);
                     $count  = count(explode(' &raquo; ', $prefix));
-                    $name   = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($name, $length);
+                    $name   = str_repeat('&nbsp;&nbsp;', $count - 1) . '&raquo; ' . substr($name, $length);
                     break;
                 }
             }
@@ -854,18 +853,18 @@
     /**
      * Returns a list of folder names
      *
-     * @param string  Optional root folder
-     * @param string  Optional name pattern
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param bool    Enable to return subscribed folders only (null to use configured subscription mode)
-     * @param array   Will be filled with folder-types data
+     * @param string $root       Optional root folder
+     * @param string $mbox       Optional name pattern
+     * @param string $filter     Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param bool   $subscribed Enable to return subscribed folders only (null to use configured subscription mode)
+     * @param array  $folderdata Will be filled with folder-types data
      *
      * @return array List of folders
      */
-    public static function list_folders($root = '', $mbox = '*', $filter = null, $subscribed = null, &$folderdata = array())
+    public static function list_folders($root = '', $mbox = '*', $filter = null, $subscribed = null, &$folderdata = )
     {
         if (!self::setup()) {
-            return null;
+            return ;
         }
 
         // use IMAP subscriptions
@@ -877,8 +876,7 @@
             // Get ALL folders list, standard way
             if ($subscribed) {
                 $folders = self::_imap_list_subscribed($root, $mbox, $filter);
-            }
-            else {
+            } else {
                 $folders = self::_imap_list_folders($root, $mbox);
             }
 
@@ -891,7 +889,7 @@
         $folderdata = self::folders_typedata($prefix);
 
         if (!is_array($folderdata)) {
-            return array();
+            return ;
         }
 
         // If we only want groupware folders and don't care about the subscription state,
@@ -909,14 +907,13 @@
         // Get folders list
         if ($subscribed) {
             $folders = self::_imap_list_subscribed($root, $mbox, $filter);
-        }
-        else {
+        } else {
             $folders = self::_imap_list_folders($root, $mbox);
         }
 
         // In case of an error, return empty list (?)
         if (!is_array($folders)) {
-            return array();
+            return ;
         }
 
         // Filter folders list
@@ -944,7 +941,7 @@
 
         // compose a post-filter expression for the excluded namespaces
         if ($root . $mbox == '*' && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
-            $excludes = array();
+            $excludes = ;
             foreach ((array)$skip_ns as $ns) {
                 if ($ns_root = self::namespace_root($ns)) {
                     $excludes = $ns_root;
@@ -952,7 +949,7 @@
             }
 
             if (count($excludes)) {
-                $postfilter = '!^(' . join(')|(', array_map('preg_quote', $excludes)) . ')!';
+                $postfilter = '!^(' . implode(')|(', array_map('preg_quote', $excludes)) . ')!';
             }
         }
 
@@ -960,7 +957,7 @@
         $folders = self::$imap->list_folders($root, $mbox, null, null, !empty($postfilter));
 
         if (!empty($postfilter)) {
-            $folders = array_filter($folders, function($folder) use ($postfilter) { return !preg_match($postfilter, $folder); });
+            $folders = array_filter($folders, function ($folder) use ($postfilter) { return !preg_match($postfilter, $folder); });
             $folders = self::$imap->sort_folder_list($folders);
         }
 
@@ -986,19 +983,19 @@
     /**
      * Search for shared or otherwise not listed groupware folders the user has access
      *
-     * @param string Folder type of folders to search for
-     * @param string Search string
-     * @param array  Namespace(s) to exclude results from
+     * @param string $type       Folder type of folders to search for
+     * @param string $query      Search string
+     * @param array  $exclude_ns Namespace(s) to exclude results from
      *
      * @return array List of matching kolab_storage_folder objects
      */
-    public static function search_folders($type, $query, $exclude_ns = array())
+    public static function search_folders($type, $query, $exclude_ns = )
     {
         if (!self::setup()) {
-            return array();
+            return ;
         }
 
-        $folders = array();
+        $folders = ;
         $query = str_replace('*', '', $query);
 
         // find unsubscribed IMAP folders of the given type
@@ -1008,7 +1005,7 @@
             if (($query == '' || strpos($realname, $query) !== false) &&
                 !self::folder_is_subscribed($foldername, true) &&
                 !in_array(self::$imap->folder_namespace($foldername), (array)$exclude_ns)
-              ) {
+            ) {
                 $folders = new kolab_storage_folder($foldername, $type, $folderdata$foldername);
             }
         }
@@ -1019,14 +1016,16 @@
     /**
      * Sort the given list of kolab folders by namespace/name
      *
-     * @param array List of kolab_storage_folder objects
+     * @param array $folders List of kolab_storage_folder objects
+     *
      * @return array Sorted list of folders
      */
     public static function sort_folders($folders)
     {
         $pad     = '  ';
-        $out     = array();
-        $nsnames = array('personal' => array(), 'shared' => array(), 'other' => array());
+        $out     = ;
+        $nsnames = 'personal' => , 'shared' => , 'other' => ;
+        $_folders = ;
 
         foreach ($folders as $folder) {
             $_folders$folder->name = $folder;
@@ -1048,53 +1047,51 @@
     /**
      * Check the folder tree and add the missing parents as virtual folders
      *
-     * @param array $folders Folders list
-     * @param object $tree   Reference to the root node of the folder tree
+     * @param array                         $folders Folders list
+     * @param ?kolab_storage_folder_virtual $tree    Reference to the root node of the folder tree
      *
      * @return array Flat folders list
      */
     public static function folder_hierarchy($folders, &$tree = null)
     {
         if (!self::setup()) {
-            return array();
+            return ;
         }
 
-        $_folders = array();
+        $_folders = ;
         $delim    = self::$imap->get_hierarchy_delimiter();
         $other_ns = rtrim(self::namespace_root('other'), $delim);
         $tree     = new kolab_storage_folder_virtual('', '<root>', '');  // create tree root
-        $refs     = array('' => $tree);
+        $refs     = '' => $tree;
 
         foreach ($folders as $idx => $folder) {
             $path = explode($delim, $folder->name);
             array_pop($path);
-            $folder->parent = join($delim, $path);
-            $folder->children = array();  // reset list
+            $folder->parent = implode($delim, $path);
+            $folder->children = ;  // reset list
 
             // skip top folders or ones with a custom displayname
             if (count($path) < 1 || kolab_storage::custom_displayname($folder->name)) {
                 $tree->children = $folder;
-            }
-            else {
-                $parents = array();
+            } else {
+                $parents = ;
                 $depth = $folder->get_namespace() == 'personal' ? 1 : 2;
 
-                while (count($path) >= $depth && ($parent = join($delim, $path))) {
+                while (count($path) >= $depth && ($parent = implode($delim, $path))) {
                     array_pop($path);
-                    $parent_parent = join($delim, $path);
+                    $parent_parent = implode($delim, $path);
 
-                    if (!$refs$parent) {
+                    if (empty($refs$parent)) {
                         if ($folder->type && self::folder_type($parent) == $folder->type) {
                             $refs$parent = new kolab_storage_folder($parent, $folder->type, $folder->type);
                             $refs$parent->parent = $parent_parent;
-                        }
-                        else if ($parent_parent == $other_ns) {
+                        } elseif ($parent_parent == $other_ns) {
                             $refs$parent = new kolab_storage_folder_user($parent, $parent_parent);
-                        }
-                        else {
+                        } else {
                             $name = kolab_storage::object_name($parent);
                             $refs$parent = new kolab_storage_folder_virtual($parent, $name, $folder->get_namespace(), $parent_parent);
                         }
+
                         $parents = $refs$parent;
                     }
                 }
@@ -1133,18 +1130,18 @@
             return false;
         }
 
-        $type_keys = array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE);
+        $type_keys = self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE;
 
         // fetch metadata from *some* folders only
         if (($prefix == '*' || $prefix == '') && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
             $delimiter = self::$imap->get_hierarchy_delimiter();
-            $folderdata = $blacklist = array();
+            $folderdata = $blacklist = ;
             foreach ((array)$skip_ns as $ns) {
                 if ($ns_root = rtrim(self::namespace_root($ns), $delimiter)) {
                     $blacklist = $ns_root;
                 }
             }
-            foreach (array('personal','other','shared') as $ns) {
+            foreach ('personal','other','shared' as $ns) {
                 if (!in_array($ns, (array)$skip_ns)) {
                     $ns_root = rtrim(self::namespace_root($ns), $delimiter);
 
@@ -1155,19 +1152,17 @@
                             if (!in_array($folder, $blacklist)) {
                                 $folderdata$folder = $metadata;
                                 $opts = self::$imap->folder_attributes($folder);
-                                if (!in_array('\\HasNoChildren', $opts) && ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
+                                if (!in_array('\\HasNoChildren', $opts) && ($data = self::$imap->get_metadata($folder . $delimiter . '*', $type_keys))) {
                                     $folderdata += $data;
                                 }
                             }
                         }
-                    }
-                    else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) {
+                    } elseif ($data = self::$imap->get_metadata($ns_root . $delimiter . '*', $type_keys)) {
                         $folderdata += $data;
                     }
                 }
             }
-        }
-        else {
+        } else {
             $folderdata = self::$imap->get_metadata($prefix, $type_keys);
         }
 
@@ -1175,7 +1170,7 @@
             return false;
         }
 
-        return array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
+        return array_map('kolab_storage', 'folder_select_metadata', $folderdata);
     }
 
     /**
@@ -1185,9 +1180,8 @@
     {
         if (!empty($typesself::CTYPE_KEY_PRIVATE)) {
             return $typesself::CTYPE_KEY_PRIVATE;
-        }
-        else if (!empty($typesself::CTYPE_KEY)) {
-            list($ctype, ) = explode('.', $typesself::CTYPE_KEY);
+        } elseif (!empty($typesself::CTYPE_KEY)) {
+            $ctype,  = explode('.', $typesself::CTYPE_KEY);
             return $ctype;
         }
         return null;
@@ -1198,13 +1192,13 @@
      *
      * @param string $folder Folder name (UTF7-IMAP)
      *
-     * @return string Folder type
+     * @return string|null Folder type
      */
     public static function folder_type($folder)
     {
         self::setup();
 
-        $metadata = self::$imap->get_metadata($folder, array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE));
+        $metadata = self::$imap->get_metadata($folder, self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE);
 
         if (!is_array($metadata)) {
             return null;
@@ -1229,13 +1223,13 @@
     {
         self::setup();
 
-        list($ctype, $subtype) = strpos($type, '.') !== false ? explode('.', $type) : array($type, null);
+        $ctype, $subtype = strpos($type, '.') !== false ? explode('.', $type) : $type, null;
 
-        $success = self::$imap->set_metadata($folder, array(self::CTYPE_KEY => $ctype, self::CTYPE_KEY_PRIVATE => $subtype ? $type : null));
+        $success = self::$imap->set_metadata($folder, self::CTYPE_KEY => $ctype, self::CTYPE_KEY_PRIVATE => $subtype ? $type : null);
 
         if (!$success) {
             // fallback: only set private annotation
-            $success |= self::$imap->set_metadata($folder, array(self::CTYPE_KEY_PRIVATE => $type));
+            $success |= self::$imap->set_metadata($folder, self::CTYPE_KEY_PRIVATE => $type);
         }
 
         return $success;
@@ -1245,7 +1239,7 @@
      * Check subscription status of this folder
      *
      * @param string $folder Folder name
-     * @param bool   $temp  Include temporary/session subscriptions
+     * @param bool   $temp   Include temporary/session subscriptions
      *
      * @return bool True if subscribed, false if not
      */
@@ -1259,7 +1253,7 @@
         }
 
         return in_array($folder, self::$subscriptions) ||
-            ($temp && in_array($folder, (array)$_SESSION'kolab_subscribed_folders'));
+            ($temp && in_array($folder, $_SESSION'kolab_subscribed_folders' ?? ));
     }
 
     /**
@@ -1278,13 +1272,11 @@
         if ($temp) {
             if (self::folder_is_subscribed($folder)) {
                 return true;
-            }
-            else if (empty($_SESSION'kolab_subscribed_folders') || !in_array($folder, $_SESSION'kolab_subscribed_folders')) {
+            } elseif (empty($_SESSION'kolab_subscribed_folders') || !in_array($folder, $_SESSION'kolab_subscribed_folders')) {
                 $_SESSION'kolab_subscribed_folders' = $folder;
                 return true;
             }
-        }
-        else if (self::$imap->subscribe($folder)) {
+        } elseif (self::$imap->subscribe($folder)) {
             self::$subscriptions = null;
             return true;
         }
@@ -1310,8 +1302,7 @@
                 unset($_SESSION'kolab_subscribed_folders'$i);
             }
             return true;
-        }
-        else if (self::$imap->unsubscribe($folder)) {
+        } elseif (self::$imap->unsubscribe($folder)) {
             self::$subscriptions = null;
             return true;
         }
@@ -1375,7 +1366,7 @@
         $folders = $rcube->config->get('kolab_active_folders');
 
         if ($folders !== null) {
-            self::$states = !empty($folders) ? explode('**', $folders) : array();
+            self::$states = !empty($folders) ? explode('**', $folders) : ;
         }
         // for backward-compatibility copy server-side subscriptions to activation states
         else {
@@ -1387,7 +1378,7 @@
             }
             self::$states = (array) self::$subscriptions;
             $folders = implode('**', self::$states);
-            $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
+            $rcube->user->save_prefs('kolab_active_folders' => $folders);
         }
 
         return self::$states;
@@ -1404,15 +1395,14 @@
         $idx = array_search($folder, self::$states);
         if ($state && $idx === false) {
             self::$states = $folder;
-        }
-        else if (!$state && $idx !== false) {
+        } elseif (!$state && $idx !== false) {
             unset(self::$states$idx);
         }
 
         // update user preferences
         $folders = implode('**', self::$states);
 
-        return rcube::get_instance()->user->save_prefs(array('kolab_active_folders' => $folders));
+        return rcube::get_instance()->user->save_prefs('kolab_active_folders' => $folders);
     }
 
     /**
@@ -1420,17 +1410,17 @@
      * To be run when none of subscribed folders (of specified type) is found
      *
      * @param string $type  Folder type
-     * @param string $props Folder properties (color, etc)
+     * @param array  $props Folder properties (color, etc)
      *
-     * @return string Folder name
+     * @return string|null Folder name
      */
-    public static function create_default_folder($type, $props = array())
+    public static function create_default_folder($type, $props = )
     {
         if (!self::setup()) {
-            return;
+            return null;
         }
 
-        $folders = self::$imap->get_metadata('*', array(kolab_storage::CTYPE_KEY_PRIVATE));
+        $folders = self::$imap->get_metadata('*', kolab_storage::CTYPE_KEY_PRIVATE);
 
         // from kolab_folders config
         $folder_type  = strpos($type, '.') ? str_replace('.', '_', $type) : $type . '_default';
@@ -1446,13 +1436,13 @@
             }
         }
 
-        if (!$folder) {
+        if (empty($folder)) {
             if (!$default_name) {
                 $default_name = self::$default_folders$type;
             }
 
             if (!$default_name) {
-                return;
+                return null;
             }
 
             $folder = rcube_charset::convert($default_name, RCUBE_CHARSET, 'UTF7-IMAP');
@@ -1465,7 +1455,7 @@
 
             if (!self::$imap->folder_exists($folder)) {
                 if (!self::$imap->create_folder($folder)) {
-                    return;
+                    return null;
                 }
             }
 
@@ -1499,20 +1489,23 @@
 
         // TODO: also save 'showalarams' and other properties here
         $ns        = self::$imap->folder_namespace($folder);
-        $supported = array(
-            'color'       => array(self::COLOR_KEY_SHARED, self::COLOR_KEY_PRIVATE),
-            'displayname' => array(self::NAME_KEY_SHARED, self::NAME_KEY_PRIVATE),
-        );
+        $supported = 
+            'color'       => self::COLOR_KEY_SHARED, self::COLOR_KEY_PRIVATE,
+            'displayname' => self::NAME_KEY_SHARED, self::NAME_KEY_PRIVATE,
+        ;
 
         foreach ($supported as $key => $metakeys) {
             if (array_key_exists($key, $prop)) {
                 $meta_saved = false;
-                if ($ns == 'personal')  // save in shared namespace for personal folders
-                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys0 => $prop$key));
-                if (!$meta_saved)    // try in private namespace
-                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys1 => $prop$key));
-                if ($meta_saved)
-                    unset($prop$key);  // unsetting will prevent fallback to local user prefs
+                if ($ns == 'personal') {  // save in shared namespace for personal folders
+                    $meta_saved = self::$imap->set_metadata($folder, $metakeys0 => $prop$key);
+                }
+                if (!$meta_saved) {    // try in private namespace
+                    $meta_saved = self::$imap->set_metadata($folder, $metakeys1 => $prop$key);
+                }
+                if ($meta_saved) {
+                    unset($prop$key);
+                }  // unsetting will prevent fallback to local user prefs
             }
         }
     }
@@ -1520,26 +1513,26 @@
     /**
      * Search users in Kolab LDAP storage
      *
-     * @param mixed   $query    Search value (or array of field => value pairs)
-     * @param int     $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
-     * @param array   $required List of fields that shall ot be empty
-     * @param int     $limit    Maximum number of records
-     * @param int     $count    Returns the number of records found
+     * @param mixed $query    Search value (or array of field => value pairs)
+     * @param int   $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
+     * @param array $required List of fields that shall ot be empty
+     * @param int   $limit    Maximum number of records
+     * @param int   $count    Returns the number of records found
      *
      * @return array List of users
      */
-    public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
+    public static function search_users($query, $mode = 1, $required = , $limit = 0, &$count = 0)
     {
         $query = str_replace('*', '', $query);
 
         // requires a working LDAP setup
         if (!strlen($query) || !($ldap = self::ldap())) {
-            return array();
+            return ;
         }
 
         $root          = self::namespace_root('other');
         $user_attrib   = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
-        $search_attrib = self::$config->get('kolab_users_search_attrib', array('cn','mail','alias'));
+        $search_attrib = self::$config->get('kolab_users_search_attrib', 'cn','mail','alias');
 
         // search users using the configured attributes
         $results = $ldap->dosearch($search_attrib, $query, $mode, $required, $limit, $count);
@@ -1550,8 +1543,8 @@
         }
 
         // resolve to IMAP folder name
-        array_walk($results, function(&$user, $dn) use ($root, $user_attrib) {
-            list($localpart, ) = explode('@', $user$user_attrib);
+        array_walk($results, function (&$user, $dn) use ($root, $user_attrib) {
+            $localpart,  = explode('@', $user$user_attrib);
             $user'kolabtargetfolder' = $root . $localpart;
         });
 
@@ -1561,23 +1554,23 @@
     /**
      * Returns a list of IMAP folders shared by the given user
      *
-     * @param array   User entry from LDAP
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param int     1 - subscribed folders only, 0 - all folders, 2 - all non-active
-     * @param array   Will be filled with folder-types data
+     * @param array  $user       User entry from LDAP
+     * @param string $type       Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param int    $subscribed 1 - subscribed folders only, 0 - all folders, 2 - all non-active
+     * @param array  $folderdata Will be filled with folder-types data
      *
      * @return array List of folders
      */
-    public static function list_user_folders($user, $type, $subscribed = 0, &$folderdata = array())
+    public static function list_user_folders($user, $type, $subscribed = 0, &$folderdata = )
     {
         self::setup();
 
-        $folders = array();
+        $folders = ;
 
         // use localpart of user attribute as root for folder listing
         $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
         if (!empty($user$user_attrib)) {
-            list($mbox) = explode('@', $user$user_attrib);
+            $mbox = explode('@', $user$user_attrib);
 
             $delimiter  = self::$imap->get_hierarchy_delimiter();
             $other_ns   = self::namespace_root('other');
@@ -1600,14 +1593,14 @@
     /**
      * Get a list of (virtual) top-level folders from the other users namespace
      *
-     * @param string Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param bool   Enable to return subscribed folders only (null to use configured subscription mode)
+     * @param string $type       Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param bool   $subscribed Enable to return subscribed folders only (null to use configured subscription mode)
      *
      * @return array List of kolab_storage_folder_user objects
      */
     public static function get_user_folders($type, $subscribed)
     {
-        $folders = $folderdata = array();
+        $folders = $folderdata = ;
 
         if (self::setup()) {
             $delimiter = self::$imap->get_hierarchy_delimiter();
@@ -1615,8 +1608,9 @@
             $path_len = count(explode($delimiter, $other_ns));
 
             foreach ((array) self::list_folders($other_ns . $delimiter, '*', '', $subscribed) as $foldername) {
-                if ($foldername == 'INBOX')  // skip INBOX which is added by default
+                if ($foldername == 'INBOX') {  // skip INBOX which is added by default
                     continue;
+                }
 
                 $path = explode($delimiter, $foldername);
 
@@ -1626,7 +1620,7 @@
                 }
 
                 // truncate folder path to top-level folders of the 'other' namespace
-                $foldername = join($delimiter, array_slice($path, 0, $path_len + 1));
+                $foldername = implode($delimiter, array_slice($path, 0, $path_len + 1));
 
                 if (empty($folders$foldername)) {
                     $folders$foldername = new kolab_storage_folder_user($foldername, $other_ns);
@@ -1654,7 +1648,7 @@
      */
     public static function delete_user_folders($args)
     {
-        $db = rcmail::get_instance()->get_dbh();
+        $db = rcube::get_instance()->get_dbh();
         $prefix = 'imap://' . urlencode($args'username') . '@' . $args'host' . '/%';
         $db->query("DELETE FROM " . $db->table_name('kolab_folders', true) . " WHERE `resource` LIKE ?", $prefix);
 
@@ -1667,7 +1661,7 @@
     public static function folder_metadata($folder)
     {
         if (self::setup()) {
-            $keys = array(
+            $keys = 
                 // For better performance we skip displayname here, see (self::custom_displayname())
                 // self::NAME_KEY_PRIVATE,
                 // self::NAME_KEY_SHARED,
@@ -1677,7 +1671,7 @@
                 self::COLOR_KEY_SHARED,
                 self::UID_KEY_SHARED,
                 self::UID_KEY_CYRUS,
-            );
+            ;
 
             $metadata = self::$imap->get_metadata($folder, $keys);
 
@@ -1691,7 +1685,7 @@
      * @param string $folder_id Folder name w/o path (imap user identifier)
      * @param bool   $as_string Return configured display name attribute value
      *
-     * @return array User attributes
+     * @return array|string|null User attributes
      * @see self::ldap()
      */
     public static function folder_id2user($folder_id, $as_string = false)
@@ -1701,7 +1695,7 @@
         $rcube = rcube::get_instance();
 
         if ($domain === null) {
-            list(, $domain) = explode('@', $rcube->get_user_name());
+            , $domain = explode('@', $rcube->get_user_name());
         }
 
         if ($name_attr === null) {
@@ -1727,17 +1721,16 @@
         }
 
         if (empty($user) && ($ldap = self::ldap())) {
-            $user = $ldap->get_user_record($token, $_SESSION'imap_host');
+            $user = $ldap->get_user_record($token, $_SESSION'imap_host' ?? '');
 
             if (!empty($user)) {
-                $keys = array('displayname', 'name', 'mail'); // supported keys
+                $keys = 'displayname', 'name', 'mail'; // supported keys
                 $user = array_intersect_key($user, array_flip($keys));
 
                 if (!empty($user)) {
                     if ($cache) {
                         $cache->set($token, $user);
-                    }
-                    else {
+                    } else {
                         self::$ldapcache$token = $user;
                     }
                 }
@@ -1752,7 +1745,7 @@
                     }
                 }
 
-                if (!$display) {
+                if (empty($display)) {
                     $display = $user'displayname' ?: $user'name';
                 }
 
@@ -1765,6 +1758,8 @@
 
             return $user;
         }
+
+        return null;
     }
 
     /**
@@ -1798,8 +1793,7 @@
                     break;
                 }
             }
-        }
-        else { // dir == 'out'
+        } else { // dir == 'out'
             foreach ((array) $roots as $root) {
                 if (strpos($args'folder', $root0) === 0) {
                     // remove root and explode folder

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php Changed

@@ -24,14 +24,14 @@
 
 class kolab_storage_cache
 {
-    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+    public const DB_DATE_FORMAT = 'Y-m-d H:i:s';
 
     protected $db;
     protected $imap;
     protected $folder;
     protected $uid2msg;
     protected $objects;
-    protected $metadata = array();
+    protected $metadata = ;
     protected $folder_id;
     protected $resource_uri;
     protected $enabled = true;
@@ -42,8 +42,9 @@
     protected $folders_table;
     protected $max_sql_packet;
     protected $max_sync_lock_time = 600;
-    protected $extra_cols = array();
-    protected $data_props = array();
+    protected $extra_cols = ;
+    protected $data_props = ;
+    protected $imap_options = ;
     protected $order_by = null;
     protected $limit = null;
     protected $error = 0;
@@ -60,13 +61,12 @@
         $subclass = 'kolab_storage_cache_' . $storage_folder->type;
         if (class_exists($subclass)) {
             return new $subclass($storage_folder);
-        }
-        else {
-            rcube::raise_error(array(
+        } else {
+            rcube::raise_error(
                 'code' => 900,
                 'type' => 'php',
-                'message' => "No kolab_storage_cache class found for folder '$storage_folder->name' of type '$storage_folder->type'"
-            ), true);
+                'message' => "No kolab_storage_cache class found for folder '$storage_folder->name' of type '$storage_folder->type'",
+            , true);
 
             return new kolab_storage_cache($storage_folder);
         }
@@ -89,7 +89,7 @@
             // always read folder cache and lock state from DB master
             $this->db->set_table_dsn('kolab_folders', 'w');
             // remove sync-lock on script termination
-            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
+            $rcmail->add_shutdown_function($this, '_sync_unlock');
         }
 
         if ($storage_folder) {
@@ -107,7 +107,7 @@
         if ($sql_arr = $this->db->fetch_assoc($query)) {
             $this->metadata = $sql_arr;
             $this->folder_id = $sql_arr'folder_id';
-            $this->folder = new StdClass;
+            $this->folder = new StdClass();
             $this->folder->type = $sql_arr'type';
             $this->resource_uri = $sql_arr'resource';
             $this->cache_table = $this->db->table_name('kolab_cache_' . $sql_arr'type');
@@ -118,11 +118,11 @@
     /**
      * Connect cache with a storage folder
      *
-     * @param kolab_storage_folder The storage folder instance to connect with
+     * @param kolab_storage_folder $folder The storage folder instance to connect with
      */
-    public function set_folder(kolab_storage_folder $storage_folder)
+    public function set_folder(kolab_storage_folder $folder)
     {
-        $this->folder = $storage_folder;
+        $this->folder = $folder;
 
         if (empty($this->folder->name) || !$this->folder->valid) {
             $this->ready = false;
@@ -169,16 +169,16 @@
     public function synchronize()
     {
         // only sync once per request cycle
-        if ($this->synched)
+        if ($this->synched) {
             return;
+        }
 
         if (!$this->ready) {
             // kolab cache is disabled, synchronize IMAP mailbox cache only
             $this->imap_mode(true);
             $this->imap->folder_sync($this->folder->name);
             $this->imap_mode(false);
-        }
-        else {
+        } else {
             $this->sync_start = time();
 
             // read cached folder metadata
@@ -188,16 +188,16 @@
             $ctag = $this->folder->get_ctag();
 
             // Validate current ctag
-            list($uidvalidity, $highestmodseq, $uidnext) = explode('-', $ctag);
+            $uidvalidity, $highestmodseq, $uidnext = explode('-', $ctag);
 
             if (empty($uidvalidity) || empty($highestmodseq)) {
-                rcube::raise_error(array(
+                rcube::raise_error(
                     'code' => 900,
-                    'message' => "Failed to sync the kolab cache (Invalid ctag)"
-                ), true);
+                    'message' => "Failed to sync the kolab cache (Invalid ctag)",
+                , true);
             }
             // check cache status ($this->metadata is set in _read_folder_data())
-            else if (
+            elseif (
                 empty($this->metadata'ctag')
                 || empty($this->metadata'changed')
                 || $this->metadata'ctag' !== $ctag
@@ -205,13 +205,12 @@
                 // lock synchronization for this folder or wait if locked
                 $this->_sync_lock();
 
-                // Run a full-sync (initial sync or continue the aborted sync)
                 if (empty($this->metadata'changed') || empty($this->metadata'ctag')) {
+                    // Run a full-sync (initial sync or continue the aborted sync)
                     $result = $this->synchronize_full();
-                }
-                // Synchronize only the changes since last sync
-                else {
-                    $result = $this->synchronize_update($ctag);
+                } else {
+                    // Synchronize only the changes since last sync
+                    $result = $this->synchronize_update();
                 }
 
                 // update ctag value (will be written to database in _sync_unlock())
@@ -253,16 +252,14 @@
         $this->imap_mode(false);
 
         if ($imap_index->is_error()) {
-            rcube::raise_error(array(
-                    'code' => 900,
-                    'message' => "Failed to sync the kolab cache (SEARCH failed)"
-                ), true);
+            $error = "Failed to sync the kolab cache (SEARCH failed)";
+            rcube::raise_error('code' => 900, 'message' => $error, true);
             return false;
         }
 
         // determine objects to fetch or to invalidate
         $imap_index = $imap_index->get();
-        $del_index  = array();
+        $del_index  = ;
         $old_index  = $this->current_index($del_index);
 
         // Fetch objects and store in DB
@@ -285,44 +282,34 @@
     protected function synchronize_update()
     {
         if (!$this->imap->get_capability('QRESYNC')) {
-            rcube::raise_error(array(
-                    'code' => 900,
-                    'message' => "Failed to sync the kolab cache (no QRESYNC capability)"
-                ), true);
+            $error = "Failed to sync the kolab cache (no QRESYNC capability)";
+            rcube::raise_error('code' => 900, 'message' => $error, true);
 
             return $this->synchronize_full();
         }
 
         // Handle the previous ctag
-        list($uidvalidity, $highestmodseq, $uidnext) = explode('-', $this->metadata'ctag');
+        $uidvalidity, $highestmodseq, $uidnext = explode('-', $this->metadata'ctag');
 
         if (empty($uidvalidity) || empty($highestmodseq)) {
-            rcube::raise_error(array(
-                    'code' => 900,
-                    'message' => "Failed to sync the kolab cache (Invalid old ctag)"
-                ), true);
+            $error = "Failed to sync the kolab cache (Invalid old ctag)";
+            rcube::raise_error('code' => 900, 'message' => $error, true);
             return false;
         }
 
         // Enable QRESYNC
         $res = $this->imap->conn->enable('QRESYNC');
         if ($res === false) {
-            rcube::raise_error(array(
-                    'code' => 900,
-                    'message' => "Failed to sync the kolab cache (failed to enable QRESYNC/CONDSTORE)"
-                ), true);
-
+            $error = "Failed to sync the kolab cache (failed to enable QRESYNC/CONDSTORE)";
+            rcube::raise_error('code' => 900, 'message' => $error, true);
             return false;
         }
 
         $mbox_data = $this->imap->folder_data($this->folder->name);
         if (empty($mbox_data)) {
-            rcube::raise_error(array(
-                    'code' => 900,
-                    'message' => "Failed to sync the kolab cache (failed to get folder state)"
-                ), true);
-
-             return false;
+            $error = "Failed to sync the kolab cache (failed to get folder state)";
+            rcube::raise_error('code' => 900, 'message' => $error, true);
+            return false;
         }
 
         // Check UIDVALIDITY
@@ -332,37 +319,43 @@
 
         // QRESYNC not supported on specified mailbox
         if (!empty($mbox_data'NOMODSEQ') || empty($mbox_data'HIGHESTMODSEQ')) {
-            rcube::raise_error(array(
-                    'code' => 900,
-                    'message' => "Failed to sync the kolab cache (QRESYNC not supported on the folder)"
-                ), true);
-
-             return $this->synchronize_full();
+            $error = "Failed to sync the kolab cache (QRESYNC not supported on the folder)";
+            rcube::raise_error('code' => 900, 'message' => $error, true);
+            return $this->synchronize_full();
         }
 
         // Get modified flags and vanished messages
         // UID FETCH 1:* (FLAGS) (CHANGEDSINCE 0123456789 VANISHED)
         $result = $this->imap->conn->fetch(
-            $this->folder->name, '1:*', true, array('FLAGS'), $highestmodseq, true
+            $this->folder->name,
+            '1:*',
+            true,
+            'FLAGS',
+            $highestmodseq,
+            true
         );
 
-        $removed  = array();
-        $modified = array();
-        $existing = $this->current_index($removed);
+        if ($result === false) {
+            $error = "Failed to sync the kolab cache (FETCH failed)";
+            rcube::raise_error('code' => 900, 'message' => $error, true);
+            return false;
+        }
 
-        if (!empty($result)) {
-            foreach ($result as $msg) {
-                $uid = $msg->uid;
+        $removed  = ;
+        $modified = ;
+        $existing = $this->current_index($removed);
 
-                // Message marked as deleted
-                if (!empty($msg->flags'DELETED')) {
-                    $removed = $uid;
-                    continue;
-                }
+        foreach ($result as $msg) {
+            $uid = $msg->uid;
 
-                // Flags changed or new
-                $modified = $uid;
+            // Message marked as deleted
+            if (!empty($msg->flags'DELETED')) {
+                $removed = $uid;
+                continue;
             }
+
+            // Flags changed or new
+            $modified = $uid;
         }
 
         $new    = array_diff($modified, $existing, $removed);
@@ -415,8 +408,7 @@
                 if ($old_msguid = ($old_index$object'uid' ?? null)) {
                     if ($old_msguid < $msguid) {
                         $del_index = $old_msguid;
-                    }
-                    else {
+                    } else {
                         $del_index = $msguid;
                         continue;
                     }
@@ -451,7 +443,7 @@
         }
 
         if (!empty($db_delete)) {
-            $quoted_ids = join(',', array_map(array($this->db, 'quote'), $db_delete));
+            $quoted_ids = implode(',', array_map($this->db, 'quote', $db_delete));
             $this->db->query(
                 "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` IN ($quoted_ids)",
                 $this->folder_id
@@ -462,23 +454,23 @@
     /**
      * Return current use->msguid index
      */
-    protected function current_index(&$duplicates = array())
+    protected function current_index(&$duplicates = )
     {
         // read cache index
         $sql_result = $this->db->query(
             "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?"
-                . " ORDER BY `msguid` DESC", $this->folder_id
+                . " ORDER BY `msguid` DESC",
+            $this->folder_id
         );
 
-        $index = $del_index = array();
+        $index = $del_index = ;
 
         while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
             // Mark all duplicates for removal (note sorting order above)
             // Duplicates here should not happen, but they do sometimes
             if (isset($index$sql_arr'uid')) {
                 $duplicates = $sql_arr'msguid';
-            }
-            else {
+            } else {
                 $index$sql_arr'uid' = $sql_arr'msguid';
             }
         }
@@ -489,10 +481,11 @@
     /**
      * Read a single entry from cache or from IMAP directly
      *
-     * @param string Related IMAP message UID
-     * @param string Object type to read
-     * @param string IMAP folder name the entry relates to
-     * @param array  Hash array with object properties or null if not found
+     * @param string $msguid     Related IMAP message UID
+     * @param string $type       Object type to read
+     * @param string $foldername IMAP folder name the entry relates to
+     *
+     * @return array|null Hash array with object properties or null if not found
      */
     public function get($msguid, $type = null, $foldername = null)
     {
@@ -512,21 +505,21 @@
                 $this->_read_folder_data();
 
                 $sql_result = $this->db->query(
-                    "SELECT * FROM `{$this->cache_table}` ".
+                    "SELECT * FROM `{$this->cache_table}` " .
                     "WHERE `folder_id` = ? AND `msguid` = ?",
                     $this->folder_id,
                     $msguid
                 );
 
                 if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                    $this->objects = array($msguid => $this->_unserialize($sql_arr));  // store only this object in memory (#2827)
+                    $this->objects = $msguid => $this->_unserialize($sql_arr);  // store only this object in memory (#2827)
                 }
             }
 
             // fetch from IMAP if not present in cache
             if (empty($this->objects$msguid)) {
                 if ($object = $this->folder->read_object($msguid, $type ?: '*', $foldername)) {
-                    $this->objects = array($msguid => $object);
+                    $this->objects = $msguid => $object;
                     $this->set($msguid, $object);
                 }
             }
@@ -541,7 +534,7 @@
      *
      * @param string $uid Object UID
      *
-     * @return array The Kolab object represented as hash array
+     * @return array|null The Kolab object represented as hash array
      */
     public function get_by_uid($uid)
     {
@@ -551,9 +544,9 @@
         // set order to make sure we get most recent object version
         // set limit to skip count query
         $this->order_by = '`msguid` DESC';
-        $this->limit    = array(1, 0);
+        $this->limit    = 1, 0;
 
-        $list = $this->select(array(array('uid', '=', $uid)));
+        $list = $this->select('uid', '=', $uid);
 
         // set the order/limit back to defined value
         $this->order_by = $old_order_by;
@@ -562,14 +555,16 @@
         if (!empty($list) && !empty($list0)) {
             return $list0;
         }
+
+        return null;
     }
 
     /**
      * Insert/Update a cache entry
      *
-     * @param string Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string IMAP folder name the entry relates to
+     * @param string $msguid     Related IMAP message UID
+     * @param mixed  $object     Hash array with object properties to save or false to delete the cache entry
+     * @param string $foldername IMAP folder name the entry relates to
      */
     public function set($msguid, $object, $foldername = null)
     {
@@ -579,25 +574,27 @@
 
         // delegate to another cache instance
         if ($foldername && $foldername != $this->folder->name) {
-          if ($targetfolder = kolab_storage::get_folder($foldername)) {
-              $targetfolder->cache->set($msguid, $object);
-              $this->error = $targetfolder->cache->get_error();
-          }
-          return;
+            if ($targetfolder = kolab_storage::get_folder($foldername)) {
+                $targetfolder->cache->set($msguid, $object);
+                $this->error = $targetfolder->cache->get_error();
+            }
+            return;
         }
 
         // remove old entry
         if ($this->ready) {
             $this->_read_folder_data();
-            $this->db->query("DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` = ?",
-                $this->folder_id, $msguid);
+            $this->db->query(
+                "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` = ?",
+                $this->folder_id,
+                $msguid
+            );
         }
 
         if ($object) {
             // insert new object data...
             $this->save($msguid, $object);
-        }
-        else {
+        } else {
             // ...or set in-memory cache to false
             $this->objects$msguid = $object;
         }
@@ -609,9 +606,9 @@
     /**
      * Insert (or update) a cache entry
      *
-     * @param int    Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param int    Optional old message UID (for update)
+     * @param int   $msguid Related IMAP message UID
+     * @param mixed $object Hash array with object properties to save or false to delete the cache entry
+     * @param int   $olduid  Optional old message UID (for update)
      */
     public function save($msguid, $object, $olduid = null)
     {
@@ -624,8 +621,8 @@
             $sql_data'msguid'    = $msguid;
             $sql_data'uid'       = $object'uid';
 
-            $args = array();
-            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'tags', 'words');
+            $args = ;
+            $cols = 'folder_id', 'msguid', 'uid', 'changed', 'data', 'tags', 'words';
             $cols = array_merge($cols, $this->extra_cols);
 
             foreach ($cols as $idx => $col) {
@@ -642,8 +639,7 @@
                     . " WHERE `folder_id` = ? AND `msguid` = ?";
                 $args = $this->folder_id;
                 $args = $olduid;
-            }
-            else {
+            } else {
                 $query = "INSERT INTO `{$this->cache_table}` (`created`, " . implode(', ', $cols)
                     . ") VALUES (" . $this->db->now() . str_repeat(', ?', count($cols)) . ")";
             }
@@ -651,16 +647,16 @@
             $result = $this->db->query($query, $args);
 
             if (!$this->db->affected_rows($result)) {
-                rcube::raise_error(array(
+                rcube::raise_error(
                     'code' => 900, 'type' => 'php',
-                    'message' => "Failed to write to kolab cache"
-                ), true);
+                    'message' => "Failed to write to kolab cache",
+                , true);
             }
         }
 
         // keep a copy in memory for fast access
-        $this->objects = array($msguid => $object);
-        $this->uid2msg = array($object'uid' => $msguid);
+        $this->objects = $msguid => $object;
+        $this->uid2msg = $object'uid' => $msguid;
 
         $this->check_error();
     }
@@ -669,10 +665,10 @@
     /**
      * Move an existing cache entry to a new resource
      *
-     * @param string               Entry's IMAP message UID
-     * @param string               Entry's Object UID
-     * @param kolab_storage_folder Target storage folder instance
-     * @param string               Target entry's IMAP message UID
+     * @param string               $msguid     Entry's IMAP message UID
+     * @param string               $uid        Entry's Object UID
+     * @param kolab_storage_folder $target     Target storage folder instance
+     * @param string               $new_msguid Target entry's IMAP message UID
      */
     public function move($msguid, $uid, $target, $new_msguid = null)
     {
@@ -689,7 +685,7 @@
                 $this->_read_folder_data();
 
                 $this->db->query(
-                    "UPDATE `{$this->cache_table}` SET `folder_id` = ?, `msguid` = ? ".
+                    "UPDATE `{$this->cache_table}` SET `folder_id` = ?, `msguid` = ? " .
                     "WHERE `folder_id` = ? AND `msguid` = ?",
                     $target->cache->get_folder_id(),
                     $new_msguid,
@@ -733,7 +729,7 @@
     /**
      * Update resource URI for existing cache entries
      *
-     * @param string Target IMAP folder to move it to
+     * @param string $new_folder Target IMAP folder to move it to
      */
     public function rename($new_folder)
     {
@@ -744,15 +740,14 @@
         if ($target = kolab_storage::get_folder($new_folder)) {
             // resolve new message UID in target folder
             $this->db->query(
-                "UPDATE `{$this->folders_table}` SET `resource` = ? ".
+                "UPDATE `{$this->folders_table}` SET `resource` = ? " .
                 "WHERE `resource` = ?",
                 $target->get_resource_uri(),
                 $this->resource_uri
             );
 
             $this->check_error();
-        }
-        else {
+        } else {
             $this->error = kolab_storage::ERROR_IMAP_CONN;
         }
     }
@@ -760,18 +755,18 @@
     /**
      * Select Kolab objects filtered by the given query
      *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *              triplet: array('<colname>', '<comparator>', '<value>')
-     * @param bool  Set true to only return UIDs instead of complete objects
-     * @param bool  Use fast mode to fetch only minimal set of information
-     *              (no xml fetching and parsing, etc.)
+     * @param array $query Pseudo-SQL query as list of filter parameter triplets
+     *                     triplet: array('<colname>', '<comparator>', '<value>')
+     * @param bool  $uids  Set true to only return UIDs instead of complete objects
+     * @param bool  $fast  Use fast mode to fetch only minimal set of information
+     *                     (no xml fetching and parsing, etc.)
      *
      * @return null|array|kolab_storage_dataset List of Kolab data objects
      *                                          (each represented as hash array) or UIDs
      */
-    public function select($query = array(), $uids = false, $fast = false)
+    public function select($query = , $uids = false, $fast = false)
     {
-        $result = $uids ? array() : new kolab_storage_dataset($this);
+        $result = $uids ?  : new kolab_storage_dataset($this);
 
         // read from local cache DB (assume it to be synchronized)
         if ($this->ready) {
@@ -804,11 +799,9 @@
                 if ($uids) {
                     $this->uid2msg$sql_arr'uid' = $sql_arr'_msguid';
                     $result = $sql_arr'uid';
-                }
-                else if ($fetchall && ($object = $this->_unserialize($sql_arr))) {
+                } elseif ($fetchall && ($object = $this->_unserialize($sql_arr))) {
                     $result = $object;
-                }
-                else if (!$fetchall) {
+                } elseif (!$fetchall) {
                     // only add msguid to dataset index
                     $result = $sql_arr;
                 }
@@ -823,8 +816,7 @@
             if ($filter'type') {
                 $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter'type';
                 $index  = $this->imap->search_once($this->folder->name, $search);
-            }
-            else {
+            } else {
                 $index = $this->imap->index($this->folder->name, null, null, true, true);
             }
 
@@ -850,7 +842,7 @@
         if (!$uids && count($result) == 1) {
             if ($msguid = $result0'_msguid') {
                 $this->uid2msg$result0'uid' = $msguid;
-                $this->objects = array($msguid => $result0);
+                $this->objects = $msguid => $result0;
             }
         }
 
@@ -862,17 +854,18 @@
     /**
      * Get number of objects mathing the given query
      *
-     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
-     * @return integer The number of objects of the given type
+     * @param array $query Pseudo-SQL query as list of filter parameter triplets
+     *
+     * @return int|null The number of objects of the given type, Null on error
      */
-    public function count($query = array())
+    public function count($query = )
     {
         // read from local cache DB (assume it to be synchronized)
         if ($this->ready) {
             $this->_read_folder_data();
 
             $sql_result = $this->db->query(
-                "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` ".
+                "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` " .
                 "WHERE `folder_id` = ?" . $this->_sql_where($query),
                 $this->folder_id
             );
@@ -893,8 +886,7 @@
             if ($filter'type') {
                 $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter'type';
                 $index  = $this->imap->search_once($this->folder->name, $search);
-            }
-            else {
+            } else {
                 $index = $this->imap->index($this->folder->name, null, null, true, true);
             }
 
@@ -928,18 +920,17 @@
     public function set_order_by($sortcols)
     {
         if (!empty($sortcols)) {
-            $sortcols = array_map(function($v) {
+            $sortcols = array_map(function ($v) {
                 $v = trim($v);
                 if (strpos($v, ' ')) {
-                    list($column, $order) = explode(' ', $v, 2);
+                    $column, $order = explode(' ', $v, 2);
                     return "`{$column}` {$order}";
                 }
                 return "`{$v}`";
             }, (array) $sortcols);
 
-            $this->order_by = join(', ', $sortcols);
-        }
-        else {
+            $this->order_by = implode(', ', $sortcols);
+        } else {
             $this->order_by = null;
         }
     }
@@ -949,7 +940,7 @@
      */
     public function set_limit($length, $offset = 0)
     {
-        $this->limit = array($length, $offset);
+        $this->limit = $length, $offset;
     }
 
     /**
@@ -960,38 +951,34 @@
         $sql_where = '';
         foreach ((array) $query as $param) {
             if (is_array($param0)) {
-                $subq = array();
+                $subq = ;
                 foreach ($param0 as $q) {
-                    $subq = preg_replace('/^\s*AND\s+/i', '', $this->_sql_where(array($q)));
+                    $subq = preg_replace('/^\s*AND\s+/i', '', $this->_sql_where($q));
                 }
                 if (!empty($subq)) {
                     $sql_where .= ' AND (' . implode($param1 == 'OR' ? ' OR ' : ' AND ', $subq) . ')';
                 }
                 continue;
-            }
-            else if ($param1 == '=' && is_array($param2)) {
-                $qvalue = '(' . join(',', array_map(array($this->db, 'quote'), $param2)) . ')';
+            } elseif ($param1 == '=' && is_array($param2)) {
+                $qvalue = '(' . implode(',', array_map($this->db, 'quote', $param2)) . ')';
                 $param1 = 'IN';
-            }
-            else if ($param1 == '~' || $param1 == 'LIKE' || $param1 == '!~' || $param1 == '!LIKE') {
+            } elseif ($param1 == '~' || $param1 == 'LIKE' || $param1 == '!~' || $param1 == '!LIKE') {
                 $not = ($param1 == '!~' || $param1 == '!LIKE') ? 'NOT ' : '';
                 $param1 = $not . 'LIKE';
-                $qvalue = $this->db->quote('%'.preg_replace('/(^\^|\$$)/', ' ', $param2).'%');
-            }
-            else if ($param1 == '~*' || $param1 == '!~*') {
+                $qvalue = $this->db->quote('%' . preg_replace('/(^\^|\$$)/', ' ', $param2) . '%');
+            } elseif ($param1 == '~*' || $param1 == '!~*') {
                 $not = $param11 == '!' ? 'NOT ' : '';
                 $param1 = $not . 'LIKE';
-                $qvalue = $this->db->quote(preg_replace('/(^\^|\$$)/', ' ', $param2).'%');
-            }
-            else if ($param0 == 'tags') {
-                $param1 = ($param1 == '!=' ? 'NOT ' : '' ) . 'LIKE';
-                $qvalue = $this->db->quote('% '.$param2.' %');
-            }
-            else {
+                $qvalue = $this->db->quote(preg_replace('/(^\^|\$$)/', ' ', $param2) . '%');
+            } elseif ($param0 == 'tags') {
+                $param1 = ($param1 == '!=' ? 'NOT ' : '') . 'LIKE';
+                $qvalue = $this->db->quote('% ' . $param2 . ' %');
+            } else {
                 $qvalue = $this->db->quote($param2);
             }
 
-            $sql_where .= sprintf(' AND %s %s %s',
+            $sql_where .= sprintf(
+                ' AND %s %s %s',
                 $this->db->quote_identifier($param0),
                 $param1,
                 $qvalue
@@ -1008,10 +995,11 @@
     protected function _query2assoc($query)
     {
         // extract object type from query parameter
-        $filter = array();
+        $filter = ;
         foreach ($query as $param) {
-            if ($param1 == '=')
+            if ($param1 == '=') {
                 $filter$param0 = $param2;
+            }
         }
         return $filter;
     }
@@ -1019,10 +1007,11 @@
     /**
      * Fetch messages from IMAP
      *
-     * @param array  List of message UIDs to fetch
-     * @param string Requested object type or * for all
-     * @param string IMAP folder to read from
-     * @return array List of parsed Kolab objects
+     * @param array  $index  List of message UIDs to fetch
+     * @param string $type   Requested object type or * for all
+     * @param string $folder IMAP folder to read from
+     *
+     * @return kolab_storage_dataset List of parsed Kolab objects
      */
     protected function _fetch($index, $type = null, $folder = null)
     {
@@ -1042,8 +1031,8 @@
      */
     protected function _serialize($object)
     {
-        $data     = array();
-        $sql_data = array('changed' => null, 'tags' => '', 'words' => '');
+        $data     = ;
+        $sql_data = 'changed' => null, 'tags' => '', 'words' => '';
 
         if ($object'changed') {
             $sql_data'changed' = date(self::DB_DATE_FORMAT, is_object($object'changed') ? $object'changed'->format('U') : $object'changed');
@@ -1053,8 +1042,8 @@
             $xml = (string) $object'_formatobj'->write(3.0);
 
             $data'_size'     = strlen($xml);
-            $sql_data'tags'  = ' ' . join(' ', $object'_formatobj'->get_tags()) . ' ';  // pad with spaces for strict/prefix search
-            $sql_data'words' = ' ' . join(' ', $object'_formatobj'->get_words()) . ' ';
+            $sql_data'tags'  = ' ' . implode(' ', $object'_formatobj'->get_tags()) . ' ';  // pad with spaces for strict/prefix search
+            $sql_data'words' = ' ' . implode(' ', $object'_formatobj'->get_words()) . ' ';
         }
 
         // Store only minimal set of object properties
@@ -1062,11 +1051,11 @@
             if (isset($object$prop)) {
                 $data$prop = $object$prop;
                 if ($data$prop instanceof DateTimeInterface) {
-                    $data$prop = array(
+                    $data$prop = 
                         'cl' => 'DateTime',
                         'dt' => $data$prop->format('Y-m-d H:i:s'),
                         'tz' => $data$prop->getTimezone()->getName(),
-                    );
+                    ;
                 }
             }
         }
@@ -1087,8 +1076,7 @@
             foreach ($this->data_props as $prop) {
                 if (!empty($object$prop'cl') && $object$prop'cl' == 'DateTime') {
                     $object$prop = new DateTime($object$prop'dt', new DateTimeZone($object$prop'tz'));
-                }
-                else if (!isset($object$prop) && isset($sql_arr$prop)) {
+                } elseif (!isset($object$prop) && isset($sql_arr$prop)) {
                     $object$prop = $sql_arr$prop;
                 }
             }
@@ -1121,15 +1109,15 @@
     /**
      * Write records into cache using extended inserts to reduce the number of queries to be executed
      *
-     * @param int  Message UID. Set 0 to commit buffered inserts
-     * @param array Kolab object to cache
+     * @param int    $msguid Message UID. Set 0 to commit buffered inserts
+     * @param ?array $object Kolab object to cache
      */
     protected function _extended_insert($msguid, $object)
     {
         static $buffer = '';
 
         $line = '';
-        $cols = array('folder_id', 'msguid', 'uid', 'created', 'changed', 'data', 'tags', 'words');
+        $cols = 'folder_id', 'msguid', 'uid', 'created', 'changed', 'data', 'tags', 'words';
         if ($this->extra_cols) {
             $cols = array_merge($cols, $this->extra_cols);
         }
@@ -1140,16 +1128,16 @@
             // Skip multi-folder insert for all databases but MySQL
             // In Oracle we can't put long data inline, others we don't support yet
             if (strpos($this->db->db_provider, 'mysql') !== 0) {
-                $extra_args = array();
-                $params = array($this->folder_id, $msguid, $object'uid', $sql_data'changed',
-                    $sql_data'data', $sql_data'tags', $sql_data'words');
+                $extra_args = ;
+                $params = $this->folder_id, $msguid, $object'uid', $sql_data'changed',
+                    $sql_data'data', $sql_data'tags', $sql_data'words';
 
                 foreach ($this->extra_cols as $col) {
                     $params = $sql_data$col;
                     $extra_args = '?';
                 }
 
-                $cols = implode(', ', array_map(function($n) { return "`{$n}`"; }, $cols));
+                $cols = implode(', ', array_map(function ($n) { return "`{$n}`"; }, $cols));
                 $extra_args = count($extra_args) ? ', ' . implode(', ', $extra_args) : '';
 
                 $result = $this->db->query(
@@ -1159,15 +1147,15 @@
                 );
 
                 if (!$this->db->affected_rows($result)) {
-                    rcube::raise_error(array(
-                        'code' => 900, 'message' => "Failed to write to kolab cache"
-                    ), true);
+                    rcube::raise_error(
+                        'code' => 900, 'message' => "Failed to write to kolab cache",
+                    , true);
                 }
 
                 return;
             }
 
-            $values = array(
+            $values = 
                 $this->db->quote($this->folder_id),
                 $this->db->quote($msguid),
                 $this->db->quote($object'uid'),
@@ -1176,16 +1164,16 @@
                 $this->db->quote($sql_data'data'),
                 $this->db->quote($sql_data'tags'),
                 $this->db->quote($sql_data'words'),
-            );
+            ;
             foreach ($this->extra_cols as $col) {
                 $values = $this->db->quote($sql_data$col);
             }
-            $line = '(' . join(',', $values) . ')';
+            $line = '(' . implode(',', $values) . ')';
         }
 
         if ($buffer && (!$msguid || (strlen($buffer) + strlen($line) > $this->max_sql_packet()))) {
-            $columns = implode(', ', array_map(function($n) { return "`{$n}`"; }, $cols));
-            $update  = implode(', ', array_map(function($i) { return "`{$i}` = VALUES(`{$i}`)"; }, array_slice($cols, 2)));
+            $columns = implode(', ', array_map(function ($n) { return "`{$n}`"; }, $cols));
+            $update  = implode(', ', array_map(function ($i) { return "`{$i}` = VALUES(`{$i}`)"; }, array_slice($cols, 2)));
 
             $result = $this->db->query(
                 "INSERT INTO `{$this->cache_table}` ($columns) VALUES $buffer"
@@ -1193,9 +1181,9 @@
             );
 
             if (!$this->db->affected_rows($result)) {
-                rcube::raise_error(array(
-                    'code' => 900, 'message' => "Failed to write to kolab cache"
-                ), true);
+                rcube::raise_error(
+                    'code' => 900, 'message' => "Failed to write to kolab cache",
+                , true);
             }
 
             $buffer = '';
@@ -1212,7 +1200,7 @@
         if (!$this->max_sql_packet) {
             // mysql limit or max 4 MB
             $value = $this->db->get_variable('max_allowed_packet', 1048500);
-            $this->max_sql_packet = min($value, 4*1024*1024) - 2000;
+            $this->max_sql_packet = min($value, 4 * 1024 * 1024) - 2000;
         }
 
         return $this->max_sql_packet;
@@ -1224,25 +1212,25 @@
     protected function _read_folder_data()
     {
         // already done
-        if (!empty($this->folder_id) || !$this->ready)
+        if (!empty($this->folder_id) || !$this->ready) {
             return;
+        }
 
         $sql_arr = $this->db->fetch_assoc($this->db->query(
-                "SELECT `folder_id`, `synclock`, `ctag`, `changed`"
+            "SELECT `folder_id`, `synclock`, `ctag`, `changed`"
                 . " FROM `{$this->folders_table}` WHERE `resource` = ?",
-                $this->resource_uri
+            $this->resource_uri
         ));
 
         if ($sql_arr) {
             $this->metadata = $sql_arr;
             $this->folder_id = $sql_arr'folder_id';
-        }
-        else {
+        } else {
             $this->db->query("INSERT INTO `{$this->folders_table}` (`resource`, `type`)"
                 . " VALUES (?, ?)", $this->resource_uri, $this->folder->type);
 
             $this->folder_id = $this->db->insert_id('kolab_folders');
-            $this->metadata = array();
+            $this->metadata = ;
         }
     }
 
@@ -1251,8 +1239,9 @@
      */
     protected function _sync_lock()
     {
-        if (!$this->ready)
+        if (!$this->ready) {
             return;
+        }
 
         $this->_read_folder_data();
 
@@ -1271,7 +1260,8 @@
         // ... or if setting lock fails (another process meanwhile set it)
         while (
             (intval($this->metadata'synclock' ?? 0) + $max_lock_time > time()) ||
-            (($res = $this->db->query($write_query, time(), $this->folder_id, intval($this->metadata'synclock' ?? 0)))
+            (
+                ($res = $this->db->query($write_query, time(), $this->folder_id, intval($this->metadata'synclock' ?? 0)))
                 && !($affected = $this->db->affected_rows($res))
             )
         ) {
@@ -1279,7 +1269,7 @@
             $this->metadata = $this->db->fetch_assoc($this->db->query($read_query, $this->folder_id));
         }
 
-        $this->synclock = $affected > 0;
+        $this->synclock = !empty($affected);
     }
 
     /**
@@ -1287,8 +1277,16 @@
      */
     public function _sync_unlock()
     {
-        if (!$this->ready || !$this->synclock)
+        if (!$this->ready || !$this->synclock) {
             return;
+        }
+
+        $this->synclock = false;
+
+        if (empty($this->metadata'ctag') || empty($this->metadata'changed')) {
+            $this->db->query("UPDATE `{$this->folders_table}` SET `synclock` = 0 WHERE `folder_id` = ?", $this->folder_id);
+            return;
+        }
 
         $this->db->query(
             "UPDATE `{$this->folders_table}` SET `synclock` = 0, `ctag` = ?, `changed` = ? WHERE `folder_id` = ?",
@@ -1296,8 +1294,6 @@
             $this->metadata'changed',
             $this->folder_id
         );
-
-        $this->synclock = false;
     }
 
     protected function _max_sync_lock_time()
@@ -1318,11 +1314,10 @@
     {
         if (($err_code = $this->imap->get_error_code()) < 0) {
             $this->error = kolab_storage::ERROR_IMAP_CONN;
-            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
+            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, rcube_storage::NOPERM, rcube_storage::READONLY)) {
                 $this->error = kolab_storage::ERROR_NO_PERMISSION;
             }
-        }
-        else if ($this->db->is_error()) {
+        } elseif ($this->db->is_error()) {
             $this->error = kolab_storage::ERROR_CACHE_DB;
         }
     }
@@ -1330,9 +1325,10 @@
     /**
      * Resolve an object UID into an IMAP message UID
      *
-     * @param string  Kolab object UID
-     * @param boolean Include deleted objects
-     * @return int The resolved IMAP message UID
+     * @param string $uid     Kolab object UID
+     * @param bool   $deleted Include deleted objects
+     *
+     * @return int|null The resolved IMAP message UID
      */
     public function uid2msguid($uid, $deleted = false)
     {
@@ -1341,7 +1337,7 @@
             $this->_read_folder_data();
 
             $sql_result = $this->db->query(
-                "SELECT `msguid` FROM `{$this->cache_table}` ".
+                "SELECT `msguid` FROM `{$this->cache_table}` " .
                 "WHERE `folder_id` = ? AND `uid` = ? ORDER BY `msguid` DESC",
                 $this->folder_id,
                 $uid
@@ -1389,17 +1385,17 @@
     {
         // remember current IMAP settings
         if ($force) {
-            $this->imap_options = array(
+            $this->imap_options = 
                 'skip_deleted' => $this->imap->get_option('skip_deleted'),
                 'threading'    => $this->imap->get_threading(),
-            );
+            ;
         }
 
         // re-set IMAP settings
         $this->imap->set_threading($force ? false : $this->imap_options'threading');
-        $this->imap->set_options(array(
+        $this->imap->set_options(
                 'skip_deleted' => $force ? true : $this->imap_options'skip_deleted',
-        ));
+        );
 
         // if kolab cache is disabled do nothing
         if (!$this->enabled) {
@@ -1421,8 +1417,7 @@
                 if ($this->cache_bypassed > 1) {
                     return;
                 }
-            }
-            else {
+            } else {
                 $this->cache_bypassed -= 1;
                 if ($this->cache_bypassed > 0) {
                     return;
@@ -1460,8 +1455,7 @@
             $dt = clone $datetime;
             $dt->setTimeZone($this->server_timezone);
             return $dt->format(self::DB_DATE_FORMAT);
-        }
-        else if ($datetime) {
+        } elseif ($datetime) {
             return date(self::DB_DATE_FORMAT, $datetime);
         }
     }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_configuration.php Changed

@@ -23,7 +23,7 @@
 
 class kolab_storage_cache_configuration extends kolab_storage_cache
 {
-    protected $extra_cols = array('type');
+    protected $extra_cols = 'type';
 
     /**
      * Helper method to convert the given Kolab object into a dataset to be written to cache
@@ -55,14 +55,14 @@
     /**
      * Select Kolab objects filtered by the given query
      *
-     * @param array   Pseudo-SQL query as list of filter parameter triplets
-     * @param boolean Set true to only return UIDs instead of complete objects
-     * @param boolean Use fast mode to fetch only minimal set of information
-     *                (no xml fetching and parsing, etc.)
+     * @param array $query Pseudo-SQL query as list of filter parameter triplets
+     * @param bool  $uids  Set true to only return UIDs instead of complete objects
+     * @param bool  $fast  Use fast mode to fetch only minimal set of information
+     *                     (no xml fetching and parsing, etc.)
      *
      * @return array List of Kolab data objects (each represented as hash array) or UIDs
      */
-    public function select($query = array(), $uids = false, $fast = false)
+    public function select($query = , $uids = false, $fast = false)
     {
         // modify query for IMAP search: query param 'type' is actually a subtype
         if (!$this->ready) {
@@ -86,13 +86,13 @@
             foreach ($query as $idx => $param) {
                 // convert category filter
                 if ($param0 == 'category') {
-                    $param2 = array_map(function($n) { return 'category:' . $n; }, (array) $param2);
+                    $param2 = array_map(function ($n) { return 'category:' . $n; }, (array) $param2);
 
                     $query$idx0 = 'tags';
                     $query$idx2 = count($param2) > 1 ? $param2 : $param20;
                 }
                 // convert member filter (we support only = operator with single value)
-                else if ($param0 == 'member') {
+                elseif ($param0 == 'member') {
                     $query$idx0 = 'words';
                     $query$idx1 = '~';
                     $query$idx2 = '^' . $param2 . '$';
@@ -109,28 +109,28 @@
     protected function set_data_props($type)
     {
         switch ($type) {
-        case 'dictionary':
-            $this->data_props = array('language', 'e');
-            break;
-
-        case 'file_driver':
-            $this->data_props = array('driver', 'title', 'enabled', 'host', 'port', 'username', 'password');
-            break;
-
-        case 'relation':
-            // Note: Because relations are heavily used, for performance reasons
-            // we store all properties for them
-            $this->data_props = array('name', 'category', 'color', 'parent', 'iconName', 'priority', 'members');
-            break;
-
-        case 'snippet':
-            $this->data_props = array('name');
-            break;
-
-        case 'category':
-        default:
-            // TODO: implement this
-            $this->data_props = array();
+            case 'dictionary':
+                $this->data_props = 'language', 'e';
+                break;
+
+            case 'file_driver':
+                $this->data_props = 'driver', 'title', 'enabled', 'host', 'port', 'username', 'password';
+                break;
+
+            case 'relation':
+                // Note: Because relations are heavily used, for performance reasons
+                // we store all properties for them
+                $this->data_props = 'name', 'category', 'color', 'parent', 'iconName', 'priority', 'members';
+                break;
+
+            case 'snippet':
+                $this->data_props = 'name';
+                break;
+
+            case 'category':
+            default:
+                // TODO: implement this
+                $this->data_props = ;
         }
     }
 }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_contact.php Changed

@@ -24,8 +24,8 @@
 class kolab_storage_cache_contact extends kolab_storage_cache
 {
     protected $extra_cols_max = 255;
-    protected $extra_cols     = array('type', 'name', 'firstname', 'surname', 'email');
-    protected $data_props     = array('type', 'name', 'firstname', 'middlename', 'prefix', 'suffix', 'surname', 'email', 'organization', 'member');
+    protected $extra_cols     = 'type', 'name', 'firstname', 'surname', 'email';
+    protected $data_props     = 'type', 'name', 'firstname', 'middlename', 'prefix', 'suffix', 'surname', 'email', 'organization', 'member';
 
     /**
      * Helper method to convert the given Kolab object into a dataset to be written to cache
@@ -37,17 +37,16 @@
         $sql_data = parent::_serialize($object);
         $sql_data'type' = $object'_type';
 
-        $email = is_array($object'email' ?? null) ? $object'email'0 : ($object'email' ?? '');
+        $email = is_array($object'email' ?? null) ? ($object'email'0 ?? '') : ($object'email' ?? '');
 
         // columns for sorting
         $sql_data'name'      = rcube_charset::clean(($object'name' ?? '') . ($object'prefix' ?? ''));
         $sql_data'firstname' = rcube_charset::clean(($object'firstname' ?? '') . ($object'middlename' ?? '') . ($object'surname' ?? ''));
-        $sql_data'surname'   = rcube_charset::clean(($object'surname' ?? '')   . ($object'firstname' ?? '')  . ($object'middlename' ?? ''));
+        $sql_data'surname'   = rcube_charset::clean(($object'surname' ?? '') . ($object'firstname' ?? '') . ($object'middlename' ?? ''));
 
         if (is_array($email)) {
             $sql_data'email' = $email'address' ?? '';
-        }
-        else {
+        } else {
             $sql_data'email' = rcube_charset::clean($email);
         }
         // avoid value being null
@@ -63,7 +62,7 @@
         // make sure some data is not longer that database limit (#5291)
         foreach ($this->extra_cols as $col) {
             if (strlen($sql_data$col) > $this->extra_cols_max) {
-                $sql_data$col = rcube_charset::clean(substr($sql_data$col, 0,  $this->extra_cols_max));
+                $sql_data$col = rcube_charset::clean(substr($sql_data$col, 0, $this->extra_cols_max));
             }
         }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_event.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_file.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_freebusy.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_journal.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_note.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_task.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_config.php Changed

@@ -25,15 +25,15 @@
 
 class kolab_storage_config
 {
-    const FOLDER_TYPE   = 'configuration';
-    const MAX_RELATIONS = 499;
+    public const FOLDER_TYPE   = 'configuration';
+    public const MAX_RELATIONS = 499;
 
     /**
      * Singleton instace of kolab_storage_config
      *
      * @var kolab_storage_config
      */
-    static protected $instance;
+    protected static $instance;
 
     private $folders;
     private $default;
@@ -46,7 +46,7 @@
      *
      * @return kolab_storage_config The one and only instance
      */
-    static function get_instance()
+    public static function get_instance()
     {
         if (!self::$instance) {
             self::$instance = new kolab_storage_config();
@@ -112,9 +112,9 @@
      *
      * @return array List of objects
      */
-    public function get_objects($filter = array(), $default = false, $limit = 0)
+    public function get_objects($filter = , $default = false, $limit = 0)
     {
-        $list = array();
+        $list = ;
 
         if (!$this->is_enabled()) {
             return $list;
@@ -146,12 +146,12 @@
      * @param string $uid     Object UID
      * @param bool   $default Enable to get objects only from default folder
      *
-     * @return array Object data
+     * @return array|null Object data
      */
     public function get_object($uid, $default = false)
     {
         if (!$this->is_enabled()) {
-            return;
+            return null;
         }
 
         foreach ($this->folders as $folder) {
@@ -164,6 +164,8 @@
                 return $object;
             }
         }
+
+        return null;
     }
 
     /**
@@ -249,33 +251,32 @@
     /**
      * Find folder
      */
-    public function find_folder($object = array())
+    public function find_folder($object = )
     {
         if (!$this->is_enabled()) {
-            return;
+            return null;
         }
 
         // find folder object
         if (!empty($object'_mailbox')) {
             foreach ($this->folders as $folder) {
                 if ($folder->name == $object'_mailbox') {
-                    break;
+                    return $folder;
                 }
             }
-        }
-        else {
-            $folder = $this->default;
+        } else {
+            return $this->default;
         }
 
-        return $folder;
+        return null;
     }
 
     /**
      * Builds relation member URI
      *
-     * @param string|array Object UUID or Message folder, UID, Search headers (Message-Id, Date)
+     * @param string|array $params Object UUID or Message folder, UID, Search headers (Message-Id, Date)
      *
-     * @return string $url Member URI
+     * @return string|null $url Member URI
      */
     public static function build_member_url($params)
     {
@@ -290,7 +291,7 @@
 
         $rcube   = rcube::get_instance();
         $storage = $rcube->get_storage();
-        list($username, $domain) = explode('@', $rcube->get_user_name());
+        $username, $domain = explode('@', $rcube->get_user_name());
 
         if (strlen($domain)) {
             $domain = '@' . $domain;
@@ -307,18 +308,16 @@
                     $folder = substr($folder, strlen($prefix));
                 }
             }
-        }
-        else {
+        } else {
             if ($ns == 'other') {
                 // Note: this assumes there's only one other users namespace root
                 if ($ns = $storage->get_namespace('other')) {
                     if ($prefix = $ns00) {
-                        list($otheruser, $path) = array_pad(explode('/', substr($folder, strlen($prefix)), 2), 2, '');
+                        $otheruser, $path = array_pad(explode('/', substr($folder, strlen($prefix)), 2), 2, '');
                         $folder = 'user/' . $otheruser . $domain . '/' . $path;
                     }
                 }
-            }
-            else {
+            } else {
                 $folder = 'user/' . $username . $domain . '/' . $folder;
             }
         }
@@ -349,7 +348,7 @@
      *
      * @param string $url Member URI
      *
-     * @return array Message folder, UID, Search headers (Message-Id, Date)
+     * @return array|false Message folder, UID, Search headers (Message-Id, Date)
      */
     public static function parse_member_url($url)
     {
@@ -374,7 +373,7 @@
                 $folder   = implode('/', $path);
 
                 if ($username != $rcube->get_user_name()) {
-                    list($user, $domain) = explode('@', $username);
+                    $user, $domain = explode('@', $username);
 
                     // Note: this assumes there's only one other users namespace root
                     if ($ns = $storage->get_namespace('other')) {
@@ -382,12 +381,10 @@
                             $folder = $prefix . $user . '/' . $folder;
                         }
                     }
-                }
-                else if (!strlen($folder)) {
+                } elseif (!strlen($folder)) {
                     $folder = 'INBOX';
                 }
-            }
-            else {
+            } else {
                 $folder = $ns . '/' . implode('/', $path);
                 // Note: this assumes there's only one shared namespace root
                 if ($ns = $storage->get_namespace('shared')) {
@@ -397,11 +394,11 @@
                 }
             }
 
-            return array(
+            return 
                 'folder' => $folder,
                 'uid'    => $uid,
                 'params' => $params,
-            );
+            ;
         }
 
         return false;
@@ -417,13 +414,13 @@
      */
     public static function build_members($folder, $messages)
     {
-        $members = array();
+        $members = ;
 
         foreach ((array) $messages as $msg) {
-            $params = array(
+            $params = 
                 'folder' => $folder,
                 'uid'    => $msg->uid,
-            );
+            ;
 
             // add search parameters:
             // we don't want to build "invalid" searches e.g. that
@@ -453,7 +450,7 @@
      */
     public static function resolve_members(&$tag, $force = true)
     {
-        $result = array();
+        $result = ;
 
         foreach ((array) $tag'members' as $member) {
             // IMAP URI members
@@ -462,8 +459,7 @@
 
                 if (!$force) {
                     $result$folder = $url'uid';
-                }
-                else {
+                } else {
                     $result$folder'uid'    = $url'uid';
                     $result$folder'params' = $url'params';
                     $result$folder'member' = $member;
@@ -477,8 +473,8 @@
 
         $rcube   = rcube::get_instance();
         $storage = $rcube->get_storage();
-        $search  = array();
-        $missing = array();
+        $search  = ;
+        $missing = ;
 
         // first we search messages by Folder+UID
         foreach ($result as $folder => $data) {
@@ -520,7 +516,7 @@
             $search_str = '';
 
             foreach ($search as $p) {
-                $search_params = array();
+                $search_params = ;
                 foreach ($p as $key => $val) {
                     $key = strtoupper($key);
                     // don't search by subject, we don't want false-positives
@@ -532,7 +528,7 @@
                 $search_str .= ' (' . implode(' ', $search_params) . ')';
             }
 
-            $search_str = trim(str_repeat(' OR', count($search)-1) . $search_str);
+            $search_str = trim(str_repeat(' OR', count($search) - 1) . $search_str);
 
             // search
             $search = $storage->search_once($folders, $search_str);
@@ -541,8 +537,12 @@
             $folders = (array) $search->get_parameters('MAILBOX');
 
             foreach ($folders as $folder) {
-                $set  = $search->get_set($folder);
-                $uids = $set->get();
+                if ($search instanceof rcube_result_multifolder) {
+                    $set  = $search->get_set($folder);
+                    $uids = $set->get();
+                } else {
+                    $uids = $search->get();
+                }
 
                 if (!empty($uids)) {
                     $msgs    = $storage->fetch_headers($folder, $uids, false);
@@ -552,13 +552,13 @@
                     $tag'members' = array_merge($tag'members', $members);
 
                     // add UIDs into the result
-                    $result$folder = array_unique(array_merge((array)$result$folder, $uids));
+                    $result$folder = array_unique(array_merge((array) ($result$folder ?? ), $uids));
                 }
             }
 
             // update tag object with new members list
             $tag'members' = array_unique($tag'members');
-            kolab_storage_config::get_instance()->save($tag, 'relation', false);
+            kolab_storage_config::get_instance()->save($tag, 'relation');
         }
 
         return $result;
@@ -570,12 +570,12 @@
      * @param array $records   List of kolab objects
      * @param bool  $no_return Don't return anything
      *
-     * @return array List of tags
+     * @return array|null List of tags
      */
     public function apply_tags(&$records, $no_return = false)
     {
         if (empty($records) && $no_return) {
-            return;
+            return null;
         }
 
         // first convert categories into tags
@@ -594,7 +594,7 @@
             }
         }
 
-        $tags = array();
+        $tags = ;
 
         // assign tags to objects
         foreach ($this->get_tags() as $tag) {
@@ -620,9 +620,9 @@
      */
     public function apply_links(&$records)
     {
-        $links = array();
-        $uids  = array();
-        $ids   = array();
+        $links = ;
+        $uids  = ;
+        $ids   = ;
         $limit = 25;
 
         // get list of object UIDs and UIRs map
@@ -630,7 +630,7 @@
             $uids = $rec'uid';
             // there can be many objects with the same uid (recurring events)
             $idsself::build_member_url($rec'uid') = $i;
-            $records$i'links' = array();
+            $records$i'links' = ;
         }
 
         if (!empty($uids)) {
@@ -642,13 +642,13 @@
 
         while (!empty($uids)) {
             $chunk = array_splice($uids, 0, $limit);
-            $chunk = array_map(function($v) { return array('member', '=', $v); }, $chunk);
+            $chunk = array_map(function ($v) { return 'member', '=', $v; }, $chunk);
 
-            $filter = array(
-                array('type', '=', 'relation'),
-                array('category', '=', 'generic'),
-                array($chunk, 'OR'),
-            );
+            $filter = 
+                'type', '=', 'relation',
+                'category', '=', 'generic',
+                $chunk, 'OR',
+            ;
 
             $relations = $this->get_objects($filter, true, self::MAX_RELATIONS);
 
@@ -666,7 +666,7 @@
             // make relation members up-to-date
             kolab_storage_config::resolve_members($relation);
 
-            $members = array();
+            $members = ;
             foreach ((array) $relation'members' as $member) {
                 if (strpos($member, 'imap://') === 0) {
                     $members$member = $member;
@@ -707,7 +707,7 @@
                 $update = true;
             }
             // add member to the relation
-            else if (!$found && $selected) {
+            elseif (!$found && $selected) {
                 $relation'members' = $url;
                 $update = true;
             }
@@ -717,18 +717,18 @@
             }
 
             if ($selected) {
-                $tags = array_diff($tags, array($relation'name'));
+                $tags = array_diff($tags, $relation'name');
             }
         }
 
         // create new relations
         if (!empty($tags)) {
             foreach ($tags as $tag) {
-                $relation = array(
+                $relation = 
                     'name'     => $tag,
                     'members'  => (array) $url,
                     'category' => 'tag',
-                );
+                ;
 
                 $this->save($relation, 'relation');
             }
@@ -746,21 +746,19 @@
     {
         if (!isset($this->tags)) {
             $default = true;
-            $filter  = array(
-                array('type', '=', 'relation'),
-                array('category', '=', 'tag')
-            );
+            $filter  = 
+                'type', '=', 'relation',
+                'category', '=', 'tag',
+            ;
 
             // use faster method
             if ($member && $member != '*') {
-                $filter = array('member', '=', $member);
+                $filter = 'member', '=', $member;
                 $tags = $this->get_objects($filter, $default, self::MAX_RELATIONS);
-            }
-            else {
+            } else {
                 $this->tags = $tags = $this->get_objects($filter, $default, self::MAX_RELATIONS);
             }
-        }
-        else {
+        } else {
             $tags = $this->tags;
         }
 
@@ -768,20 +766,18 @@
             return $tags;
         }
 
-        $result = array();
+        $result = ;
 
         if ($member0 == '<') {
             $search_msg = urlencode($member);
-        }
-        else {
+        } else {
             $search_uid = self::build_member_url($member);
         }
 
         foreach ($tags as $tag) {
             if (!empty($search_uid) && in_array($search_uid, (array) $tag'members')) {
                 $result = $tag;
-            }
-            else if (!empty($search_msg)) {
+            } elseif (!empty($search_msg)) {
                 foreach ($tag'members' as $m) {
                     if (strpos($m, $search_msg) !== false) {
                         $result = $tag;
@@ -797,13 +793,13 @@
     /**
      * Find objects linked with the given groupware object through a relation
      *
-     * @param string Object UUID
+     * @param string $uid Object UUID
      *
      * @return array List of related URIs
      */
     public function get_object_links($uid)
     {
-        $links = array();
+        $links = ;
         $object_uri = self::build_member_url($uid);
 
         foreach ($this->get_relations_for_member($uid) as $relation) {
@@ -844,7 +840,7 @@
             kolab_storage_config::resolve_members($relation);
 
             // remove and add links
-            $members = array($object_uri);
+            $members = $object_uri;
             $members = array_unique(array_merge($members, $links));
 
             // remove relation if no other members remain
@@ -852,24 +848,24 @@
                 $done = $this->delete($relation);
             }
             // update relation object if members changed
-            else if (count(array_diff($members, $relation'members')) || count(array_diff($relation'members', $members))) {
+            elseif (count(array_diff($members, $relation'members')) || count(array_diff($relation'members', $members))) {
                 $relation'members' = $members;
                 $done = $this->save($relation, 'relation');
-                $links = array();
+                $links = ;
             }
             // no changes, we're happy
             else {
                 $done  = true;
-                $links = array();
+                $links = ;
             }
         }
 
         // create a new relation
         if (!$done && !empty($links)) {
-            $relation = array(
-                'members'  => array_merge($links, array($object_uri)),
+            $relation = 
+                'members'  => array_merge($links, $object_uri),
                 'category' => 'generic',
-            );
+            ;
 
             $done = $this->save($relation, 'relation');
         }
@@ -883,11 +879,11 @@
     public function get_relations_for_member($uid, $reltype = 'generic')
     {
         $default = true;
-        $filter  = array(
-            array('type', '=', 'relation'),
-            array('category', '=', $reltype),
-            array('member', '=', $uid),
-        );
+        $filter  = 
+            'type', '=', 'relation',
+            'category', '=', $reltype,
+            'member', '=', $uid,
+        ;
 
         return $this->get_objects($filter, $default, self::MAX_RELATIONS);
     }
@@ -895,24 +891,24 @@
     /**
      * Find kolab objects assigned to specified e-mail message
      *
-     * @param rcube_message $message E-mail message
-     * @param string        $folder  Folder name
-     * @param string        $type    Result objects type
+     * @param rcube_message_header $message E-mail message
+     * @param string               $folder  Folder name
+     * @param string               $type    Result objects type
      *
      * @return array List of kolab objects
      */
     public function get_message_relations($message, $folder, $type)
     {
-        static $_cache = array();
+        static $_cache = ;
 
-        $result  = array();
-        $uids    = array();
+        $result  = ;
+        $uids    = ;
         $default = true;
         $uri     = self::get_message_uri($message, $folder);
-        $filter  = array(
-            array('type', '=', 'relation'),
-            array('category', '=', 'generic'),
-        );
+        $filter  = 
+            'type', '=', 'relation',
+            'category', '=', 'generic',
+        ;
 
         // query by message-id
         $member_id = $message->get('message-id', false);
@@ -920,7 +916,7 @@
             // derive message identifier from URI
             $member_id = md5($uri);
         }
-        $filter = array('member', '=', $member_id);
+        $filter = 'member', '=', $member_id;
 
         if (!isset($_cache$uri)) {
             // get UIDs of related groupware objects
@@ -945,14 +941,13 @@
 
             // remember this lookup
             $_cache$uri = $uids;
-        }
-        else {
+        } else {
             $uids = $_cache$uri;
         }
 
         // get kolab objects of specified type
         if (!empty($uids)) {
-            $query  = array(array('uid', '=', array_unique($uids)));
+            $query  = 'uid', '=', array_unique($uids);
             $result = kolab_storage::select($query, $type, count($uids));
         }
 
@@ -964,10 +959,10 @@
      */
     public static function get_message_uri($headers, $folder)
     {
-        $params = array(
+        $params = 
             'folder' => $headers->folder ?: $folder,
             'uid'    => $headers->uid,
-        );
+        ;
 
         if (($messageid = $headers->get('message-id', false)) && ($date = $headers->get('date', false))) {
             $params'message-id' = $messageid;
@@ -992,13 +987,13 @@
 
             $rcmail = rcube::get_instance();
             if (method_exists($rcmail, 'url')) {
-                $linkref'mailurl' = $rcmail->url(array(
+                $linkref'mailurl' = $rcmail->url(
                     'task'   => 'mail',
                     'action' => 'show',
                     'mbox'   => $linkref'folder',
                     'uid'    => $linkref'uid',
                     'rel'    => $rel,
-                ));
+                );
             }
 
             unset($linkref'params');

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dataset.php Changed

@@ -26,7 +26,7 @@
 
 class kolab_storage_dataset implements Iterator, ArrayAccess, Countable
 {
-    const CHUNK_SIZE = 25;
+    public const CHUNK_SIZE = 25;
 
     private $cache;  // kolab_storage_cache instance to use for fetching data
     private $memlimit = 0;
@@ -40,7 +40,7 @@
     /**
      * Default constructor
      *
-     * @param object kolab_storage_cache instance to be used for fetching objects upon access
+     * @param kolab_storage_cache $cache Cache instance to be used for fetching objects upon access
      */
     public function __construct($cache)
     {
@@ -84,8 +84,7 @@
     {
         if (is_string($value)) {
             $uid = $value;
-        }
-        else {
+        } else {
             $uid = !empty($value'_msguid') ? $value'_msguid' : $value'uid';
         }
 
@@ -132,8 +131,7 @@
             while (isset($this->index$idx) && count($uids) < self::CHUNK_SIZE) {
                 if (isset($this->data$idx) && !is_string($this->data$idx)) {
                     // skip objects that had the raw content in the cache (are not empty)
-                }
-                else {
+                } else {
                     $uids$idx = $this->index$idx;
                 }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav.php Changed

@@ -23,10 +23,12 @@
 
 class kolab_storage_dav
 {
-    const ERROR_DAV_CONN       = 1;
-    const ERROR_CACHE_DB       = 2;
-    const ERROR_NO_PERMISSION  = 3;
-    const ERROR_INVALID_FOLDER = 4;
+    public const ERROR_DAV_CONN       = 1;
+    public const ERROR_CACHE_DB       = 2;
+    public const ERROR_NO_PERMISSION  = 3;
+    public const ERROR_INVALID_FOLDER = 4;
+
+    public static $last_error;
 
     protected $dav;
     protected $url;
@@ -44,7 +46,7 @@
     /**
      * Get a list of storage folders for the given data type
      *
-     * @param string Data type to list folders for (contact,event,task,note)
+     * @param string $type Data type to list folders for (contact,event,task,note)
      *
      * @return array List of kolab_storage_dav_folder objects
      */
@@ -75,13 +77,14 @@
     /**
      * Getter for the storage folder for the given type
      *
-     * @param string Data type to list folders for (contact,event,task,note)
+     * @param string $type Data type to list folders for (contact,event,task,note)
      *
-     * @return object kolab_storage_dav_folder The folder object
+     * @return kolab_storage_dav_folder|null The folder object
      */
     public function get_default_folder($type)
     {
         // TODO: Not used
+        return null;
     }
 
     /**
@@ -99,16 +102,18 @@
                 return $folder;
             }
         }
+
+        return null;
     }
 
     /**
      * Getter for a single Kolab object, identified by its UID.
      * This will search all folders storing objects of the given type.
      *
-     * @param string Object UID
-     * @param string Object type (contact,event,task,journal,file,note,configuration)
+     * @param string $uid  Object UID
+     * @param string $type Object type (contact,event,task,journal,file,note,configuration)
      *
-     * @return array The Kolab object represented as hash array or false if not found
+     * @return array|false The Kolab object represented as hash array or false if not found
      */
     public function get_object($uid, $type)
     {
@@ -119,9 +124,9 @@
     /**
      * Execute cross-folder searches with the given query.
      *
-     * @param array  Pseudo-SQL query as list of filter parameter triplets
-     * @param string Folder type (contact,event,task,journal,file,note,configuration)
-     * @param int    Expected number of records or limit (for performance reasons)
+     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
+     * @param string $type  Folder type (contact,event,task,journal,file,note,configuration)
+     * @param int    $limit Expected number of records or limit (for performance reasons)
      *
      * @return array List of Kolab data objects (each represented as hash array)
      */
@@ -145,9 +150,9 @@
     /**
      * Compose an URL to query the free/busy status for the given user
      *
-     * @param string Email address of the user to get free/busy data for
-     * @param object DateTime Start of the query range (optional)
-     * @param object DateTime End of the query range (optional)
+     * @param string    $email Email address of the user to get free/busy data for
+     * @param ?DateTime $start Start of the query range (optional)
+     * @param ?DateTime $end   End of the query range (optional)
      *
      * @return ?string Fully qualified URL to query free/busy data
      */
@@ -204,6 +209,7 @@
     public function folder_create($name, $type = null, $subscribed = false, $active = false)
     {
         // TODO
+        return false;
     }
 
     /**
@@ -216,7 +222,8 @@
      */
     public function folder_rename($oldname, $newname)
     {
-        // TODO ??
+        // TODO
+        return false;
     }
 
     /**
@@ -232,7 +239,7 @@
      *  - subscribed: Subscribed flag (IMAP subscription)
      *  - active:     Activation flag (client-side subscription)
      *
-     * @return string|false New folder ID or False on failure
+     * @return string|false Folder ID or False on failure
      */
     public function folder_update(&$prop)
     {
@@ -242,8 +249,7 @@
         if (!isset($prop'name') || !is_string($prop'name') || !strlen($prop'name')) {
             self::$last_error = 'cannotbeempty';
             return false;
-        }
-        else if (strlen($prop'name') > 256) {
+        } elseif (strlen($prop'name') > 256) {
             self::$last_error = 'nametoolong';
             return false;
         }
@@ -251,30 +257,32 @@
         if (!empty($prop'id')) {
             if ($folder = $this->get_folder($prop'id', $prop'type')) {
                 $result = $this->dav->folderUpdate($folder->href, $folder->get_dav_type(), $prop);
+
+                if ($result) {
+                    return $prop'id';
+                }
             }
-            else {
-                $result = false;
-            }
+
+            return false;
         }
-        else {
-            $rcube = rcube::get_instance();
-            $uid   = rtrim(chunk_split(md5($prop'name' . $rcube->get_user_name() . uniqid('-', true)), 12, '-'), '-');
-            $type  = $this->get_dav_type($prop'type');
-            $home  = $this->dav->discover($type);
-
-            if ($home === false) {
-                return false;
-            }
 
-            $location = unslashify($home) . '/' . $uid;
-            $result   = $this->dav->folderCreate($location, $type, $prop);
+        $rcube = rcube::get_instance();
+        $uid   = rtrim(chunk_split(md5($prop'name' . $rcube->get_user_name() . uniqid('-', true)), 12, '-'), '-');
+        $type  = $this->get_dav_type($prop'type');
+        $home  = $this->dav->discover($type);
 
-            if ($result !== false) {
-                $result = self::folder_id($this->dav->url, $location);
-            }
+        if ($home === false) {
+            return false;
         }
 
-        return $result;
+        $location = unslashify($home) . '/' . $uid;
+        $result   = $this->dav->folderCreate($location, $type, $prop);
+
+        if ($result) {
+            return self::folder_id($this->dav->url, $location);
+        }
+
+        return false;
     }
 
     /**
@@ -304,30 +312,32 @@
     public function folder_selector($type, $attrs, $current = '')
     {
         // TODO
+        return null; // @phpstan-ignore-line
     }
 
     /**
      * Returns a list of folder names
      *
-     * @param string  Optional root folder
-     * @param string  Optional name pattern
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param bool    Enable to return subscribed folders only (null to use configured subscription mode)
-     * @param array   Will be filled with folder-types data
+     * @param string $root       Optional root folder
+     * @param string $mbox       Optional name pattern
+     * @param string $filter     Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param bool   $subscribed Enable to return subscribed folders only (null to use configured subscription mode)
+     * @param array  $folderdata Will be filled with folder-types data
      *
      * @return array List of folders
      */
-    public function list_folders($root = '', $mbox = '*', $filter = null, $subscribed = null, &$folderdata = array())
+    public function list_folders($root = '', $mbox = '*', $filter = null, $subscribed = null, &$folderdata = )
     {
         // TODO
+        return ;
     }
 
     /**
      * Search for shared or otherwise not listed groupware folders the user has access
      *
-     * @param string Folder type of folders to search for
-     * @param string Search string
-     * @param array  Namespace(s) to exclude results from
+     * @param string $type       Folder type of folders to search for
+     * @param string $query      Search string
+     * @param array  $exclude_ns Namespace(s) to exclude results from
      *
      * @return array List of matching kolab_storage_folder objects
      */
@@ -340,7 +350,7 @@
     /**
      * Sort the given list of folders by namespace/name
      *
-     * @param array List of kolab_storage_dav_folder objects
+     * @param array $folders List of kolab_storage_dav_folder objects
      *
      * @return array Sorted list of folders
      */
@@ -410,7 +420,7 @@
      * @param string $folder Folder name
      * @param bool   $temp   Only subscribe temporarily for the current session
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function folder_subscribe($folder, $temp = false)
     {
@@ -422,9 +432,9 @@
      * Change subscription status of this folder
      *
      * @param string $folder Folder name
-     * @param bool   $temp  Only remove temporary subscription
+     * @param bool   $temp   Only remove temporary subscription
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function folder_unsubscribe($folder, $temp = false)
     {
@@ -449,7 +459,7 @@
      *
      * @param string $folder Folder name
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function folder_activate($folder)
     {
@@ -461,7 +471,7 @@
      *
      * @param string $folder Folder name
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function folder_deactivate($folder)
     {
@@ -473,7 +483,7 @@
      * To be run when none of subscribed folders (of specified type) is found
      *
      * @param string $type  Folder type
-     * @param string $props Folder properties (color, etc)
+     * @param array  $props Folder properties (color, etc)
      *
      * @return string Folder name
      */
@@ -486,10 +496,10 @@
     /**
      * Returns a list of IMAP folders shared by the given user
      *
-     * @param array  User entry from LDAP
-     * @param string Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param int    1 - subscribed folders only, 0 - all folders, 2 - all non-active
-     * @param array  Will be filled with folder-types data
+     * @param array  $user       User entry from LDAP
+     * @param string $type       Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param int    $subscribed 1 - subscribed folders only, 0 - all folders, 2 - all non-active
+     * @param array  $folderdata Will be filled with folder-types data
      *
      * @return array List of folders
      */
@@ -502,8 +512,8 @@
     /**
      * Get a list of (virtual) top-level folders from the other users namespace
      *
-     * @param string Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param bool   Enable to return subscribed folders only (null to use configured subscription mode)
+     * @param string $type       Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param bool   $subscribed Enable to return subscribed folders only (null to use configured subscription mode)
      *
      * @return array List of kolab_storage_folder_user objects
      */
@@ -520,7 +530,7 @@
      */
     public static function delete_user_folders($args)
     {
-        $db = rcmail::get_instance()->get_dbh();
+        $db = rcube::get_instance()->get_dbh();
         $table  = $db->table_name('kolab_folders', true);
         $prefix = 'dav://' . urlencode($args'username') . '@' . $args'host' . '/%';

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache.php Changed

@@ -44,7 +44,7 @@
     /**
      * Connect cache with a storage folder
      *
-     * @param kolab_storage_folder The storage folder instance to connect with
+     * @param kolab_storage_folder $storage_folder The storage folder instance to connect with
      */
     public function set_folder(kolab_storage_folder $storage_folder)
     {
@@ -122,7 +122,7 @@
         if (!is_array($dav_index)) {
             rcube::raise_error(
                     'code' => 900,
-                    'message' => "Failed to sync the kolab cache for {$this->folder->href}"
+                    'message' => "Failed to sync the kolab cache for {$this->folder->href}",
                 , true);
             return false;
         }
@@ -151,8 +151,7 @@
                 }
 
                 $update_index$uid = $object'href';
-            }
-            else {
+            } else {
                 $new_index$uid = $object'href';
             }
         }
@@ -167,7 +166,7 @@
                 if (!is_array($objects)) {
                     rcube::raise_error(
                             'code' => 900,
-                            'message' => "Failed to sync the kolab cache for {$this->folder->href}"
+                            'message' => "Failed to sync the kolab cache for {$this->folder->href}",
                         , true);
                     return false;
                 }
@@ -175,12 +174,12 @@
                 foreach ($objects as $dav_object) {
                     if ($object = $this->folder->from_dav($dav_object)) {
                         $object'_raw' = $dav_object'data';
-                        $this->_extended_insert(false, $object);
+                        $this->_extended_insert(0, $object);
                         unset($object'_raw');
                     }
                 }
 
-                $this->_extended_insert(true, null);
+                $this->_extended_insert(1, null);
 
                 // check time limit and abort sync if running too long
                 if (++$i % 25 == 0 && time() - $this->sync_start > $time_limit) {
@@ -197,7 +196,7 @@
                 if (!is_array($objects)) {
                     rcube::raise_error(
                             'code' => 900,
-                            'message' => "Failed to sync the kolab cache for {$this->folder->href}"
+                            'message' => "Failed to sync the kolab cache for {$this->folder->href}",
                         , true);
                     return false;
                 }
@@ -220,7 +219,7 @@
         // Remove deleted objects
         $old_index = array_filter($old_index);
         if (!empty($old_index)) {
-            $quoted_uids = join(',', array_map(array($this->db, 'quote'), $old_index));
+            $quoted_uids = implode(',', array_map($this->db, 'quote', $old_index));
             $this->db->query(
                 "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `uid` IN ($quoted_uids)",
                 $this->folder_id
@@ -255,9 +254,9 @@
     /**
      * Read a single entry from cache or from server directly
      *
-     * @param string Object UID
-     * @param string Object type to read
-     * @param string Unused (kept for compat. with the parent class)
+     * @param string $uid    Object UID
+     * @param string $type   Object type to read
+     * @param string $unused Unused (kept for compat. with the parent class)
      *
      * @return null|array An array of objects, NULL if not found
      */
@@ -290,7 +289,7 @@
     /**
      * Read multiple entries from the server directly
      *
-     * @param array Object UIDs
+     * @param array $uids Object UIDs
      *
      * @return false|array An array of objects, False on error
      */
@@ -302,9 +301,9 @@
     /**
      * Insert/Update a cache entry
      *
-     * @param string      Object UID
-     * @param array|false Hash array with object properties to save or false to delete the cache entry
-     * @param string      Unused (kept for compat. with the parent class)
+     * @param string      $uid    Object UID
+     * @param array|false $object Hash array with object properties to save or false to delete the cache entry
+     * @param string      $unused Unused (kept for compat. with the parent class)
      */
     public function set($uid, $object, $unused = null)
     {
@@ -327,9 +326,8 @@
     /**
      * Insert (or update) a cache entry
      *
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string Optional old message UID (for update)
-     * @param string Unused (kept for compat. with the parent class)
+     * @param mixed  $object Hash array with object properties to save or false to delete the cache entry
+     * @param string $olduid Optional old message UID (for update)
      */
     public function save($object, $olduid = null, $unused = null)
     {
@@ -360,8 +358,7 @@
                     . " WHERE `folder_id` = ? AND `uid` = ?";
                 $args = $this->folder_id;
                 $args = $olduid;
-            }
-            else {
+            } else {
                 $query = "INSERT INTO `{$this->cache_table}` (`created`, " . implode(', ', $cols)
                     . ") VALUES (" . $this->db->now() . str_repeat(', ?', count($cols)) . ")";
             }
@@ -371,7 +368,7 @@
             if (!$this->db->affected_rows($result)) {
                 rcube::raise_error(
                     'code' => 900,
-                    'message' => "Failed to write to kolab cache"
+                    'message' => "Failed to write to kolab cache",
                 , true);
             }
         }
@@ -380,10 +377,7 @@
     /**
      * Move an existing cache entry to a new resource
      *
-     * @param string               Entry's  UID
-     * @param kolab_storage_folder Target storage folder instance
-     * @param string Unused (kept for compat. with the parent class)
-     * @param string Unused (kept for compat. with the parent class)
+     * @param string $uid Entry's UID
      */
     public function move($uid, $target, $unused1 = null, $unused2 = null)
     {
@@ -393,7 +387,7 @@
     /**
      * Update resource URI for existing folder
      *
-     * @param string Target DAV folder to move it to
+     * @param string $new_folder Target DAV folder to move it to
      */
     public function rename($new_folder)
     {
@@ -403,11 +397,11 @@
     /**
      * Select Kolab objects filtered by the given query
      *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: '<colname>', '<comparator>', '<value>'
-     * @param bool  Set true to only return UIDs instead of complete objects
-     * @param bool  Use fast mode to fetch only minimal set of information
-     *              (no xml fetching and parsing, etc.)
+     * @param array $query Pseudo-SQL query as list of filter parameter triplets
+     *                     triplet: '<colname>', '<comparator>', '<value>'
+     * @param bool  $uids  Set true to only return UIDs instead of complete objects
+     * @param bool  $fast  Use fast mode to fetch only minimal set of information
+     *                     (no xml fetching and parsing, etc.)
      *
      * @return array|null|kolab_storage_dataset List of Kolab data objects (each represented as hash array) or UIDs
      */
@@ -438,8 +432,7 @@
         while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
             if (!$uids && ($object = $this->_unserialize($sql_arr, true, $fast))) {
                 $result = $object;
-            }
-            else {
+            } else {
                 $result = $sql_arr'uid';
             }
         }
@@ -452,7 +445,7 @@
      *
      * @param array $query Pseudo-SQL query as list of filter parameter triplets
      *
-     * @return int The number of objects of the given type
+     * @return int|null The number of objects of the given type, Null on error
      */
     public function count($query = )
     {
@@ -460,7 +453,7 @@
         $this->_read_folder_data();
 
         $sql_result = $this->db->query(
-            "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` ".
+            "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` " .
             "WHERE `folder_id` = ?" . $this->_sql_where($query),
             $this->folder_id
         );
@@ -497,13 +490,15 @@
         if (!empty($list) && !empty($list0)) {
             return $list0;
         }
+
+        return null;
     }
 
     /**
      * Write records into cache using extended inserts to reduce the number of queries to be executed
      *
-     * @param bool  Set to false to commit buffered insert, true to force an insert
-     * @param array Kolab object to cache
+     * @param int    $force  Set to 0 to commit buffered insert, 1 to force an insert
+     * @param ?array $object Kolab object to cache
      */
     protected function _extended_insert($force, $object)
     {
@@ -528,7 +523,7 @@
                     $sql_data'changed',
                     $sql_data'data',
                     $sql_data'tags',
-                    $sql_data'words'
+                    $sql_data'words',
                 ;
 
                 foreach ($this->extra_cols as $col) {
@@ -536,7 +531,7 @@
                     $extra_args = '?';
                 }
 
-                $cols = implode(', ', array_map(function($n) { return "`{$n}`"; }, $cols));
+                $cols = implode(', ', array_map(function ($n) { return "`{$n}`"; }, $cols));
                 $extra_args = count($extra_args) ? ', ' . implode(', ', $extra_args) : '';
 
                 $result = $this->db->query(
@@ -546,15 +541,15 @@
                 );
 
                 if (!$this->db->affected_rows($result)) {
-                    rcube::raise_error(array(
-                        'code' => 900, 'message' => "Failed to write to kolab cache"
-                    ), true);
+                    rcube::raise_error(
+                        'code' => 900, 'message' => "Failed to write to kolab cache",
+                    , true);
                 }
 
                 return;
             }
 
-            $values = array(
+            $values = 
                 $this->db->quote($this->folder_id),
                 $this->db->quote(rcube_charset::clean($object'uid')),
                 $this->db->quote(rcube_charset::clean($object'etag')),
@@ -563,23 +558,22 @@
                 $this->db->quote($sql_data'data'),
                 $this->db->quote($sql_data'tags'),
                 $this->db->quote($sql_data'words'),
-            );
+            ;
             foreach ($this->extra_cols as $col) {
                 $values = $this->db->quote($sql_data$col);
             }
-            $line = '(' . join(',', $values) . ')';
+            $line = '(' . implode(',', $values) . ')';
         }
 
         if ($buffer && ($force || (strlen($buffer) + strlen($line) > $this->max_sql_packet()))) {
-            $columns = implode(', ', array_map(function($n) { return "`{$n}`"; }, $cols));
+            $columns = implode(', ', array_map(function ($n) { return "`{$n}`"; }, $cols));
 
             if ($this->db->db_provider == 'postgres') {
                 $update = "ON CONFLICT (folder_id, uid) DO UPDATE SET "
-                    . implode(', ', array_map(function($i) { return "`{$i}` = EXCLUDED.`{$i}`"; }, array_slice($cols, 2)));
-            }
-            else {
+                    . implode(', ', array_map(function ($i) { return "`{$i}` = EXCLUDED.`{$i}`"; }, array_slice($cols, 2)));
+            } else {
                 $update = "ON DUPLICATE KEY UPDATE "
-                    . implode(', ', array_map(function($i) { return "`{$i}` = VALUES(`{$i}`)"; }, array_slice($cols, 2)));
+                    . implode(', ', array_map(function ($i) { return "`{$i}` = VALUES(`{$i}`)"; }, array_slice($cols, 2)));
             }
 
             $result = $this->db->query("INSERT INTO `{$this->cache_table}` ($columns) VALUES $buffer $update");
@@ -621,11 +615,11 @@
             if (isset($object$prop)) {
                 $data$prop = $object$prop;
                 if ($data$prop instanceof DateTimeInterface) {
-                    $data$prop = array(
+                    $data$prop = 
                         'cl' => 'DateTime',
                         'dt' => $data$prop->format('Y-m-d H:i:s'),
                         'tz' => $data$prop->getTimezone()->getName(),
-                    );
+                    ;
                 }
             }
         }
@@ -644,7 +638,7 @@
      */
     protected function _unserialize($sql_arr, $noread = false, $fast_mode = false)
     {
-        $init = function(&$object) use ($sql_arr) {
+        $init = function (&$object) use ($sql_arr) {
             if ($sql_arr'created' && empty($object'created')) {
                 $object'created' = new DateTime($sql_arr'created', $this->server_timezone);
             }
@@ -664,8 +658,7 @@
                     && isset($object$prop'cl') && $object$prop'cl' == 'DateTime'
                 ) {
                     $object$prop = new DateTime($object$prop'dt', new DateTimeZone($object$prop'tz'));
-                }
-                else if (!isset($object$prop) && isset($sql_arr$prop)) {
+                } elseif (!isset($object$prop) && isset($sql_arr$prop)) {
                     $object$prop = $sql_arr$prop;
                 }
             }
@@ -675,8 +668,7 @@
 
         if (!empty($fast_mode) && !empty($object)) {
             unset($object'_raw');
-        }
-        else if ($noread) {
+        } elseif ($noread) {
             // We have the raw content already, parse it
             if (!empty($object'_raw')) {
                 $object'data' = $object'_raw';
@@ -687,8 +679,7 @@
             }
 
             return null;
-        }
-        else {
+        } else {
             // Fetch a complete object from the server
             $object = $this->folder->read_object($sql_arr'uid', '*');
         }
@@ -711,17 +702,16 @@
         // Therefore we both `resource` and `type` in WHERE.
 
         $sql_arr = $this->db->fetch_assoc($this->db->query(
-                "SELECT `folder_id`, `synclock`, `ctag`, `changed` FROM `{$this->folders_table}`"
+            "SELECT `folder_id`, `synclock`, `ctag`, `changed` FROM `{$this->folders_table}`"
                 . " WHERE `resource` = ? AND `type` = ?",
-                $this->resource_uri,
-                $this->folder->type
+            $this->resource_uri,
+            $this->folder->type
         ));
 
         if ($sql_arr) {
             $this->folder_id = $sql_arr'folder_id';
             $this->metadata  = $sql_arr;
-        }
-        else {
+        } else {
             $this->db->query("INSERT INTO `{$this->folders_table}` (`resource`, `type`)"
                 . " VALUES (?, ?)", $this->resource_uri, $this->folder->type);

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache_contact.php Changed

@@ -63,12 +63,12 @@
         // make sure some data is not longer that database limit (#5291)
         foreach ($this->extra_cols as $col) {
             if (strlen($sql_data$col) > $this->extra_cols_max) {
-                $sql_data$col = rcube_charset::clean(substr($sql_data$col, 0,  $this->extra_cols_max));
+                $sql_data$col = rcube_charset::clean(substr($sql_data$col, 0, $this->extra_cols_max));
             }
         }
 
-        $sql_data'tags'  = ' ' . join(' ', $this->get_tags($object)) . ' ';  // pad with spaces for strict/prefix search
-        $sql_data'words' = ' ' . join(' ', $this->get_words($object)) . ' ';
+        $sql_data'tags'  = ' ' . implode(' ', $this->get_tags($object)) . ' ';  // pad with spaces for strict/prefix search
+        $sql_data'words' = ' ' . implode(' ', $this->get_words($object)) . ' ';
 
         return $sql_data;
     }
@@ -83,11 +83,11 @@
         $data = '';
 
         foreach ($object as $colname => $value) {
-            list($col, $field) = strpos($colname, ':') ? explode(':', $colname) : $colname, null;
+            $col, $field = strpos($colname, ':') ? explode(':', $colname) : $colname, null;
 
             $val = null;
             if (in_array($col, $this->fulltext_cols)) {
-                $val = is_array($value) ? join(' ', $value) : $value;
+                $val = is_array($value) ? implode(' ', $value) : $value;
             }
 
             if (is_string($val) && strlen($val)) {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache_event.php Changed

@@ -65,8 +65,8 @@
             }
         }
 
-        $sql_data'tags'  = ' ' . join(' ', $this->get_tags($object)) . ' ';  // pad with spaces for strict/prefix search
-        $sql_data'words' = ' ' . join(' ', $this->get_words($object)) . ' ';
+        $sql_data'tags'  = ' ' . implode(' ', $this->get_tags($object)) . ' ';  // pad with spaces for strict/prefix search
+        $sql_data'words' = ' ' . implode(' ', $this->get_words($object)) . ' ';
 
         return $sql_data;
     }
@@ -81,7 +81,7 @@
         $data = '';
 
         foreach ($this->fulltext_cols as $colname) {
-            list($col, $field) = strpos($colname, ':') ? explode(':', $colname) : $colname, null;
+            $col, $field = strpos($colname, ':') ? explode(':', $colname) : $colname, null;
 
             if (empty($object$col)) {
                 continue;
@@ -94,10 +94,9 @@
                         $a = $attr$field;
                     }
                 }
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($object$col) ? join(' ', $object$col) : $object$col;
+                $val = implode(' ', $a);
+            } else {
+                $val = is_array($object$col) ? implode(' ', $object$col) : $object$col;
             }
 
             if (is_string($val) && strlen($val)) {
@@ -133,8 +132,9 @@
         // create tags reflecting participant status
         if (is_array($object'attendees')) {
             foreach ($object'attendees' as $attendee) {
-                if (!empty($attendee'email') && !empty($attendee'status'))
+                if (!empty($attendee'email') && !empty($attendee'status')) {
                     $tags = 'x-partstat:' . $attendee'email' . ':' . strtolower($attendee'status');
+                }
             }
         }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache_task.php Changed

@@ -39,8 +39,8 @@
         $sql_data'dtstart' = !empty($object'start') ? $this->_convert_datetime($object'start') : null;
         $sql_data'dtend'   = !empty($object'due') ? $this->_convert_datetime($object'due') : null;
 
-        $sql_data'tags'  = ' ' . join(' ', $this->get_tags($object)) . ' ';  // pad with spaces for strict/prefix search
-        $sql_data'words' = ' ' . join(' ', $this->get_words($object)) . ' ';
+        $sql_data'tags'  = ' ' . implode(' ', $this->get_tags($object)) . ' ';  // pad with spaces for strict/prefix search
+        $sql_data'words' = ' ' . implode(' ', $this->get_words($object)) . ' ';
 
         return $sql_data;
     }
@@ -55,7 +55,7 @@
         $data = '';
 
         foreach ($this->fulltext_cols as $colname) {
-            list($col, $field) = strpos($colname, ':') ? explode(':', $colname) : $colname, null;
+            $col, $field = strpos($colname, ':') ? explode(':', $colname) : $colname, null;
 
             if (empty($object$col)) {
                 continue;
@@ -68,10 +68,9 @@
                         $a = $attr$field;
                     }
                 }
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($object$col) ? join(' ', $object$col) : $object$col;
+                $val = implode(' ', $a);
+            } else {
+                $val = is_array($object$col) ? implode(' ', $object$col) : $object$col;
             }
 
             if (is_string($val) && strlen($val)) {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_dav_folder.php Changed

@@ -46,7 +46,7 @@
         $this->dav   = $dav;
         $this->valid = true;
 
-        list($this->type, $suffix) = strpos($type, '.') ? explode('.', $type) : $type, '';
+        $this->type, $suffix = strpos($type, '.') ? explode('.', $type) : $type, '';
         $this->default = $suffix == 'default';
         $this->subtype = $this->default ? '' : $suffix;
 
@@ -57,7 +57,7 @@
     /**
      * Returns the owner of the folder.
      *
-     * @param bool Return a fully qualified owner name (i.e. including domain for shared folders)
+     * @param bool $fully_qualified Return a fully qualified owner name (i.e. including domain for shared folders)
      *
      * @return string The owner of this folder.
      */
@@ -177,7 +177,7 @@
     /**
      * Get the color value stored in metadata
      *
-     * @param string Default color value to return if not set
+     * @param string $default Default color value to return if not set
      *
      * @return mixed Color value from the folder metadata or $default if not set
      */
@@ -200,12 +200,11 @@
     /**
      * Helper method to extract folder UID
      *
-     * @return string Folder's UID
+     * @return string|null Folder's UID
      */
     public function get_uid()
     {
-        // TODO ???
-        return '';
+        return $this->id;
     }
 
     /**
@@ -221,7 +220,7 @@
     /**
      * Change activation status of this folder
      *
-     * @param bool The desired subscription status: true = active, false = not active
+     * @param bool $active The desired subscription status: true = active, false = not active
      *
      * @return bool True on success, false on error
      */
@@ -243,9 +242,9 @@
     /**
      * Change subscription status of this folder
      *
-     * @param bool The desired subscription status: true = subscribed, false = not subscribed
+     * @param bool $subscribed The desired subscription status: true = subscribed, false = not subscribed
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function subscribe($subscribed)
     {
@@ -325,8 +324,8 @@
     /**
      * Move a Kolab object message to another IMAP folder
      *
-     * @param string                   Object UID
-     * @param kolab_storage_dav_folder Target folder to move object into
+     * @param string                   $uid           Object UID
+     * @param kolab_storage_dav_folder $target_folder Target folder to move object into
      *
      * @return bool True on success, false on failure
      */
@@ -375,11 +374,20 @@
             if (empty($object'created')) {
                 $object'created' = new DateTime('now');
             }
-        }
-        else {
+        } else {
             $object'changed' = new DateTime('now');
         }
 
+        // Make sure UID exists
+        if (empty($object'uid')) {
+            if ($uid) {
+                $object'uid' = $uid;
+            } else {
+                $username = rcube::get_instance()->user->get_username();
+                $object'uid' = strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($username), 0, 16));
+            }
+        }
+
         // generate and save object message
         if ($content = $this->to_dav($object)) {
             $method   = $uid ? 'update' : 'create';
@@ -403,9 +411,9 @@
     /**
      * Fetch the object the DAV server and convert to internal format
      *
-     * @param string The object UID to fetch
-     * @param string The object type expected (use wildcard '*' to accept all types)
-     * @param string Unused (kept for compat. with the parent class)
+     * @param string $uid    The object UID to fetch
+     * @param string $type   The object type expected (use wildcard '*' to accept all types)
+     * @param string $folder Unused (kept for compat. with the parent class)
      *
      * @return mixed Hash array representing the Kolab object, a kolab_format instance or false if not found
      */
@@ -421,7 +429,7 @@
         if (!is_array($objects) || count($objects) != 1) {
             rcube::raise_error(
                     'code' => 900,
-                    'message' => "Failed to fetch {$href}"
+                    'message' => "Failed to fetch {$href}",
                 , true);
             return false;
         }
@@ -432,7 +440,7 @@
     /**
      * Fetch multiple objects from the DAV server and convert to internal format
      *
-     * @param array The object UIDs to fetch
+     * @param array $uids The object UIDs to fetch
      *
      * @return mixed Hash array representing the Kolab objects
      */
@@ -446,6 +454,7 @@
             return ;
         }
 
+        $hrefs = ;
         foreach ($uids as $uid) {
             $hrefs = $this->object_location($uid);
         }
@@ -455,7 +464,7 @@
         if (!is_array($objects)) {
             rcube::raise_error(
                     'code' => 900,
-                    'message' => "Failed to fetch objects from {$this->href}"
+                    'message' => "Failed to fetch objects from {$this->href}",
                 , true);
             return false;
         }
@@ -489,13 +498,13 @@
     /**
      * Convert DAV object into PHP array
      *
-     * @param array Object data in kolab_dav_client::fetchData() format
+     * @param array $object Object data in kolab_dav_client::fetchData() format
      *
      * @return array|false Object properties, False on error
      */
     public function from_dav($object)
     {
-        if (empty($object ) || empty($object'data')) {
+        if (empty($object) || empty($object'data')) {
             return false;
         }
 
@@ -511,8 +520,7 @@
 
             $result'_attachments' = $result'attachments' ?? ;
             unset($result'attachments');
-        }
-        else if ($this->type == 'contact') {
+        } elseif ($this->type == 'contact') {
             if (stripos($object'data', 'BEGIN:VCARD') !== 0) {
                 return false;
             }
@@ -534,14 +542,13 @@
                 $result = $vcard->get_assoc();
 
                 // Contact groups
-                if (!empty($result'x-kind') && implode($result'x-kind') == 'group') {
+                if (!empty($result'x-kind') && implode('', $result'x-kind') == 'group') {
                     $result'_type' = 'group';
-                    $members = isset($result'x-member') ? $result'x-member' : ;
+                    $members = $result'x-member' ?? ;
                     unset($result'x-kind', $result'x-member');
-                }
-                else if (!empty($result'kind') && implode($result'kind') == 'group') {
+                } elseif (!empty($result'kind') && implode('', $result'kind') == 'group') {
                     $result'_type' = 'group';
-                    $members = isset($result'member') ? $result'member' : ;
+                    $members = $result'member' ?? ;
                     unset($result'kind', $result'member');
                 }
 
@@ -550,8 +557,7 @@
                     foreach ($members as $member) {
                         if (strpos($member, 'urn:uuid:') === 0) {
                             $result'member' = 'uid' => substr($member, 9);
-                        }
-                        else if (strpos($member, 'mailto:') === 0) {
+                        } elseif (strpos($member, 'mailto:') === 0) {
                             $member = reset(rcube_mime::decode_address_list(urldecode(substr($member, 7))));
                             if (!empty($member'mailto')) {
                                 $result'member' = 'email' => $member'mailto', 'name' => $member'name';
@@ -561,10 +567,9 @@
                 }
 
                 if (!empty($result'uid')) {
-                    $result'uid' = preg_replace('/^urn:uuid:/', '', implode($result'uid'));
+                    $result'uid' = preg_replace('/^urn:uuid:/', '', implode('', $result'uid'));
                 }
-            }
-            else {
+            } else {
                 return false;
             }
         }
@@ -610,12 +615,10 @@
                                 // here nor in rcube_imap_generic before IMAP APPEND
                                 $stat = fstat($attachment'data');
                                 $attachment'size' = $stat ? $stat'size' : 0;
-                            }
-                            else {
+                            } else {
                                 $attachment'size' = strlen($attachment'data');
                             }
-                        }
-                        else if (!empty($attachment'path')) {
+                        } elseif (!empty($attachment'path')) {
                             $attachment'size' = filesize($attachment'path');
                         }
 
@@ -628,8 +631,7 @@
             unset($object'_attachments');
 
             $result = $ical->export($object, null, false, $this, 'get_attachment');
-        }
-        else if ($this->type == 'contact') {
+        } elseif ($this->type == 'contact') {
             // copy values into vcard object
             // TODO: We should probably use Sabre/Vobject to create the vCard
 
@@ -644,7 +646,7 @@
             }
 
             foreach ($object as $key => $values) {
-                list($field, $section) = rcube_utils::explode(':', $key);
+                $field, $section = rcube_utils::explode(':', $key);
 
                 // avoid casting DateTime objects to array
                 if (is_object($values) && $values instanceof DateTimeInterface) {
@@ -666,11 +668,9 @@
                     $value = null;
                     if (!empty($member'uid')) {
                         $value = 'urn:uuid:' . $member'uid';
-                    }
-                    else if (!empty($member'email') && !empty($member'name')) {
+                    } elseif (!empty($member'email') && !empty($member'name')) {
                         $value = 'mailto:' . urlencode(sprintf('"%s" <%s>', addcslashes($member'name', '"'), $member'email'));
-                    }
-                    else if (!empty($member'email')) {
+                    } elseif (!empty($member'email')) {
                         $value = 'mailto:' . $member'email';
                     }
 
@@ -723,22 +723,21 @@
      */
     public function get_attachment($id, $event, $unused1 = null, $unused2 = false, $unused3 = null, $unused4 = false)
     {
+        /** @var array $event Overwrite type from the parent class */
+
         // Note: 'attachments' is defined when saving the data into the DAV server
         //       '_attachments' is defined after fetching the object from the DAV server
         if (is_int($id) && isset($event'attachments'$id)) {
             $attachment = $event'attachments'$id;
-        }
-        else if (is_int($id) && isset($event'_attachments'$id)) {
+        } elseif (is_int($id) && isset($event'_attachments'$id)) {
             $attachment = $event'_attachments'$id;
-        }
-        else if (is_string($id) && !empty($event'attachments')) {
+        } elseif (is_string($id) && !empty($event'attachments')) {
             foreach ($event'attachments' as $att) {
                 if (!empty($att'id') && $att'id' === $id) {
                     $attachment = $att;
                 }
             }
-        }
-        else if (is_string($id) && !empty($event'_attachments')) {
+        } elseif (is_string($id) && !empty($event'_attachments')) {
             foreach ($event'_attachments' as $att) {
                 if (!empty($att'id') && $att'id' === $id) {
                     $attachment = $att;

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_folder.php Changed

@@ -32,7 +32,7 @@
 
     /**
      * Indicate validity status
-     * @var boolean
+     * @var bool
      */
     public $valid = false;
 
@@ -43,11 +43,11 @@
     /**
      * Default constructor
      *
-     * @param string The folder name/path
-     * @param string Expected folder type
-     * @param string Optional folder type if known
+     * @param string  $name            The folder name/path
+     * @param ?string $type            Expected folder type
+     * @param ?string $type_annotation Optional folder type if known
      */
-    function __construct($name, $type = null, $type_annotation = null)
+    public function __construct($name, $type = null, $type_annotation = null)
     {
         parent::__construct($name);
         $this->set_folder($name, $type, $type_annotation);
@@ -56,9 +56,9 @@
     /**
      * Set the IMAP folder this instance connects to
      *
-     * @param string The folder name/path
-     * @param string Expected folder type
-     * @param string Optional folder type if known
+     * @param string  $name            The folder name/path
+     * @param ?string $type            Expected folder type
+     * @param ?string $type_annotation Optional folder type if known
      */
     public function set_folder($name, $type = null, $type_annotation = null)
     {
@@ -69,7 +69,7 @@
         }
 
         $oldtype = $this->type;
-        list($this->type, $suffix) = array_pad(explode('.', $type_annotation), 2, null);
+        $this->type, $suffix = array_pad(explode('.', $type_annotation), 2, null);
         $this->default      = $suffix == 'default';
         $this->subtype      = $this->default ? '' : $suffix;
         $this->id           = kolab_storage::folder_id($name);
@@ -83,10 +83,11 @@
         $this->owner = $this->namespace = $this->resource_uri = $this->info = $this->idata = null;
 
         // get a new cache instance if folder type changed
-        if (!$this->cache || $this->type != $oldtype)
+        if (!$this->cache || $this->type != $oldtype) {
             $this->cache = kolab_storage_cache::factory($this);
-        else
+        } else {
             $this->cache->set_folder($this);
+        }
 
         $this->imap->set_folder($this->name);
     }
@@ -108,7 +109,7 @@
     {
         if (($err_code = $this->imap->get_error_code()) < 0) {
             $this->error = kolab_storage::ERROR_IMAP_CONN;
-            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
+            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, rcube_storage::NOPERM, rcube_storage::READONLY)) {
                 $this->error = kolab_storage::ERROR_NO_PERMISSION;
             }
         }
@@ -132,11 +133,10 @@
         if (!empty($nsdata00) && strpos($this->name, $nsdata00) === 0) {
             $subpath = substr($this->name, strlen($nsdata00));
             if ($ns == 'other') {
-                list($user, $suffix) = explode($nsdata01, $subpath, 2);
+                $user, $suffix = explode($nsdata01, $subpath, 2);
                 $subpath = $suffix;
             }
-        }
-        else {
+        } else {
             $subpath = $this->name;
         }
 
@@ -148,12 +148,12 @@
     /**
      * Helper method to extract folder UID metadata
      *
-     * @return string Folder's UID
+     * @return string|null Folder's UID
      */
     public function get_uid()
     {
         // UID is defined in folder METADATA
-        $metakeys = array(kolab_storage::UID_KEY_SHARED, kolab_storage::UID_KEY_CYRUS);
+        $metakeys = kolab_storage::UID_KEY_SHARED, kolab_storage::UID_KEY_CYRUS;
         $metadata = $this->get_metadata();
 
         if ($metadata !== null) {
@@ -179,12 +179,13 @@
     /**
      * Helper method to set an UID value to the given IMAP folder instance
      *
-     * @param string Folder's UID
-     * @return boolean True on succes, False on failure
+     * @param string $uid Folder's UID
+     *
+     * @return bool True on succes, False on failure
      */
     public function set_uid($uid)
     {
-        $success = $this->set_metadata(array(kolab_storage::UID_KEY_SHARED => $uid));
+        $success = $this->set_metadata(kolab_storage::UID_KEY_SHARED => $uid);
 
         $this->check_error();
         return $success;
@@ -203,7 +204,7 @@
     /**
      * Check activation status of this folder
      *
-     * @return boolean True if enabled, false if not
+     * @return bool True if enabled, false if not
      */
     public function is_active()
     {
@@ -213,9 +214,9 @@
     /**
      * Change activation status of this folder
      *
-     * @param boolean The desired subscription status: true = active, false = not active
+     * @param bool $active The desired subscription status: true = active, false = not active
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function activate($active)
     {
@@ -225,7 +226,7 @@
     /**
      * Check subscription status of this folder
      *
-     * @return boolean True if subscribed, false if not
+     * @return bool True if subscribed, false if not
      */
     public function is_subscribed()
     {
@@ -235,9 +236,9 @@
     /**
      * Change subscription status of this folder
      *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     * @param bool $subscribed The desired subscription status: true = subscribed, false = not subscribed
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function subscribe($subscribed)
     {
@@ -247,10 +248,10 @@
     /**
      * Get number of objects stored in this folder
      *
-     * @param mixed Pseudo-SQL query as list of filter parameter triplets
-     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @param mixed $query Pseudo-SQL query as list of filter parameter triplets
+     *                     or string with object type (e.g. contact, event, todo, journal, note, configuration)
      *
-     * @return integer The number of objects of the given type
+     * @return int|null The number of objects of the given type, Null on error
      * @see self::select()
      */
     public function count($query = null)
@@ -270,7 +271,7 @@
      *
      * @param string $uid Object UID
      *
-     * @return array The Kolab object represented as hash array
+     * @return array|false|null The Kolab object represented as hash array, False on error
      */
     public function get_object($uid)
     {
@@ -287,13 +288,13 @@
     /**
      * List Kolab objects matching the given query
      *
-     * @param mixed Pseudo-SQL query as list of filter parameter triplets
-     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @param mixed $query Pseudo-SQL query as list of filter parameter triplets
+     *                     or string with object type (e.g. contact, event, todo, journal, note, configuration)
      *
      * @return array List of Kolab data objects (each represented as hash array)
      * @deprecated Use select()
      */
-    public function get_objects($query = array())
+    public function get_objects($query = )
     {
         return $this->select($query);
     }
@@ -301,17 +302,17 @@
     /**
      * Select Kolab objects matching the given query
      *
-     * @param mixed   Pseudo-SQL query as list of filter parameter triplets
-     *                or string with object type (e.g. contact, event, todo, journal, note, configuration)
-     * @param boolean Use fast mode to fetch only minimal set of information
-     *                (no xml fetching and parsing, etc.)
+     * @param mixed $query Pseudo-SQL query as list of filter parameter triplets
+     *                     or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @param bool  $fast  Use fast mode to fetch only minimal set of information
+     *                     (no xml fetching and parsing, etc.)
      *
-     * @return array List of Kolab data objects (each represented as hash array)
+     * @return null|array|kolab_storage_dataset List of Kolab data objects (each represented as hash array)
      */
-    public function select($query = array(), $fast = false)
+    public function select($query = , $fast = false)
     {
         if (!$this->valid) {
-            return array();
+            return ;
         }
 
         // synchronize caches
@@ -324,13 +325,14 @@
     /**
      * Getter for object UIDs only
      *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
+     * @param array $query Pseudo-SQL query as list of filter parameter triplets
+     *
      * @return array List of Kolab object UIDs
      */
-    public function get_uids($query = array())
+    public function get_uids($query = )
     {
         if (!$this->valid) {
-            return array();
+            return ;
         }
 
         // synchronize caches
@@ -343,9 +345,9 @@
     /**
      * Setter for ORDER BY and LIMIT parameters for cache queries
      *
-     * @param array   List of columns to order by
-     * @param integer Limit result set to this length
-     * @param integer Offset row
+     * @param array $sortcols List of columns to order by
+     * @param int   $length   Limit result set to this length
+     * @param int   $offset   Offset row
      */
     public function set_order_and_limit($sortcols, $length = null, $offset = 0)
     {
@@ -364,14 +366,13 @@
         // string equals type query
         // FIXME: should not be called this way!
         if (is_string($query)) {
-            return $this->cache->has_type_col() && !empty($query) ? array(array('type','=',$query)) : array();
+            return $this->cache->has_type_col() && !empty($query) ? 'type','=',$query : ;
         }
 
         foreach ((array)$query as $i => $param) {
             if ($param0 == 'type' && !$this->cache->has_type_col()) {
                 unset($query$i);
-            }
-            else if (($param0 == 'dtstart' || $param0 == 'dtend' || $param0 == 'changed')) {
+            } elseif (($param0 == 'dtstart' || $param0 == 'dtend' || $param0 == 'changed')) {
                 if (is_object($param2) && $param2 instanceof DateTimeInterface) {
                     $param2 = $param2->format('U');
                 }
@@ -388,15 +389,15 @@
      * Fetch a Kolab object attachment which is stored in a separate part
      * of the mail MIME message that represents the Kolab record.
      *
-     * @param string   Object's UID
-     * @param string   The attachment's mime number
-     * @param string   IMAP folder where message is stored;
-     *                 If set, that also implies that the given UID is an IMAP UID
-     * @param bool     True to print the part content
-     * @param resource File pointer to save the message part
-     * @param boolean  Disables charset conversion
+     * @param string   $uid     Object's UID
+     * @param string   $part    The attachment's mime number
+     * @param ?string  $mailbox IMAP folder where message is stored;
+     *                          If set, that also implies that the given UID is an IMAP UID
+     * @param bool     $print   True to print the part content
+     * @param resource $fp      File pointer to save the message part
+     * @param bool     $skip_charset_conv Disables charset conversion
      *
-     * @return mixed  The attachment content as binary string
+     * @return mixed The attachment content as binary string
      */
     public function get_attachment($uid, $part, $mailbox = null, $print = false, $fp = null, $skip_charset_conv = false)
     {
@@ -406,23 +407,28 @@
             if (substr($part, 0, 2) == 'i:') {
                 // attachment data is stored in XML
                 if ($object = $this->cache->get($msguid)) {
+                    $object'_attachments' = ;
+
                     // load data from XML (attachment content is not stored in cache)
-                    if ($object'_formatobj' && isset($object'_size')) {
-                        $object'_attachments' = array();
+                    if (isset($object'_formatobj') && isset($object'_size')) {
                         $object'_formatobj'->get_attachments($object);
                     }
 
+                    // @phpstan-ignore-next-line
                     foreach ($object'_attachments' as $attach) {
                         if ($attach'id' == $part) {
-                            if ($print)   echo $attach'content';
-                            else if ($fp) fwrite($fp, $attach'content');
-                            else          return $attach'content';
+                            if ($print) {
+                                echo $attach'content';
+                            } elseif ($fp) {
+                                fwrite($fp, $attach'content');
+                            } else {
+                                return $attach'content';
+                            }
                             return true;
                         }
                     }
                 }
-            }
-            else {
+            } else {
                 // return message part from IMAP directly
                 // TODO: We could improve performance if we cache part's encoding
                 //       without 3rd argument get_message_part() will request BODYSTRUCTURE from IMAP
@@ -437,9 +443,9 @@
      * Fetch the mime message from the storage server and extract
      * the Kolab groupware object from it
      *
-     * @param string The IMAP message UID to fetch
-     * @param string The object type expected (use wildcard '*' to accept all types)
-     * @param string The folder name where the message is stored
+     * @param string $msguid The IMAP message UID to fetch
+     * @param string $type   The object type expected (use wildcard '*' to accept all types)
+     * @param string $folder The folder name where the message is stored
      *
      * @return mixed Hash array representing the Kolab object, a kolab_format instance or false if not found
      */
@@ -449,8 +455,12 @@
             return false;
         }
 
-        if (!$type) $type = $this->type;
-        if (!$folder) $folder = $this->name;
+        if (!$type) {
+            $type = $this->type;
+        }
+        if (!$folder) {
+            $folder = $this->name;
+        }
 
         $this->imap->set_folder($folder);
 
@@ -473,19 +483,19 @@
             }
         }
         // fix buggy messages stating the X-Kolab-Type header twice
-        else if (is_array($message->headers->others'x-kolab-type')) {
+        elseif (is_array($message->headers->others'x-kolab-type')) {
             $message->headers->others'x-kolab-type' = reset($message->headers->others'x-kolab-type');
         }
 
         // no object type header found: abort
         if (empty($message->headers->others'x-kolab-type')) {
-            rcube::raise_error(array(
+            rcube::raise_error(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__,
                 'line' => __LINE__,
                 'message' => "No X-Kolab-Type information found in message $msguid ($this->name).",
-            ), true);
+            , true);
             return false;
         }
 
@@ -497,15 +507,14 @@
             return false;
         }
 
-        $attachments = array();
+        $attachments = ;
 
         // get XML part
         $xml = null;
         foreach ((array)$message->attachments as $part) {
             if (!$xml && ($part->mimetype == $content_type || preg_match('!application/(a-z.+\+)?xml!i', $part->mimetype))) {
                 $xml = $message->get_part_body($part->mime_id, true);
-            }
-            else if ($part->filename || $part->content_id) {
+            } elseif ($part->filename || $part->content_id) {
                 $key  = $part->content_id ? trim($part->content_id, '<>') : $part->filename;
                 $size = null;
 
@@ -514,54 +523,56 @@
                     $size = $part->d_parameters'size';
                 }
                 // we can trust part size only if it's not encoded
-                else if ($part->encoding == 'binary' || $part->encoding == '7bit' || $part->encoding == '8bit') {
+                elseif ($part->encoding == 'binary' || $part->encoding == '7bit' || $part->encoding == '8bit') {
                     $size = $part->size;
                 }
 
-                $attachments$key = array(
+                $attachments$key = 
                     'id'       => $part->mime_id,
                     'name'     => $part->filename,
                     'mimetype' => $part->mimetype,
                     'size'     => $size,
-                );
+                ;
             }
         }
 
         if (!$xml) {
-            rcube::raise_error(array(
+            rcube::raise_error(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__,
                 'line' => __LINE__,
                 'message' => "Could not find Kolab data part in message $msguid ($this->name).",
-            ), true);
+            , true);
             return false;
         }
 
         // check kolab format version
         $format_version = $message->headers->others'x-kolab-mime-version';
         if (empty($format_version)) {
-            list($xmltype, $subtype) = explode('.', $object_type);
+            $xmltype, $subtype = explode('.', $object_type);
             $xmlhead = substr($xml, 0, 512);
 
             // detect old Kolab 2.0 format
-            if (strpos($xmlhead, '<' . $xmltype) !== false && strpos($xmlhead, 'xmlns=') === false)
+            if (strpos($xmlhead, '<' . $xmltype) !== false && strpos($xmlhead, 'xmlns=') === false) {
                 $format_version = '2.0';
-            else
-                $format_version = '3.0'; // assume 3.0
+            } else {
+                $format_version = '3.0';
+            } // assume 3.0
         }
 
         // get Kolab format handler for the given type
         $format = kolab_format::factory($object_type, $format_version);
 
-        if (is_a($format, 'PEAR_Error'))
+        if (is_a($format, 'PEAR_Error')) {
             return false;
+        }
 
         // load Kolab object from XML part
         $format->load($xml);
 
         if ($format->is_valid()) {
-            $object = $format->to_array(array('_attachments' => $attachments));
+            $object = $format->to_array('_attachments' => $attachments);
             $object'_type'      = $object_type;
             $object'_msguid'    = $msguid;
             $object'_mailbox'   = $this->name;
@@ -569,19 +580,19 @@
             $object'_size'      = strlen($xml);
 
             return $object;
-        }
-        else {
+        } else {
             // try to extract object UID from XML block
-            if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m))
+            if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m)) {
                 $msgadd = " UID = " . trim(strip_tags($m1));
+            }
 
-            rcube::raise_error(array(
+            rcube::raise_error(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__,
                 'line' => __LINE__,
-                'message' => "Could not parse Kolab object data in message $msguid ($this->name)." . $msgadd,
-            ), true);
+                'message' => "Could not parse Kolab object data in message $msguid ($this->name)." . ($msgadd ?? ''),
+            , true);
 
             self::save_user_xml("$msguid.xml", $xml);
         }
@@ -604,8 +615,9 @@
             return false;
         }
 
-        if (!$type)
+        if (!$type) {
             $type = $this->type;
+        }
 
         // copy attachments from old message
         $copyfrom = $object'_copyfrom' ?? ($object'_msguid' ?? null);
@@ -619,9 +631,10 @@
                     unset($object'_attachments'$key);
                 }
                 // load photo.attachment from old Kolab2 format to be directly embedded in xcard block
-                else if ($type == 'contact' && ($key == 'photo.attachment' || $key == 'kolab-picture.png') && $att'id') {
-                    if (!isset($object'photo'))
+                elseif ($type == 'contact' && ($key == 'photo.attachment' || $key == 'kolab-picture.png') && $att'id') {
+                    if (!isset($object'photo')) {
                         $object'photo' = $this->get_attachment($copyfrom, $att'id', $object'_mailbox');
+                    }
                     unset($object'_attachments'$key);
                 }
             }
@@ -630,10 +643,10 @@
         // save contact photo to attachment for Kolab2 format
         if (kolab_storage::$version == '2.0' && $object'photo') {
             $attkey = 'kolab-picture.png';  // this file name is hard-coded in libkolab/kolabformatV2/contact.cpp
-            $object'_attachments'$attkey = array(
-                'mimetype'=> rcube_mime::image_content_type($object'photo'),
+            $object'_attachments'$attkey = 
+                'mimetype' => rcube_mime::image_content_type($object'photo'),
                 'content' => preg_match('!^a-z0-9/=+-!i', $object'photo') ? $object'photo' : base64_decode($object'photo'),
-            );
+            ;
         }
 
         // process attachments
@@ -655,12 +668,10 @@
                             // here nor in rcube_imap_generic before IMAP APPEND
                             $stat = fstat($attachment'content');
                             $attachment'size' = $stat ? $stat'size' : 0;
-                        }
-                        else {
+                        } else {
                             $attachment'size' = strlen($attachment'content');
                         }
-                    }
-                    else if (!empty($attachment'path')) {
+                    } elseif (!empty($attachment'path')) {
                         $attachment'size' = filesize($attachment'path');
                     }
                     $object'_attachments'$key = $attachment;
@@ -671,7 +682,9 @@
                     // derrive content-id from attachment file name
                     $ext = preg_match('/(\.a-z0-9{1,6})$/i', $attachment'name', $m) ? $m1 : null;
                     $basename = preg_replace('/^a-z0-9_.-/i', '', basename($attachment'name', $ext));  // to 7bit ascii
-                    if (!$basename) $basename = 'noname';
+                    if (!$basename) {
+                        $basename = 'noname';
+                    }
                     $cid = $basename . '.' . microtime(true) . $key . $ext;
 
                     $object'_attachments'$cid = $attachment;
@@ -689,6 +702,7 @@
         // allow configuration to workaround bug in Cyrus < 2.4.17
         $rcmail = rcube::get_instance();
         $binary = $type == 'file' && !$rcmail->config->get('kolab_binary_disable') && $this->imap->get_capability('BINARY');
+        $result = false;
 
         // generate and save object message
         if ($raw_msg = $this->build_message($object, $type, $binary, $body_file)) {
@@ -731,8 +745,8 @@
      * Save recurrence exceptions as individual objects.
      * The Kolab v2 format doesn't allow us to save fully embedded exception objects.
      *
-     * @param array Hash array with event properties
-     * @param string Object type
+     * @param array  $object Hash array with event properties
+     * @param string $type   Object type
      */
     private function save_recurrence_exceptions(&$object, $type = null)
     {
@@ -765,10 +779,10 @@
                     $untildate->sub(new DateInterval('P1D'));
                     $object'recurrence''UNTIL' = $untildate;
                     unset($object'recurrence''COUNT');
-                }
-                else {
-                    if (!$exdates$exception'start'->format('Y-m-d'))
+                } else {
+                    if (empty($exdates$exception'start'->format('Y-m-d'))) {
                         $object'recurrence''EXDATE' = clone $exception'start';
+                    }
                     unset($exception'recurrence');
                 }
 
@@ -793,10 +807,10 @@
     /**
      * Delete the specified object from this folder.
      *
-     * @param  mixed   $object  The Kolab object to delete or object UID
-     * @param  boolean $expunge Should the folder be expunged?
+     * @param mixed $object  The Kolab object to delete or object UID
+     * @param bool  $expunge Should the folder be expunged?
      *
-     * @return boolean True if successful, false on error
+     * @return bool True if successful, false on error
      */
     public function delete($object, $expunge = true)
     {
@@ -811,8 +825,7 @@
 
         if ($msguid && $expunge) {
             $success = $this->imap->delete_message($msguid, $this->name);
-        }
-        else if ($msguid) {
+        } elseif ($msguid) {
             $success = $this->imap->set_flag($msguid, 'DELETED', $this->name);
         }
 
@@ -845,7 +858,8 @@
     /**
      * Restore a previously deleted object
      *
-     * @param string Object UID
+     * @param string $uid Object UID
+     *
      * @return mixed Message UID on success, false on error
      */
     public function undelete($uid)
@@ -870,9 +884,10 @@
     /**
      * Move a Kolab object message to another IMAP folder
      *
-     * @param string Object UID
-     * @param string IMAP folder to move object to
-     * @return boolean True on success, false on failure
+     * @param string                      $uid           Object UID
+     * @param string|kolab_storage_folder $target_folder IMAP folder to move object to
+     *
+     * @return bool True on success, false on failure
      */
     public function move($uid, $target_folder)
     {
@@ -880,8 +895,9 @@
             return false;
         }
 
-        if (is_string($target_folder))
+        if (is_string($target_folder)) {
             $target_folder = kolab_storage::get_folder($target_folder);
+        }
 
         if ($msguid = $this->cache->uid2msguid($uid)) {
             $this->cache->imap_mode(true);
@@ -892,13 +908,12 @@
                 $new_uid = ($copyuid = $this->imap->conn->data'COPYUID') ? $copyuid1 : null;
                 $this->cache->move($msguid, $uid, $target_folder, $new_uid);
                 return true;
-            }
-            else {
-                rcube::raise_error(array(
+            } else {
+                rcube::raise_error(
                     'code' => 600, 'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(),
-                ), true);
+                    'message' => "Failed to move message $msguid to {$target_folder->name}: " . $this->imap->get_error_str(),
+                , true);
             }
         }
 
@@ -920,17 +935,20 @@
     {
         // load old object to preserve data we don't understand/process
         $format = null;
-        if (is_object($object'_formatobj' ?? null))
+        if (is_object($object'_formatobj' ?? null)) {
             $format = $object'_formatobj';
-        else if (!empty($object'_msguid') && ($old = $this->cache->get($object'_msguid', $type, $object'_mailbox' ?? null)))
+        } elseif (!empty($object'_msguid') && ($old = $this->cache->get($object'_msguid', $type, $object'_mailbox' ?? null))) {
             $format = $old'_formatobj' ?? null;
+        }
 
         // create new kolab_format instance
-        if (!$format)
+        if (!$format) {
             $format = kolab_format::factory($type, kolab_storage::$version);
+        }
 
-        if (PEAR::isError($format))
+        if (PEAR::isError($format)) {
             return false;
+        }
 
         $format->set($object);
         $xml = $format->write(kolab_storage::$version);
@@ -943,10 +961,12 @@
 
         $mime     = new Mail_mime("\r\n");
         $rcmail   = rcube::get_instance();
-        $headers  = array();
-        $files    = array();
+        $headers  = ;
+        $files    = ;
         $part_id  = 1;
         $encoding = $binary ? 'binary' : 'base64';
+        $temp_dir = unslashify($rcmail->config->get('temp_dir'));
+        $marker   = null;
 
         if ($user_email = $rcmail->get_user_email()) {
             $headers'From' = $user_email;
@@ -956,13 +976,13 @@
         $headers'X-Kolab-Type' = kolab_format::KTYPE_PREFIX . $type;
         $headers'X-Kolab-Mime-Version' = kolab_storage::$version;
         $headers'Subject' = $object'uid';
-//        $headers'Message-ID' = $rcmail->gen_message_id();
+        //        $headers'Message-ID' = $rcmail->gen_message_id();
         $headers'User-Agent' = $rcmail->config->get('useragent');
 
         // Check if we have enough memory to handle the message in it
         // It's faster than using files, so we'll do this if we only can
         if (!empty($object'_attachments') && ($mem_limit = parse_bytes(ini_get('memory_limit'))) > 0) {
-            $memory = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
+            $memory = function_exists('memory_get_usage') ? memory_get_usage() : 16 * 1024 * 1024; // safe value: 16MB
 
             foreach ($object'_attachments' as $attachment) {
                 $memory += $attachment'size';
@@ -970,9 +990,8 @@
 
             // 1.33 is for base64, we need at least 4x more memory than the message size
             if ($memory * ($binary ? 1 : 1.33) * 4 > $mem_limit) {
-                $marker   = '%%%~~~' . md5(microtime(true) . $memory) . '~~~%%%';
-                $is_file  = true;
-                $temp_dir = unslashify($rcmail->config->get('temp_dir'));
+                $marker  = '%%%~~~' . md5(microtime(true) . $memory) . '~~~%%%';
+                $is_file = true;
                 $mime->setParam('delay_file_io', true);
             }
         }
@@ -987,7 +1006,8 @@
         // when APPENDing from temp file
         $xml = preg_replace('/\r?\n/', "\r\n", $xml);
 
-        $mime->addAttachment($xml,  // file
+        $mime->addAttachment(
+            $xml,  // file
             $ctype,                 // content-type
             'kolab.xml',            // filename
             false,                  // is_file
@@ -997,28 +1017,27 @@
         );
         $part_id++;
 
-        $is_file = false;
+        $is_file = false; // FIXME: ???
 
         // save object attachments as separate parts
         foreach ((array)($object'_attachments' ?? ) as $key => $att) {
             if (empty($att'content') && !empty($att'id')) {
                 // @TODO: use IMAP CATENATE to skip attachment fetch+push operation
                 $msguid = !empty($object'_copyfrom') ? $object'_copyfrom' : (!empty($object'_msguid') ? $object'_msguid' : $object'uid');
+                // @phpstan-ignore-next-line
                 if ($is_file) {
                     $att'path' = tempnam($temp_dir, 'rcmAttmnt');
                     if (($fp = fopen($att'path', 'w')) && $this->get_attachment($msguid, $att'id', $object'_mailbox', false, $fp, true)) {
                         fclose($fp);
-                    }
-                    else {
+                    } else {
                         return false;
                     }
-                }
-                else {
+                } else {
                     $att'content' = $this->get_attachment($msguid, $att'id', $object'_mailbox', false, null, true);
                 }
             }
 
-            $headers = array('Content-ID' => Mail_mimePart::encodeHeader('Content-ID', '<' . $key . '>', RCUBE_CHARSET, 'quoted-printable'));
+            $headers = 'Content-ID' => Mail_mimePart::encodeHeader('Content-ID', '<' . $key . '>', RCUBE_CHARSET, 'quoted-printable');
             $name = !empty($att'name') ? $att'name' : $key;
 
             // To store binary files we can use faster method
@@ -1026,20 +1045,19 @@
             // directly to IMAP, see rcube_imap_generic::append().
             // I.e. use file handles where possible
             if (!empty($att'path')) {
+                // @phpstan-ignore-next-line
                 if ($is_file && $binary) {
                     $files = fopen($att'path', 'r');
                     $mime->addAttachment($marker, $att'mimetype', $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-                else {
+                } else {
                     $mime->addAttachment($att'path', $att'mimetype', $name, true, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
                 }
-            }
-            else {
+            } else {
+                // @phpstan-ignore-next-line
                 if (is_resource($att'content') && $is_file && $binary) {
                     $files = $att'content';
                     $mime->addAttachment($marker, $att'mimetype', $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-                else {
+                } else {
                     if (is_resource($att'content')) {
                         @rewind($att'content');
                         $att'content' = stream_get_contents($att'content');
@@ -1051,15 +1069,17 @@
             $object'_attachments'$key'id' = ++$part_id;
         }
 
+        // @phpstan-ignore-next-line
         if (!$is_file || !empty($files)) {
             $message = $mime->getMessage();
         }
 
         // parse message and build message array with
         // attachment file pointers in place of file markers
+        // @phpstan-ignore-next-line
         if (!empty($files)) {
             $message = explode($marker, $message);
-            $tmp     = array();
+            $tmp     = ;
 
             foreach ($message as $msg_part) {
                 $tmp = $msg_part;
@@ -1070,19 +1090,23 @@
             $message = $tmp;
         }
         // write complete message body into temp file
-        else if ($is_file) {
+        // @phpstan-ignore-next-line
+        elseif ($is_file) {
             // use common temp dir
             $body_file = tempnam($temp_dir, 'rcmMsg');
 
             if (PEAR::isError($mime_result = $mime->saveMessageBody($body_file))) {
-                rcube::raise_error(array('code' => 650, 'type' => 'php',
+                rcube::raise_error(
+                    'code' => 650, 'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not create message: ".$mime_result->getMessage()),
-                    true, false);
+                    'message' => "Could not create message: " . $mime_result->getMessage(),
+                    true,
+                    false
+                );
                 return false;
             }
 
-            $message = array(trim($mime->txtHeaders()) . "\r\n\r\n", fopen($body_file, 'r'));
+            $message = trim($mime->txtHeaders()) . "\r\n\r\n", fopen($body_file, 'r');
         }
 
         return $message;
@@ -1093,7 +1117,7 @@
      * folder. This is currently only required for handling free/busy
      * information with Kolab.
      *
-     * @return boolean|PEAR_Error True if successfull.
+     * @return bool|PEAR_Error True if successfull.
      */
     public function trigger()
     {
@@ -1102,25 +1126,27 @@
         $url = kolab_storage::get_freebusy_server();
 
         switch ($this->type) {
-        case 'event':
-            if ($url && $this->get_namespace() == 'personal') {
-                $result = $this->trigger_url(
-                    sprintf('%s/trigger/%s/%s.pfb',
-                        $url,
-                        urlencode($owner),
-                        urlencode($this->imap->mod_folder($this->name))
-                    ),
-                    $this->imap->options'user',
-                    $this->imap->options'password'
-                );
-            }
-            break;
+            case 'event':
+                if ($url && $this->get_namespace() == 'personal') {
+                    $result = $this->trigger_url(
+                        sprintf(
+                            '%s/trigger/%s/%s.pfb',
+                            $url,
+                            urlencode($owner),
+                            urlencode($this->imap->mod_folder($this->name))
+                        ),
+                        $this->imap->options'user',
+                        $this->imap->options'password'
+                    );
+                }
+                break;
 
-        default:
-            return true;
+            default:
+                return true;
         }
 
         if ($result instanceof PEAR_Error) {
+            // @phpstan-ignore-next-line
             return PEAR::raiseError(
                 sprintf("Failed triggering folder %s. Error was: %s", $this->name, $result->getMessage())
             );
@@ -1132,10 +1158,11 @@
     /**
      * Triggers a URL.
      *
-     * @param string $url          The URL to be triggered.
-     * @param string $auth_user    Username to authenticate with
-     * @param string $auth_passwd  Password for basic auth
-     * @return boolean|PEAR_Error  True if successfull.
+     * @param string $url         The URL to be triggered.
+     * @param string $auth_user   Username to authenticate with
+     * @param string $auth_passwd Password for basic auth
+     *
+     * @return bool|PEAR_Error True if successfull.
      */
     private function trigger_url($url, $auth_user = null, $auth_passwd = null)
     {
@@ -1143,13 +1170,14 @@
             $request = libkolab::http_request($url);
 
             // set authentication credentials
-            if ($auth_user && $auth_passwd)
+            if ($auth_user && $auth_passwd) {
                 $request->setAuth($auth_user, $auth_passwd);
+            }
 
             $result = $request->send();
             // rcube::write_log('trigger', $result->getBody());
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
+            // @phpstan-ignore-next-line
             return PEAR::raiseError($e->getMessage());
         }

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_folder_api.php Changed

@@ -48,7 +48,7 @@
 
     /**
      * Is this folder set to be the default for its type
-     * @var boolean
+     * @var bool
      */
     public $default = false;
 
@@ -56,7 +56,7 @@
      * List of direct child folders
      * @var array
      */
-    public $children = array();
+    public $children = ;
 
     /**
      * Name of the parent folder
@@ -77,40 +77,42 @@
      */
     protected function __construct($name)
     {
-      $this->name = $name;
-      $this->id   = kolab_storage::folder_id($name);
-      $this->imap = rcube::get_instance()->get_storage();
+        $this->name = $name;
+        $this->id   = kolab_storage::folder_id($name);
+        $this->imap = rcube::get_instance()->get_storage();
     }
 
 
     /**
      * Returns the owner of the folder.
      *
-     * @param boolean  Return a fully qualified owner name (i.e. including domain for shared folders)
-     * @return string  The owner of this folder.
+     * @param bool $fully_qualified Return a fully qualified owner name (i.e. including domain for shared folders)
+     *
+     * @return string The owner of this folder.
      */
     public function get_owner($fully_qualified = false)
     {
         // return cached value
-        if (isset($this->owner))
+        if (isset($this->owner)) {
             return $this->owner;
+        }
 
         $info = $this->get_folder_info();
         $rcmail = rcube::get_instance();
 
         switch ($info'namespace') {
-        case 'personal':
-            $this->owner = $rcmail->get_user_name();
-            break;
-
-        case 'shared':
-            $this->owner = 'anonymous';
-            break;
-
-        default:
-            list($prefix, $this->owner) = explode($this->imap->get_hierarchy_delimiter(), $info'name');
-            $fully_qualified = true;  // enforce email addresses (backwards compatibility)
-            break;
+            case 'personal':
+                $this->owner = $rcmail->get_user_name();
+                break;
+
+            case 'shared':
+                $this->owner = 'anonymous';
+                break;
+
+            default:
+                $prefix, $this->owner = explode($this->imap->get_hierarchy_delimiter(), $info'name');
+                $fully_qualified = true;  // enforce email addresses (backwards compatibility)
+                break;
         }
 
         if ($fully_qualified && strpos($this->owner, '@') === false) {
@@ -134,8 +136,9 @@
      */
     public function get_namespace()
     {
-        if (!isset($this->namespace))
+        if (!isset($this->namespace)) {
             $this->namespace = $this->imap->folder_namespace($this->name);
+        }
 
         return $this->namespace;
     }
@@ -175,11 +178,11 @@
         array_pop($path);
 
         // don't list top-level namespace folder
-        if (count($path) == 1 && in_array($this->get_namespace(), array('other', 'shared'))) {
-            $path = array();
+        if (count($path) == 1 && in_array($this->get_namespace(), 'other', 'shared')) {
+            $path = ;
         }
 
-        return join($delim, $path);
+        return implode($delim, $path);
     }
 
     /**
@@ -192,33 +195,34 @@
     {
         $info = $this->get_folder_info();
         $owner = $this->get_owner();
-        list($user, $domain) = explode('@', $owner);
+        $user, $domain = explode('@', $owner);
 
         switch ($info'namespace') {
-        case 'personal':
-            return sprintf('user/%s/%s@%s', $user, $this->name, $domain);
-
-        case 'shared':
-            $ns = $this->imap->get_namespace('shared');
-            $prefix = is_array($ns) ? $ns00 : '';
-            list(, $domain) = explode('@', rcube::get_instance()->get_user_name());
-            return substr($this->name, strlen($prefix)) . '@' . $domain;
-
-        default:
-            $ns = $this->imap->get_namespace('other');
-            $prefix = is_array($ns) ? $ns00 : '';
-            list($user, $folder) = explode($this->imap->get_hierarchy_delimiter(), substr($info'name', strlen($prefix)), 2);
-            if (strpos($user, '@')) {
-                list($user, $domain) = explode('@', $user);
-            }
-            return sprintf('user/%s/%s@%s', $user, $folder, $domain);
+            case 'personal':
+                return sprintf('user/%s/%s@%s', $user, $this->name, $domain);
+
+            case 'shared':
+                $ns = $this->imap->get_namespace('shared');
+                $prefix = is_array($ns) ? $ns00 : '';
+                , $domain = explode('@', rcube::get_instance()->get_user_name());
+                return substr($this->name, strlen($prefix)) . '@' . $domain;
+
+            default:
+                $ns = $this->imap->get_namespace('other');
+                $prefix = is_array($ns) ? $ns00 : '';
+                $user, $folder = explode($this->imap->get_hierarchy_delimiter(), substr($info'name', strlen($prefix)), 2);
+                if (strpos($user, '@')) {
+                    $user, $domain = explode('@', $user);
+                }
+                return sprintf('user/%s/%s@%s', $user, $folder, $domain);
         }
     }
 
     /**
      * Get the color value stored in metadata
      *
-     * @param string Default color value to return if not set
+     * @param string $default Default color value to return if not set
+     *
      * @return mixed Color value from IMAP metadata or $default is not set
      */
     public function get_color($default = null)
@@ -250,8 +254,9 @@
     /**
      * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
      *
-     * @param array  $entries Entry-value array (use NULL value as NIL)
-     * @return boolean True on success, False on failure
+     * @param array $entries Entry-value array (use NULL value as NIL)
+     *
+     * @return bool True on success, False on failure
      */
     public function set_metadata($entries)
     {
@@ -264,8 +269,9 @@
      */
     public function get_folder_info()
     {
-        if (!isset($this->info))
+        if (!isset($this->info)) {
             $this->info = $this->imap->folder_info($this->name);
+        }
 
         return $this->info;
     }
@@ -275,8 +281,9 @@
      */
     public function get_imap_data()
     {
-        if (!isset($this->idata))
+        if (!isset($this->idata)) {
             $this->idata = $this->imap->folder_data($this->name);
+        }
 
         return $this->idata;
     }
@@ -306,27 +313,28 @@
     {
         $rights = $this->info'rights';
 
-        if (!is_array($rights))
+        if (!is_array($rights)) {
             $rights = $this->imap->my_rights($this->name);
+        }
 
-        return join('', (array)$rights);
+        return implode('', (array)$rights);
     }
 
     /**
      * Helper method to extract folder UID metadata
      *
-     * @return string Folder's UID
+     * @return string|null Folder's UID
      */
     public function get_uid()
     {
         // To be implemented by extending classes
-        return false;
+        return null;
     }
 
     /**
      * Check activation status of this folder
      *
-     * @return boolean True if enabled, false if not
+     * @return bool True if enabled, false if not
      */
     public function is_active()
     {
@@ -336,9 +344,9 @@
     /**
      * Change activation status of this folder
      *
-     * @param boolean The desired subscription status: true = active, false = not active
+     * @param bool $active The desired subscription status: true = active, false = not active
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function activate($active)
     {
@@ -348,7 +356,7 @@
     /**
      * Check subscription status of this folder
      *
-     * @return boolean True if subscribed, false if not
+     * @return bool True if subscribed, false if not
      */
     public function is_subscribed()
     {
@@ -358,9 +366,9 @@
     /**
      * Change subscription status of this folder
      *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     * @param bool $subscribed The desired subscription status: true = subscribed, false = not subscribed
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function subscribe($subscribed)
     {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_folder_user.php Changed

@@ -35,9 +35,8 @@
 
         if (!empty($ldaprec)) {
             $this->ldaprec = $ldaprec;
-        }
-        else {
-            $this->ldaprec = kolab_storage::folder_id2user(parent::get_foldername($this->name));
+        } else {
+            $this->ldaprec = kolab_storage::folder_id2user(parent::get_foldername());
             if (!empty($this->ldaprec)) {
                 $this->ldaprec'kolabtargetfolder' = $name;
             }
@@ -79,7 +78,7 @@
      * Check subscription status of this folder.
      * Subscription of a virtual user folder depends on the subscriptions of subfolders.
      *
-     * @return boolean True if subscribed, false if not
+     * @return bool True if subscribed, false if not
      */
     public function is_subscribed()
     {
@@ -103,9 +102,9 @@
     /**
      * Change subscription status of this folder
      *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     * @param bool $subscribed The desired subscription status: true = subscribed, false = not subscribed
      *
-     * @return True on success, false on error
+     * @return bool True on success, false on error
      */
     public function subscribe($subscribed)
     {

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_folder_virtual.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_utils.php Changed

@@ -25,16 +25,16 @@
 
 class kolab_utils
 {
-    public static function folder_form($form, $folder, $domain, $hidden_fields = array(), $no_acl = false)
+    public static function folder_form($form, $folder, $domain, $hidden_fields = , $no_acl = false)
     {
-        $rcmail = rcmail::get_instance();
+        $rcmail = rcube::get_instance();
 
         // add folder ACL tab
         if (!$no_acl && is_string($folder) && strlen($folder)) {
-            $form'sharing' = array(
+            $form'sharing' = 
                 'name'    => rcube::Q($rcmail->gettext('libkolab.tabsharing')),
                 'content' => self::folder_acl_form($folder),
-            );
+            ;
         }
 
         $form_html = '';
@@ -49,7 +49,7 @@
         // create form output
         foreach ($form as $tab) {
             if (isset($tab'fields') && is_array($tab'fields') && empty($tab'content')) {
-                $table = new html_table(array('cols' => 2, 'class' => 'propform'));
+                $table = new html_table('cols' => 2, 'class' => 'propform');
                 foreach ($tab'fields' as $col => $colprop) {
                     $label = !empty($colprop'label') ? $colprop'label' : $rcmail->gettext("$domain.$col");
 
@@ -57,8 +57,7 @@
                     $table->add(null, $colprop'value');
                 }
                 $content = $table->show();
-            }
-            else {
+            } else {
                 $content = $tab'content';
             }
 
@@ -75,23 +74,23 @@
      */
     public static function folder_acl_form($folder)
     {
-        $rcmail  = rcmail::get_instance();
+        $rcmail  = rcube::get_instance();
         $storage = $rcmail->get_storage();
         $options = $storage->folder_info($folder);
 
         $rcmail->plugins->load_plugin('acl', true);
 
         // get sharing UI from acl plugin
-        $acl = $rcmail->plugins->exec_hook('folder_form', array(
-                'form'    => array(),
+        $acl = $rcmail->plugins->exec_hook('folder_form', 
+                'form'    => ,
                 'options' => $options,
-                'name'    => $folder
-        ));
+                'name'    => $folder,
+        );
 
         if (!empty($acl'form''sharing''content')) {
             return $acl'form''sharing''content';
         }
-        
+
         return html::div('hint', $rcmail->gettext('libkolab.aclnorights'));
     }
 }

roundcubemail-1.5.tar.gz/plugins/libkolab/libkolab.php Changed

@@ -27,8 +27,8 @@
 
 class libkolab extends rcube_plugin
 {
-    static $http_requests = array();
-    static $bonnie_api    = false;
+    public static $http_requests = ;
+    public static $bonnie_api    = false;
 
     /**
      * Required startup method of a Roundcube plugin
@@ -43,18 +43,17 @@
         $include_path = $this->home . '/lib' . PATH_SEPARATOR . ini_get('include_path');
         set_include_path($include_path);
 
-        $this->add_hook('storage_init', array($this, 'storage_init'));
-        $this->add_hook('storage_connect', array($this, 'storage_connect'));
-        $this->add_hook('user_delete', array('kolab_storage', 'delete_user_folders'));
+        $this->add_hook('storage_init', $this, 'storage_init');
+        $this->add_hook('storage_connect', $this, 'storage_connect');
+        $this->add_hook('user_delete', 'kolab_storage', 'delete_user_folders');
 
         // For Chwala
-        $this->add_hook('folder_mod', array('kolab_storage', 'folder_mod'));
+        $this->add_hook('folder_mod', 'kolab_storage', 'folder_mod');
 
         $rcmail = rcube::get_instance();
         try {
             kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true);
             kolab_format::$timezone = new DateTimeZone('GMT');
         }
@@ -62,44 +61,49 @@
         $this->add_texts('localization/', false);
 
         if (!empty($rcmail->output->type) && $rcmail->output->type == 'html') {
-            $rcmail->output->add_handler('libkolab.folder_search_form', array($this, 'folder_search_form'));
+            // @phpstan-ignore-next-line
+            $rcmail->output->add_handler('libkolab.folder_search_form', $this, 'folder_search_form');
             $this->include_stylesheet($this->local_skin_path() . '/libkolab.css');
         }
 
         // embed scripts and templates for email message audit trail
         if (property_exists($rcmail, 'task') && $rcmail->task == 'mail' && self::get_bonnie_api()) {
-            if ($rcmail->output->type == 'html') {
-                $this->add_hook('render_page', array($this, 'bonnie_render_page'));
+            if (!empty($rcmail->output->type) && $rcmail->output->type == 'html') {
+                $this->add_hook('render_page', $this, 'bonnie_render_page');
                 $this->include_script('libkolab.js');
 
                 // add 'Show history' item to message menu
-                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
-                    $this->api->output->button(array(
-                        'command'  => 'kolab-mail-history',
-                        'label'    => 'libkolab.showhistory',
-                        'type'     => 'link',
-                        'classact' => 'icon history active',
-                        'class'    => 'icon history disabled',
-                        'innerclass' => 'icon history',
-                    ))),
-                    'messagemenu');
+                $this->api->add_content(
+                    html::tag(
+                        'li',
+                        'role' => 'menuitem',
+                        $this->api->output->button(
+                            'command'  => 'kolab-mail-history',
+                            'label'    => 'libkolab.showhistory',
+                            'type'     => 'link',
+                            'classact' => 'icon history active',
+                            'class'    => 'icon history disabled',
+                            'innerclass' => 'icon history',
+                        )
+                    ),
+                    'messagemenu'
+                );
             }
 
-            $this->register_action('plugin.message-changelog', array($this, 'message_changelog'));
+            $this->register_action('plugin.message-changelog', $this, 'message_changelog');
         }
     }
 
     /**
      * Hook into IMAP FETCH HEADER.FIELDS command and request Kolab-specific headers
      */
-    function storage_init($p)
+    public function storage_init($p)
     {
         $kolab_headers = 'X-KOLAB-TYPE X-KOLAB-MIME-VERSION MESSAGE-ID';
 
         if (!empty($p'fetch_headers')) {
             $p'fetch_headers' .= ' ' . $kolab_headers;
-        }
-        else {
+        } else {
             $p'fetch_headers' = $kolab_headers;
         }
 
@@ -109,12 +113,12 @@
     /**
      * Hook into IMAP connection to replace client identity
      */
-    function storage_connect($p)
+    public function storage_connect($p)
     {
         $client_name = 'Roundcube/Kolab';
 
         if (empty($p'ident')) {
-            $p'ident' = array(
+            $p'ident' = 
                 'name'    => $client_name,
                 'version' => RCUBE_VERSION,
 /*
@@ -122,9 +126,8 @@
                 'os'      => PHP_OS,
                 'command' => $_SERVER'REQUEST_URI',
 */
-            );
-        }
-        else {
+            ;
+        } else {
             $p'ident''name' = $client_name;
         }
 
@@ -149,13 +152,14 @@
     /**
      * Hook to append the message history dialog template to the mail view
      */
-    function bonnie_render_page($p)
+    public function bonnie_render_page($p)
     {
         if (($p'template' === 'mail' || $p'template' === 'message') && !$p'kolab-audittrail') {
             // append a template for the audit trail dialog
             $this->api->output->add_footer(
-                html::div(array('id' => 'mailmessagehistory',  'class' => 'uidialog', 'aria-hidden' => 'true', 'style' => 'display:none'),
-                    self::object_changelog_table(array('class' => 'records-table changelog-table'))
+                html::div(
+                    'id' => 'mailmessagehistory',  'class' => 'uidialog', 'aria-hidden' => 'true', 'style' => 'display:none',
+                    self::object_changelog_table('class' => 'records-table changelog-table')
                 )
             );
             $this->api->output->set_env('kolab_audit_trail', true);
@@ -174,7 +178,7 @@
             return false;
         }
 
-        $rcmail = rcube::get_instance();
+        $rcmail = rcmail::get_instance();
         $msguid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST, true);
         $mailbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
 
@@ -182,18 +186,17 @@
         if (is_array($result)) {
             if (is_array($result'changes')) {
                 $dtformat = $rcmail->config->get('date_format') . ' ' . $rcmail->config->get('time_format');
-                array_walk($result'changes', function(&$change) use ($dtformat, $rcmail) {
-                  if ($change'date') {
-                      $dt = rcube_utils::anytodatetime($change'date');
-                      if ($dt instanceof DateTimeInterface) {
-                          $change'date' = $rcmail->format_date($dt, $dtformat);
-                      }
-                  }
+                array_walk($result'changes', function (&$change) use ($dtformat, $rcmail) {
+                    if ($change'date') {
+                        $dt = rcube_utils::anytodatetime($change'date');
+                        if ($dt instanceof DateTimeInterface) {
+                            $change'date' = $rcmail->format_date($dt, $dtformat);
+                        }
+                    }
                 });
             }
             $this->api->output->command('plugin.message_render_changelog', $result'changes');
-        }
-        else {
+        } else {
             $this->api->output->command('plugin.message_render_changelog', false);
         }
 
@@ -203,21 +206,21 @@
     /**
      * Wrapper function to load and initalize the HTTP_Request2 Object
      *
-     * @param string|Net_Url2 Request URL
-     * @param string          Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
-     * @param array           Configuration for this Request instance, that will be merged
-     *                        with default configuration
+     * @param string|Net_URL2 $url    Request URL
+     * @param string          $method Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
+     * @param array           $config Configuration for this Request instance, that will be merged
+     *                                with default configuration
      *
      * @return HTTP_Request2 Request object
      */
-    public static function http_request($url = '', $method = 'GET', $config = array())
+    public static function http_request($url = '', $method = 'GET', $config = )
     {
         $rcube       = rcube::get_instance();
         $http_config = (array) $rcube->config->get('kolab_http_request');
 
         // deprecated configuration options
         if (empty($http_config)) {
-            foreach (array('ssl_verify_peer', 'ssl_verify_host') as $option) {
+            foreach ('ssl_verify_peer', 'ssl_verify_host' as $option) {
                 $value = $rcube->config->get('kolab_' . $option, true);
                 if (is_bool($value)) {
                     $http_config$option = $value;
@@ -237,8 +240,7 @@
 
         if (!empty(self::$http_requests$key)) {
             $request = self::$http_requests$key;
-        }
-        else {
+        } else {
             // load HTTP_Request2 (support both composer-installed and system-installed package)
             if (!class_exists('HTTP_Request2')) {
                 require_once 'HTTP/Request2.php';
@@ -247,8 +249,7 @@
             try {
                 $request = new HTTP_Request2();
                 $request->setConfig($http_config);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 rcube::raise_error($e, true, true);
             }
 
@@ -263,8 +264,7 @@
             $request->setBody('');
             $request->setUrl($url);
             $request->setMethod($method);
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             rcube::raise_error($e, true, true);
         }
 
@@ -274,18 +274,18 @@
     /**
      * Table oultine for object changelog display
      */
-    public static function object_changelog_table($attrib = array())
+    public static function object_changelog_table($attrib = )
     {
-        $rcube = rcube::get_instance();
-        $attrib += array('domain' => 'libkolab');
-
-        $table = new html_table(array('cols' => 5, 'border' => 0, 'cellspacing' => 0));
-        $table->add_header('diff',      '');
-        $table->add_header('revision',  $rcube->gettext('revision', $attrib'domain'));
-        $table->add_header('date',      $rcube->gettext('date', $attrib'domain'));
-        $table->add_header('user',      $rcube->gettext('user', $attrib'domain'));
+        $rcube = rcmail::get_instance();
+        $attrib += 'domain' => 'libkolab';
+
+        $table = new html_table('cols' => 5, 'border' => 0, 'cellspacing' => 0);
+        $table->add_header('diff', '');
+        $table->add_header('revision', $rcube->gettext('revision', $attrib'domain'));
+        $table->add_header('date', $rcube->gettext('date', $attrib'domain'));
+        $table->add_header('user', $rcube->gettext('user', $attrib'domain'));
         $table->add_header('operation', $rcube->gettext('operation', $attrib'domain'));
-        $table->add_header('actions',   '&nbsp;');
+        $table->add_header('actions', '&nbsp;');
 
         $rcube->output->add_label(
             'libkolab.showrevision',
@@ -311,17 +311,17 @@
     {
         // auto-detect text/html format
         if ($is_html === null) {
-            $from_html = (preg_match('/<(html|body)(\s+a-z|>)/', $from, $m) && strpos($from, '</'.$m1.'>') > 0);
-            $to_html   = (preg_match('/<(html|body)(\s+a-z|>)/', $to, $m) && strpos($to, '</'.$m1.'>') > 0);
+            $from_html = (preg_match('/<(html|body)(\s+a-z|>)/', $from, $m) && strpos($from, '</' . $m1 . '>') > 0);
+            $to_html   = (preg_match('/<(html|body)(\s+a-z|>)/', $to, $m) && strpos($to, '</' . $m1 . '>') > 0);
             $is_html   = $from_html || $to_html;
 
             // ensure both parts are of the same format
             if ($is_html && !$from_html) {
-                $converter = new rcube_text2html($from, false, array('wrap' => true));
+                $converter = new rcube_text2html($from, false, 'wrap' => true);
                 $from = $converter->get_html();
             }
             if ($is_html && !$to_html) {
-                $converter = new rcube_text2html($to, false, array('wrap' => true));
+                $converter = new rcube_text2html($to, false, 'wrap' => true);
                 $to = $converter->get_html();
             }
         }
@@ -341,8 +341,7 @@
 
             // remove empty inserts (from tables)
             return preg_replace('!<ins class="diff\w+">\s*</ins>!Uims', '', $diffhtml);
-        }
-        else {
+        } else {
             include_once __dir__ . '/vendor/finediff.php';
 
             $diff = new FineDiff($from, $to, FineDiff::$wordGranularity);
@@ -353,7 +352,8 @@
     /**
      * Return a date() format string to render identifiers for recurrence instances
      *
-     * @param array Hash array with event properties
+     * @param array $event Hash array with event properties
+     *
      * @return string Format string
      */
     public static function recurrence_id_format($event)
@@ -370,14 +370,14 @@
      */
     public function folder_search_form($attrib)
     {
-        $rcmail = rcube::get_instance();
-        $attrib += array(
+        $rcmail = rcmail::get_instance();
+        $attrib += 
             'gui-object'    => false,
             'wrapper'       => true,
             'form-name'     => 'foldersearchform',
             'command'       => 'non-extsing-command',
             'reset-command' => 'non-existing-command',
-        );
+        ;
 
         if (($attrib'label-domain' ?? null) && !strpos($attrib'buttontitle', '.')) {
             $attrib'buttontitle' = $attrib'label-domain' . '.' . $attrib'buttontitle';

roundcubemail-1.5.tar.gz/plugins/libkolab/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/tests/KolabDateRecurrenceTest.php Changed

@@ -23,9 +23,9 @@
 
 class KolabDateRecurrenceTest extends PHPUnit\Framework\TestCase
 {
-    function setUp(): void
+    public function setUp(): void
     {
-        $rcube = rcmail::get_instance();
+        $rcube = rcube::get_instance();
         $rcube->plugins->load_plugin('libkolab', true, true);
         $rcube->plugins->load_plugin('libcalendaring', true, true);
     }
@@ -33,14 +33,14 @@
     /**
      * Data for test_end()
      */
-    function data_end()
+    public function data_end()
     {
         return 
             // non-recurring
             
                 
                     'recurrence' => ,
-                    'start' => new DateTime('2017-08-31 11:00:00')
+                    'start' => new DateTime('2017-08-31 11:00:00'),
                 ,
                 '2117-08-31 11:00:00',                             // expected result
             ,
@@ -48,7 +48,7 @@
             
                 
                     'recurrence' => 'FREQ' => 'DAILY', 'INTERVAL' => '1', 'COUNT' => 2,
-                    'start' => new DateTime('2017-08-31 11:00:00')
+                    'start' => new DateTime('2017-08-31 11:00:00'),
                 ,
                 '2017-09-01 11:00:00',
             ,
@@ -84,159 +84,159 @@
     /**
      * Data for test_first_occurrence()
      */
-    function data_first_occurrence()
+    public function data_first_occurrence()
     {
         // TODO: BYYEARDAY, BYWEEKNO, BYSETPOS, WKST
 
-        return array(
+        return 
             // non-recurring
-            array(
-                array(),                                     // recurrence data
+            
+                ,                                     // recurrence data
                 '2017-08-31 11:00:00',                       // start date
                 '2017-08-31 11:00:00',                       // expected result
-            ),
+            ,
             // daily
-            array(
-                array('FREQ' => 'DAILY', 'INTERVAL' => '1'), // recurrence data
+            
+                'FREQ' => 'DAILY', 'INTERVAL' => '1', // recurrence data
                 '2017-08-31 11:00:00',                       // start date
                 '2017-08-31 11:00:00',                       // expected result
-            ),
+            ,
             // TODO: this one is not supported by the Calendar UI
-            array(
-                array('FREQ' => 'DAILY', 'INTERVAL' => '1', 'BYMONTH' => 1),
+            
+                'FREQ' => 'DAILY', 'INTERVAL' => '1', 'BYMONTH' => 1,
                 '2017-08-31 11:00:00',
                 '2018-01-01 11:00:00',
-            ),
+            ,
             // weekly
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1'),
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-08-31 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-06 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'TH'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'TH',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-08-31 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'FR'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'FR',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-01 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '2'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '2',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-08-31 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '3', 'BYDAY' => 'WE'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '3', 'BYDAY' => 'WE',
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-20 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'COUNT' => 1),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'COUNT' => 1,
                 '2017-08-31 11:00:00', // Thursday
                 '2017-09-06 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'UNTIL' => '2017-09-01'),
+            ,
+            
+                'FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'UNTIL' => '2017-09-01',
                 '2017-08-31 11:00:00', // Thursday
                 '',
-            ),
+            ,
             // monthly
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1'),
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1',
                 '2017-09-08 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9',
                 '2017-08-31 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9',
                 '2017-09-08 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '1WE'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '1WE',
                 '2017-08-16 11:00:00',
                 '2017-09-06 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '-1WE'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '-1WE',
                 '2017-08-16 11:00:00',
                 '2017-08-30 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '2',
                 '2017-09-08 11:00:00',
                 '2017-09-08 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2', 'BYMONTHDAY' => '8'),
+            ,
+            
+                'FREQ' => 'MONTHLY', 'INTERVAL' => '2', 'BYMONTHDAY' => '8',
                 '2017-08-31 11:00:00',
                 '2017-09-08 11:00:00', // ??????
-            ),
+            ,
             // yearly
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1'),
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1',
                 '2017-08-16 12:00:00',
                 '2017-08-16 12:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8',
                 '2017-08-16 12:00:00',
                 '2017-08-16 12:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYDAY' => '-1MO'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYDAY' => '-1MO',
                 '2017-08-16 11:00:00',
                 '2017-12-25 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8', 'BYDAY' => '-1MO'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8', 'BYDAY' => '-1MO',
                 '2017-08-16 11:00:00',
                 '2017-08-28 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1', 'BYDAY' => '1MO'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1', 'BYDAY' => '1MO',
                 '2017-08-16 11:00:00',
                 '2018-01-01 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1,9', 'BYDAY' => '1MO'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1,9', 'BYDAY' => '1MO',
                 '2017-08-16 11:00:00',
                 '2017-09-04 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '2'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '2',
                 '2017-08-16 11:00:00',
                 '2017-08-16 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYMONTH' => '8'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYMONTH' => '8',
                 '2017-08-16 11:00:00',
                 '2017-08-16 11:00:00',
-            ),
-            array(
-                array('FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYDAY' => '-1MO'),
+            ,
+            
+                'FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYDAY' => '-1MO',
                 '2017-08-16 11:00:00',
                 '2017-12-25 11:00:00',
-            ),
+            ,
             // on dates (FIXME: do we really expect the first occurrence to be on the start date?)
-            array(
-                array('RDATE' => array (new DateTime('2017-08-10 11:00:00 Europe/Warsaw'))),
+            
+                'RDATE' =>  new DateTime('2017-08-10 11:00:00 Europe/Warsaw'),
                 '2017-08-01 11:00:00',
                 '2017-08-01 11:00:00',
-            ),
-        );
+            ,
+        ;
     }
 
     /**
@@ -244,7 +244,7 @@
      *
      * @dataProvider data_end
      */
-    function test_end($event, $expected)
+    public function test_end($event, $expected)
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -264,7 +264,7 @@
      *
      * @dataProvider data_first_occurrence
      */
-    function test_first_occurrence($recurrence_data, $start, $expected)
+    public function test_first_occurrence($recurrence_data, $start, $expected)
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -275,7 +275,7 @@
             $recurrence_data'UNTIL' = new DateTime($recurrence_data'UNTIL');
         }
 
-        $event  = array('start' => $start, 'recurrence' => $recurrence_data);
+        $event  = 'start' => $start, 'recurrence' => $recurrence_data;
         $object = kolab_format::factory('event', 3.0);
         $object->set($event);
 
@@ -290,7 +290,7 @@
      *
      * @dataProvider data_first_occurrence
      */
-    function test_first_occurrence_allday($recurrence_data, $start, $expected)
+    public function test_first_occurrence_allday($recurrence_data, $start, $expected)
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -301,7 +301,7 @@
             $recurrence_data'UNTIL' = new DateTime($recurrence_data'UNTIL');
         }
 
-        $event  = array('start' => $start, 'recurrence' => $recurrence_data, 'allday' => true);
+        $event  = 'start' => $start, 'recurrence' => $recurrence_data, 'allday' => true;
         $object = kolab_format::factory('event', 3.0);
         $object->set($event);
 
@@ -314,7 +314,7 @@
     /**
      * kolab_date_recurrence::next_instance()
      */
-    function test_next_instance()
+    public function test_next_instance()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');

roundcubemail-1.5.tar.gz/plugins/libkolab/tests/KolabStorageConfigTest.php Changed

@@ -2,31 +2,31 @@
 
 class KolabStorageConfigTest extends PHPUnit\Framework\TestCase
 {
-    private $params_personal = array(
+    private $params_personal = 
         'folder'     => 'Archive',
         'uid'        => '9',
         'message-id' => '<1225270@example.org>',
         'date'       => 'Mon, 20 Apr 2015 15:30:30 UTC',
         'subject'    => 'Archived',
-    );
+    ;
     private $url_personal = 'imap:///user/$user/Archive/9?message-id=%3C1225270%40example.org%3E&date=Mon%2C+20+Apr+2015+15%3A30%3A30+UTC&subject=Archived';
 
-    private $params_shared = array(
+    private $params_shared = 
         'folder'     => 'Shared Folders/shared/Collected',
         'uid'        => '4',
         'message-id' => '<5270122@example.org>',
         'date'       => 'Mon, 20 Apr 2015 16:33:03 +0200',
         'subject'    => 'Shared',
-    );
+    ;
     private $url_shared = 'imap:///shared/Collected/4?message-id=%3C5270122%40example.org%3E&date=Mon%2C+20+Apr+2015+16%3A33%3A03+%2B0200&subject=Shared';
 
-    private $params_other = array(
+    private $params_other = 
         'folder'     => 'Other Users/lucy.white/Mailings',
         'uid'        => '378',
         'message-id' => '<22448899@example.org>',
         'date'       => 'Tue, 14 Apr 2015 14:14:30 +0200',
         'subject'    => 'Happy Holidays',
-    );
+    ;
     private $url_other = 'imap:///user/lucy.white%40example.org/Mailings/378?message-id=%3C22448899%40example.org%3E&date=Tue%2C+14+Apr+2015+14%3A14%3A30+%2B0200&subject=Happy+Holidays';
 
     public static function setUpBeforeClass(): void
@@ -39,7 +39,7 @@
         }
 
         // Unset mock'ed storage from the Roundcube core tests
-        $rcmail->storage = null;
+        $rcube->storage = null;
 
         if ($rcube->config->get('tests_username')) {
             $authenticated = $rcube->login(
@@ -57,25 +57,23 @@
             $imap    = $rcube->get_storage();
             $folders = $imap->list_folders('', '*');
 
-            foreach (array('Configuration') as $folder) {
+            foreach ('Configuration' as $folder) {
                 if (in_array($folder, $folders)) {
                     if (!$imap->clear_folder($folder)) {
                         throw new Exception("Failed to clear folder '$folder'");
                     }
-                }
-                else {
+                } else {
                     throw new Exception("Default folder '$folder' doesn't exits in test user account");
                 }
             }
-        }
-        else {
+        } else {
             throw new Exception('Missing test account username/password in config-test.inc.php');
         }
 
         kolab_storage::setup();
     }
 
-    function test_001_build_member_url()
+    public function test_001_build_member_url()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -98,7 +96,7 @@
         $this->assertEquals($this->url_other, $url);
     }
 
-    function test_002_parse_member_url()
+    public function test_002_parse_member_url()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -126,7 +124,7 @@
         $this->assertEquals($this->params_other'folder', $params'folder');
     }
 
-    function test_003_build_parse_member_url()
+    public function test_003_build_parse_member_url()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -155,31 +153,31 @@
      * Test relation/tag objects creation
      * These objects will be used by following tests
      */
-    function test_save()
+    public function test_save()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
         }
 
         $config = kolab_storage_config::get_instance();
-        $tags   = array(
-            array(
+        $tags   = 
+            
                 'category' => 'tag',
                 'name'     => 'test1',
-            ),
-            array(
+            ,
+            
                 'category' => 'tag',
                 'name'     => 'test2',
-            ),
-            array(
+            ,
+            
                 'category' => 'tag',
                 'name'     => 'test3',
-            ),
-            array(
+            ,
+            
                 'category' => 'tag',
                 'name'     => 'test4',
-            ),
-        );
+            ,
+        ;
 
         foreach ($tags as $tag) {
             $result = $config->save($tag, 'relation');
@@ -192,7 +190,7 @@
     /**
      * Tests "race condition" in tags handling (T133)
      */
-    function test_T133()
+    public function test_T133()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -205,10 +203,10 @@
         $this->assertCount(4, $tags);
 
         // create a tag
-        $tag = array(
+        $tag = 
             'category' => 'tag',
             'name'     => 'new',
-        );
+        ;
         $result = $config->save($tag, 'relation');
         $this->assertTrue(!empty($result));

roundcubemail-1.5.tar.gz/plugins/libkolab/tests/KolabStorageFolderTest.php Changed

@@ -52,25 +52,23 @@
             $imap = $rcmail->get_storage();
             $folders = $imap->list_folders('', '*');
 
-            foreach (array('Calendar','Contacts','Files','Tasks','Notes') as $folder) {
+            foreach ('Calendar','Contacts','Files','Tasks','Notes' as $folder) {
                 if (in_array($folder, $folders)) {
                     if (!$imap->clear_folder($folder)) {
                         throw new Exception("Failed to clear folder '$folder'");
                     }
-                }
-                else {
+                } else {
                     throw new Exception("Default folder '$folder' doesn't exits in test user account");
                 }
             }
-        }
-        else {
+        } else {
             throw new Exception('Missing test account username/password in config-test.inc.php');
         }
 
         kolab_storage::setup();
     }
 
-    function test_001_folder_type_check()
+    public function test_001_folder_type_check()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -89,13 +87,13 @@
         $this->assertEquals($folder->get_error(), kolab_storage::ERROR_INVALID_FOLDER);
     }
 
-    function test_002_get_owner()
+    public function test_002_get_owner()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
         }
 
-        $rcmail = rcmail::get_instance();
+        $rcmail = rcube::get_instance();
         $folder = new kolab_storage_folder('Calendar', 'event', 'event');
         $this->assertEquals($folder->get_owner(), $rcmail->config->get('tests_username'));
 
@@ -110,32 +108,33 @@
         $this->assertEquals($folder->get_owner(true), 'major.tom' . $domain);
     }
 
-    function test_003_get_resource_uri()
+    public function test_003_get_resource_uri()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
         }
 
-        $rcmail     = rcmail::get_instance();
+        $rcmail     = rcube::get_instance();
         $foldername = 'Calendar';
         $uri        = parse_url($rcmail->config->get('default_host'));
         $hostname   = $uri'host';
 
         $folder = new kolab_storage_folder($foldername, 'event', 'event.default');
-        $this->assertEquals($folder->get_resource_uri(), sprintf('imap://%s@%s/%s',
+        $this->assertEquals($folder->get_resource_uri(), sprintf(
+            'imap://%s@%s/%s',
             urlencode($rcmail->config->get('tests_username')),
             $hostname,
             $foldername
         ));
     }
 
-    function test_004_get_uid()
+    public function test_004_get_uid()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
         }
 
-        $rcmail = rcmail::get_instance();
+        $rcmail = rcube::get_instance();
         $folder = new kolab_storage_folder('Doesnt-Exist', 'event', 'event');
 
         // generate UID from folder name if IMAP operations fail
@@ -144,7 +143,7 @@
         $this->assertEquals($folder->get_error(), kolab_storage::ERROR_IMAP_CONN);
     }
 
-    function test_005_subscribe()
+    public function test_005_subscribe()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -160,7 +159,7 @@
         $folder->subscribe(true);
     }
 
-    function test_006_activate()
+    public function test_006_activate()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -174,7 +173,7 @@
         $this->assertFalse($folder->is_active());
     }
 
-    function test_010_write_contacts()
+    public function test_010_write_contacts()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -185,15 +184,15 @@
         $saved = $folder->save(null, 'contact');
         $this->assertFalse($saved);
 
-        $contact = array(
+        $contact = 
             'name' => 'FN',
             'surname' => 'Last',
             'firstname' => 'First',
-            'email' => array(
-                array('type' => 'home', 'address' => 'first.last@example.org'),
-            ),
-            'organization' => 'Company A.G.'
-        );
+            'email' => 
+                'type' => 'home', 'address' => 'first.last@example.org',
+            ,
+            'organization' => 'Company A.G.',
+        ;
 
         $saved = $folder->save($contact, 'contact');
         $this->assertTrue((bool)$saved);
@@ -202,7 +201,7 @@
     /**
      * @depends test_010_write_contacts
      */
-    function test_011_list_contacts()
+    public function test_011_list_contacts()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
@@ -212,13 +211,13 @@
         $this->assertEquals($folder->count(), 1);
     }
 
-    function test_T491_get_uid()
+    public function test_T491_get_uid()
     {
         if (!kolab_format::supports(3)) {
             $this->markTestSkipped('No Kolab support');
         }
 
-        $rcmail = rcmail::get_instance();
+        $rcmail = rcube::get_instance();
         $imap   = $rcmail->get_storage();
         $db     = $rcmail->get_dbh();
 
@@ -230,11 +229,11 @@
         $uid    = $folder->get_uid();
 
         // now get folder uniqueid annotations
-        $annotations = array(
+        $annotations = 
             'cyrus'   => kolab_storage::UID_KEY_CYRUS,
             'shared'  => kolab_storage::UID_KEY_SHARED,
             'private' => '/private/vendor/kolab/uniqueid',
-        );
+        ;
         foreach ($annotations as $key => $annotation) {
             $meta              = $imap->get_metadata('Calendar', $annotation);
             $annotations$key = $meta'Calendar'$annotation;
@@ -243,11 +242,9 @@
         // compare results
         if ($annotations'shared') {
             $this->assertSame($annotations'shared', $uid);
-        }
-        else if ($annotations'cyrus') {
+        } elseif ($annotations'cyrus') {
             $this->assertSame($annotations'cyrus', $uid);
-        }
-        else {
+        } else {
             // never use private namespace
             $this->assertTrue($annotations'private' != $uid);
         }

roundcubemail-1.5.tar.gz/plugins/libkolab/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/plugins/logon_page/logon_page.php Changed

roundcubemail-1.5.tar.gz/plugins/nextcloud_link/nextcloud_link.php Changed

roundcubemail-1.5.tar.gz/plugins/odfviewer/odfviewer.php Changed

@@ -28,7 +28,7 @@
 {
     public $task = 'mail|calendar|tasks';
 
-    private $odf_mimetypes = array(
+    private $odf_mimetypes = 
         'application/vnd.oasis.opendocument.chart',
         'application/vnd.oasis.opendocument.chart-template',
         'application/vnd.oasis.opendocument.formula',
@@ -42,49 +42,49 @@
         'application/vnd.oasis.opendocument.text-template',
         'application/vnd.oasis.opendocument.spreadsheet',
         'application/vnd.oasis.opendocument.spreadsheet-template',
-    );
+    ;
 
-    function init()
+    public function init()
     {
         // webODF only supports IE9 or higher
-        $ua = new rcube_browser;
+        $ua = new rcube_browser();
         if ($ua->ie && $ua->ver < 9) {
             return;
         }
 
         // extend list of mimetypes that should open in preview
-        $rcmail = rcube::get_instance();
+        $rcmail = rcmail::get_instance();
         if ($rcmail->action == 'preview' || $rcmail->action == 'show' || $rcmail->task == 'calendar' || $rcmail->task == 'tasks') {
             $mimetypes = (array)$rcmail->config->get('client_mimetypes');
             $rcmail->config->set('client_mimetypes', array_merge($mimetypes, $this->odf_mimetypes));
         }
 
-        $this->add_hook('message_part_get', array($this, 'get_part'));
+        $this->add_hook('message_part_get', $this, 'get_part');
     }
 
     /**
      * Handler for message attachment download
      */
-    function get_part($args)
+    public function get_part($args)
     {
         if (!$args'download' && $args'mimetype' && in_array($args'mimetype', $this->odf_mimetypes)) {
-            $rcmail = rcube::get_instance();
-            $params = array(
+            $rcmail = rcmail::get_instance();
+            $params = 
                 'documentUrl' => $_SERVER'REQUEST_URI' . '&_download=1',
                 'filename'    => $args'part'->filename ?: 'file.odt',
                 'type'        => $args'mimetype',
-            );
+            ;
 
             // send webODF viewer page
             $html = file_get_contents($this->home . '/odf.html');
             header("Content-Type: text/html; charset=" . RCUBE_CHARSET);
-            echo strtr($html, array(
+            echo strtr($html, 
                 '%%PARAMS%%'             => rcube_output::json_serialize($params),
                 '%%viewer.css%%'         => $this->asset_path('viewer.css'),
                 '%%viewer.js%%'          => $this->asset_path('viewer.js'),
                 '%%ODFViewerPlugin.js%%' => $this->asset_path('ODFViewerPlugin.js'),
                 '%%webodf.js%%'          => $this->asset_path('webodf.js'),
-            ));
+            );
 
             $args'abort' = true;
         }
@@ -94,7 +94,7 @@
 
     private function asset_path($path)
     {
-        $rcmail     = rcube::get_instance();
+        $rcmail     = rcmail::get_instance();
         $assets_dir = $rcmail->config->get('assets_dir');
 
         $mtime = @filemtime($this->home . '/' . $path);

roundcubemail-1.5.tar.gz/plugins/pdfviewer/pdfviewer.php Changed

@@ -28,37 +28,39 @@
 {
     public $task = 'mail|calendar|tasks|logout';
 
-    private $pdf_mimetypes = array(
+    private $pdf_mimetypes = 
         'application/pdf',
         'application/x-pdf',
         'application/acrobat',
         'applications/vnd.pdf',
         'text/pdf',
         'text/x-pdf',
-    );
+    ;
 
     /**
      * Plugin initialization
      */
-    function init()
+    public function init()
     {
         // pdf.js only supports IE9 or higher
-        $ua = new rcube_browser;
-        if ($ua->ie && $ua->ver < 9)
+        $ua = new rcube_browser();
+        if ($ua->ie && $ua->ver < 9) {
             return;
+        }
 
         // extend list of mimetypes that should open in preview
-        $rcmail = rcube::get_instance();
+        $rcmail = rcmail::get_instance();
         if ($rcmail->action == 'preview' || $rcmail->action == 'show' || $rcmail->task == 'calendar' || $rcmail->task == 'tasks') {
-          $mimetypes = (array)$rcmail->config->get('client_mimetypes');
-          $rcmail->config->set('client_mimetypes', array_merge($mimetypes, $this->pdf_mimetypes));
+            $mimetypes = (array)$rcmail->config->get('client_mimetypes');
+            $rcmail->config->set('client_mimetypes', array_merge($mimetypes, $this->pdf_mimetypes));
         }
 
         // only use pdf.js if the browser doesn't support inline PDF rendering
-        if (empty($_SESSION'browser_caps''pdf') || $ua->opera)
-            $this->add_hook('message_part_get', array($this, 'get_part'));
+        if (empty($_SESSION'browser_caps''pdf') || $ua->opera) {
+            $this->add_hook('message_part_get', $this, 'get_part');
+        }
 
-        $this->add_hook('message_part_structure', array($this, 'part_structure'));
+        $this->add_hook('message_part_structure', $this, 'part_structure');
     }
 
     /**
@@ -68,7 +70,7 @@
     {
         // redirect to viewer/viewer.html
         if (!$args'download' && $args'mimetype' && empty($_GET'_load') && in_array($args'mimetype', $this->pdf_mimetypes)) {
-            $rcmail   = rcube::get_instance();
+            $rcmail   = rcmail::get_instance();
             $file_url = $_SERVER'REQUEST_URI' . '&_load=1';
             $location = $rcmail->output->asset_url($this->urlbase . 'viewer/viewer.html');
 
@@ -89,8 +91,7 @@
             foreach (array_keys($args'structure'->parts) as $i) {
                 $this->fix_mime_part($args'structure'->parts$i, $args'object');
             }
-        }
-        else if ($args'structure'->mimetype != $args'mimetype') {
+        } elseif ($args'structure'->mimetype != $args'mimetype') {
             $args'mimetype' = $args'structure';
         }
 
@@ -117,6 +118,6 @@
             }
         }
 
-        list($part->ctype_primary, $part->ctype_secondary) = explode('/', $part->mimetype);
+        $part->ctype_primary, $part->ctype_secondary = explode('/', $part->mimetype);
     }
 }

roundcubemail-1.5.tar.gz/plugins/tasklist/config.inc.php Changed

roundcubemail-1.5.tar.gz/plugins/tasklist/config.inc.php.dist Changed

roundcubemail-1.5.tar.gz/plugins/tasklist/drivers/caldav/tasklist_caldav_driver.php Changed

@@ -37,7 +37,6 @@
     private $lists;
     private $folders = ;
     private $tasks   = ;
-    private $tags    = ;
     private $bonnie_api = false;
 
 
@@ -80,7 +79,7 @@
 
             $this->lists$tasklist'id' = $tasklist;
             $this->folders$tasklist'id' = $folder;
-//            $this->folders$folder->name = $folder;
+            //            $this->folders$folder->name = $folder;
         }
 
         return $this->lists;
@@ -96,8 +95,7 @@
             $editable = true;
             $rights = 'lrswikxtea';
             $alarms = true;
-        }
-        else {
+        } else {
             $alarms = false;
             $rights = 'lr';
             $editable = false;
@@ -108,7 +106,7 @@
                 }
             }
             $info = $folder->get_folder_info();
-            $norename = $readonly || $info'norename' || $info'protected';
+            $norename = !$editable || $info'norename' || $info'protected';
         }
 
         $list_id = $folder->id;
@@ -119,7 +117,7 @@
             'listname' => $folder->get_foldername(),
             'editname' => $folder->get_foldername(),
             'color' => $folder->get_color('0000CC'),
-            'showalarms' => isset($prefs$list_id'showalarms') ? $prefs$list_id'showalarms' : $alarms,
+            'showalarms' => $prefs$list_id'showalarms' ?? $alarms,
             'editable' => $editable,
             'rights'    => $rights,
             'norename' => $norename,
@@ -127,7 +125,7 @@
             'owner' => $folder->get_owner(),
             'parentfolder' => $folder->get_parent(),
             'default' => $folder->default,
-            'virtual' => !empty($folder->virtual),
+            'virtual' => $folder instanceof kolab_storage_folder_virtual,
             'children' => true,  // TODO: determine if that folder indeed has child folders
             // 'subscribed' => (bool) $folder->is_subscribed(),
             'removable' => !$folder->default,
@@ -142,8 +140,11 @@
     /**
      * Get a list of available task lists from this source
      *
-     * @param int Bitmask defining filter criterias.
-     *            See FILTER_* constants for possible values.
+     * @param int    $filter Bitmask defining filter criterias.
+     *                       See FILTER_* constants for possible values.
+     * @param ?array $tree
+     *
+     * @return array
      */
     public function get_lists($filter = 0, &$tree = null)
     {
@@ -174,8 +175,7 @@
                     'class'    => 'user',
                     'parent'   => $parent_id,
                 ;
-            }
-            else if (!empty($folder->virtual)) {
+            } elseif ($folder instanceof kolab_storage_folder_virtual) {
                 $lists$list_id = 
                     'id'       => $list_id,
                     'name'     => $fullname,
@@ -187,8 +187,7 @@
                     'class'    => 'folder',
                     'parent'   => $parent_id,
                 ;
-            }
-            else {
+            } else {
                 if (empty($this->lists$list_id)) {
                     $this->lists$list_id = $this->folder_props($folder, $prefs);
                     $this->folders$list_id = $folder;
@@ -205,7 +204,7 @@
     /**
      * Get list of folders according to specified filters
      *
-     * @param int Bitmask defining restrictions. See FILTER_* constants for possible values.
+     * @param int $filter Bitmask defining restrictions. See FILTER_* constants for possible values.
      *
      * @return array List of task folders
      */
@@ -220,8 +219,7 @@
 
                 if ($folder->get_namespace() == 'personal') {
                     $folder->editable = true;
-                }
-                else if ($rights = $folder->get_myrights()) {
+                } elseif ($rights = $folder->get_myrights()) {
                     if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
                         $folder->editable = strpos($rights, 'i') !== false;
                     }
@@ -249,20 +247,20 @@
             if (($filter & self::FILTER_WRITEABLE) && !$folder->editable) {
                 continue;
             }
-/*
-            if (($filter & self::FILTER_INSERTABLE) && !$folder->insert) {
-                continue;
-            }
-            if (($filter & self::FILTER_ACTIVE) && !$folder->is_active()) {
-                continue;
-            }
-            if (($filter & self::FILTER_PRIVATE) && $folder->subtype != 'private') {
-                continue;
-            }
-            if (($filter & self::FILTER_CONFIDENTIAL) && $folder->subtype != 'confidential') {
-                continue;
-            }
-*/
+            /*
+                        if (($filter & self::FILTER_INSERTABLE) && !$folder->insert) {
+                            continue;
+                        }
+                        if (($filter & self::FILTER_ACTIVE) && !$folder->is_active()) {
+                            continue;
+                        }
+                        if (($filter & self::FILTER_PRIVATE) && $folder->subtype != 'private') {
+                            continue;
+                        }
+                        if (($filter & self::FILTER_CONFIDENTIAL) && $folder->subtype != 'confidential') {
+                            continue;
+                        }
+            */
             if ($personal || $shared) {
                 $ns = $folder->get_namespace();
                 if (!(($personal && $ns == 'personal') || ($shared && $ns == 'shared'))) {
@@ -279,7 +277,7 @@
     /**
      * Get the kolab_calendar instance for the given calendar ID
      *
-     * @param string List identifier (encoded imap folder name)
+     * @param string $id List identifier (encoded imap folder name)
      *
      * @return ?kolab_storage_folder Object nor null if list doesn't exist
      */
@@ -294,12 +292,12 @@
     /**
      * Create a new list assigned to the current user
      *
-     * @param array Hash array with list properties
-     *        name: List name
-     *       color: The color of the list
-     *  showalarms: True if alarms are enabled
+     * @param array $prop Hash array with list properties
+     *                    - name: List name
+     *                    - color: The color of the list
+     *                    - showalarms: True if alarms are enabled
      *
-     * @return mixed ID of the new list on success, False on error
+     * @return string|false ID of the new list on success, False on error
      */
     public function create_list(&$prop)
     {
@@ -324,8 +322,7 @@
         // force page reload to properly render folder hierarchy
         if (!empty($prop'parent')) {
             $prop'_reload' = true;
-        }
-        else {
+        } else {
             $folder = $this->get_folder($id);
             $prop += $this->folder_props($folder, );
         }
@@ -336,11 +333,11 @@
     /**
      * Update properties of an existing tasklist
      *
-     * @param array Hash array with list properties
-     *          id: List Identifier
-     *        name: List name
-     *       color: The color of the list
-     *  showalarms: True if alarms are enabled (if supported)
+     * @param array $prop Hash array with list properties
+     *                    - id: List Identifier
+     *                    - name: List name
+     *                    - color: The color of the list
+     *                    - showalarms: True if alarms are enabled (if supported)
      *
      * @return bool True on success, Fales on failure
      */
@@ -360,12 +357,12 @@
                 if (isset($prefs'kolab_tasklists'$id)) {
                     $this->rc->user->save_prefs($prefs);
                 }
-/*
-                // force page reload if folder name/hierarchy changed
-                if ($newfolder != $prop'oldname') {
-                    $prop'_reload' = true;
-                }
-*/
+                /*
+                                // force page reload if folder name/hierarchy changed
+                                if ($newfolder != $prop'oldname') {
+                                    $prop'_reload' = true;
+                                }
+                */
                 return true;
             }
         }
@@ -376,10 +373,10 @@
     /**
      * Set active/subscribed state of a list
      *
-     * @param array Hash array with list properties
-     *          id: List Identifier
-     *      active: True if list is active, false if not
-     *   permanent: True if list is to be subscribed permanently
+     * @param array $prop Hash array with list properties
+     *                    - id: List Identifier
+     *                    - active: True if list is active, false if not
+     *                    - permanent: True if list is to be subscribed permanently
      *
      * @return bool True on success, Fales on failure
      */
@@ -407,8 +404,8 @@
     /**
      * Delete the given list with all its contents
      *
-     * @param array Hash array with list properties
-     *      id: list Identifier
+     * @param array $prop Hash array with list properties
+     *                    - id: list Identifier
      *
      * @return bool True on success, Fales on failure
      */
@@ -433,55 +430,55 @@
     /**
      * Search for shared or otherwise not listed tasklists the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
      *
      * @return array List of tasklists
      */
     public function search_lists($query, $source)
     {
-/*
-        $this->search_more_results = false;
-        $this->lists = $this->folders = array();
-
-        // find unsubscribed IMAP folders that have "event" type
-        if ($source == 'folders') {
-            foreach ((array)kolab_storage::search_folders('task', $query, array('other')) as $folder) {
-                $this->folders$folder->id = $folder;
-                $this->lists$folder->id = $this->folder_props($folder, array());
-            }
-        }
-        // search other user's namespace via LDAP
-        else if ($source == 'users') {
-            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
-            foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
-                $folders = array();
-                // search for tasks folders shared by this user
-                foreach (kolab_storage::list_user_folders($user, 'task', false) as $foldername) {
-                    $folders = new kolab_storage_folder($foldername, 'task');
-                }
+        /*
+                $this->search_more_results = false;
+                $this->lists = $this->folders = array();
 
-                if (count($folders)) {
-                    $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
-                    $this->folders$userfolder->id = $userfolder;
-                    $this->lists$userfolder->id = $this->folder_props($userfolder, array());
-
-                    foreach ($folders as $folder) {
+                // find unsubscribed IMAP folders that have "event" type
+                if ($source == 'folders') {
+                    foreach ((array)kolab_storage::search_folders('task', $query, array('other')) as $folder) {
                         $this->folders$folder->id = $folder;
                         $this->lists$folder->id = $this->folder_props($folder, array());
-                        $count++;
                     }
                 }
+                // search other user's namespace via LDAP
+                else if ($source == 'users') {
+                    $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
+                    foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
+                        $folders = array();
+                        // search for tasks folders shared by this user
+                        foreach (kolab_storage::list_user_folders($user, 'task', false) as $foldername) {
+                            $folders = new kolab_storage_folder($foldername, 'task');
+                        }
 
-                if ($count >= $limit) {
-                    $this->search_more_results = true;
-                    break;
+                        if (count($folders)) {
+                            $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
+                            $this->folders$userfolder->id = $userfolder;
+                            $this->lists$userfolder->id = $this->folder_props($userfolder, array());
+
+                            foreach ($folders as $folder) {
+                                $this->folders$folder->id = $folder;
+                                $this->lists$folder->id = $this->folder_props($folder, array());
+                                $count++;
+                            }
+                        }
+
+                        if ($count >= $limit) {
+                            $this->search_more_results = true;
+                            break;
+                        }
+                    }
                 }
-            }
-        }
 
-        return $this->get_lists();
-*/
+                return $this->get_lists();
+        */
         return ;
     }
 
@@ -498,7 +495,7 @@
     /**
      * Get number of tasks matching the given filter
      *
-     * @param array List of lists to count tasks of
+     * @param array $lists List of lists to count tasks of
      *
      * @return array Hash array with counts grouped by status (all|flagged|completed|today|tomorrow|nodate)
      */
@@ -507,8 +504,7 @@
         if (empty($lists)) {
             $lists = $this->_read_lists();
             $lists = array_keys($lists);
-        }
-        else if (is_string($lists)) {
+        } elseif (is_string($lists)) {
             $lists = explode(',', $lists);
         }
 
@@ -534,17 +530,13 @@
                 $counts'all'++;
                 if (empty($rec'date')) {
                     $counts'later'++;
-                }
-                else if ($rec'date' == $today) {
+                } elseif ($rec'date' == $today) {
                     $counts'today'++;
-                }
-                else if ($rec'date' == $tomorrow) {
+                } elseif ($rec'date' == $tomorrow) {
                     $counts'tomorrow'++;
-                }
-                else if ($rec'date' < $today) {
+                } elseif ($rec'date' < $today) {
                     $counts'overdue'++;
-                }
-                else if ($rec'date' > $tomorrow) {
+                } elseif ($rec'date' > $tomorrow) {
                     $counts'later'++;
                 }
             }
@@ -556,13 +548,13 @@
     /**
      * Get all task records matching the given filter
      *
-     * @param array Hash array with filter criterias:
-     *  - mask:  Bitmask representing the filter selection (check against tasklist::FILTER_MASK_* constants)
-     *  - from:  Date range start as string (Y-m-d)
-     *  - to:    Date range end as string (Y-m-d)
-     *  - search: Search query string
-     *  - uid:   Task UIDs
-     * @param array List of lists to get tasks from
+     * @param array $filter Hash array with filter criterias:
+     *                      - mask:  Bitmask representing the filter selection (check against tasklist::FILTER_MASK_* constants)
+     *                      - from:  Date range start as string (Y-m-d)
+     *                      - to:    Date range end as string (Y-m-d)
+     *                      - search: Search query string
+     *                      - uid:   Task UIDs
+     * @param array $lists  List of lists to get tasks from
      *
      * @return array List of tasks records matchin the criteria
      */
@@ -571,8 +563,7 @@
         if (empty($lists)) {
             $lists = $this->_read_lists();
             $lists = array_keys($lists);
-        }
-        else if (is_string($lists)) {
+        } elseif (is_string($lists)) {
             $lists = explode(',', $lists);
         }
 
@@ -582,8 +573,7 @@
         $query = ;
         if (isset($filter'mask') && ($filter'mask' & tasklist::FILTER_MASK_COMPLETE)) {
             $query = 'tags', '~', 'x-complete';
-        }
-        else if (empty($filter'since')) {
+        } elseif (empty($filter'since')) {
             $query = 'tags', '!~', 'x-complete';
         }
 
@@ -625,11 +615,11 @@
     /**
      * Return data of a specific task
      *
-     * @param mixed Hash array with task properties or task UID
-     * @param int   Bitmask defining filter criterias for folders.
-     *              See FILTER_* constants for possible values.
+     * @param mixed $prop   Hash array with task properties or task UID
+     * @param int   $filter Bitmask defining filter criterias for folders.
+     *                      See FILTER_* constants for possible values.
      *
-     * @return array Hash array with task properties or false if not found
+     * @return array|false Hash array with task properties or false if not found
      */
     public function get_task($prop, $filter = 0)
     {
@@ -659,8 +649,8 @@
     /**
      * Get all decendents of the given task record
      *
-     * @param mixed Hash array with task properties or task UID
-     * @param bool  True if all childrens children should be fetched
+     * @param mixed $prop      Hash array with task properties or task UID
+     * @param bool  $recursive True if all childrens children should be fetched
      *
      * @return array List of all child task IDs
      */
@@ -669,8 +659,7 @@
         if (is_string($prop)) {
             $task = $this->get_task($prop);
             $prop = 'uid' => $task'uid', 'list' => $task'list';
-        }
-        else {
+        } else {
             $this->_parse_id($prop);
         }
 
@@ -706,9 +695,9 @@
     /**
      * Provide a list of revisions for the given task
      *
-     * @param array $task Hash array with task properties
+     * @param array $prop Hash array with task properties
      *
-     * @return array List of changes, each as a hash array
+     * @return array|false List of changes, each as a hash array
      * @see tasklist_driver::get_task_changelog()
      */
     public function get_task_changelog($prop)
@@ -716,24 +705,24 @@
         if (empty($this->bonnie_api)) {
             return false;
         }
-/*
+        /*
         list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
 
         $result = $uid && $mailbox ? $this->bonnie_api->changelog('task', $uid, $mailbox, $msguid) : null;
         if (is_array($result) && $result'uid' == $uid) {
             return $result'changes';
         }
-*/
+        */
         return false;
     }
 
     /**
      * Return full data of a specific revision of an event
      *
-     * @param mixed $task UID string or hash array with task properties
+     * @param mixed $prop UID string or hash array with task properties
      * @param mixed $rev  Revision number
      *
-     * @return array Task object as hash array
+     * @return array|false Task object as hash array
      * @see tasklist_driver::get_task_revision()
      */
     public function get_task_revison($prop, $rev)
@@ -741,27 +730,27 @@
         if (empty($this->bonnie_api)) {
             return false;
         }
-/*
-        $this->_parse_id($prop);
-        $uid     = $prop'uid';
-        $list_id = $prop'list';
-        list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
-
-        // call Bonnie API
-        $result = $this->bonnie_api->get('task', $uid, $rev, $mailbox, $msguid);
-        if (is_array($result) && $result'uid' == $uid && !empty($result'xml')) {
-            $format = kolab_format::factory('task');
-            $format->load($result'xml');
-            $rec = $format->to_array();
-            $format->get_attachments($rec, true);
-
-            if ($format->is_valid()) {
-                $rec = self::_to_rcube_task($rec, $list_id, false);
-                $rec'rev' = $result'rev';
-                return $rec;
-            }
-        }
-*/
+        /*
+                $this->_parse_id($prop);
+                $uid     = $prop'uid';
+                $list_id = $prop'list';
+                list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
+
+                // call Bonnie API
+                $result = $this->bonnie_api->get('task', $uid, $rev, $mailbox, $msguid);
+                if (is_array($result) && $result'uid' == $uid && !empty($result'xml')) {
+                    $format = kolab_format::factory('task');
+                    $format->load($result'xml');
+                    $rec = $format->to_array();
+                    $format->get_attachments($rec, true);
+
+                    if ($format->is_valid()) {
+                        $rec = self::_to_rcube_task($rec, $list_id, false);
+                        $rec'rev' = $result'rev';
+                        return $rec;
+                    }
+                }
+        */
         return false;
     }
 
@@ -769,7 +758,7 @@
      * Command the backend to restore a certain revision of a task.
      * This shall replace the current object with an older version.
      *
-     * @param mixed $task UID string or hash array with task properties
+     * @param mixed $prop UID string or hash array with task properties
      * @param mixed $rev  Revision number
      *
      * @return bool True on success, False on failure
@@ -780,7 +769,7 @@
         if (empty($this->bonnie_api)) {
             return false;
         }
-/*
+        /*
         $this->_parse_id($prop);
         $uid     = $prop'uid';
         $list_id = $prop'list';
@@ -803,125 +792,127 @@
         }
 
         return $success;
-*/
+        */
+        return false;
     }
 
     /**
      * Get a list of property changes beteen two revisions of a task object
      *
-     * @param array  $task Hash array with task properties
-     * @param mixed  $rev   Revisions: "from:to"
+     * @param array $prop Hash array with task properties
+     * @param mixed $rev1 Revision: "from"
+     * @param mixed $rev2 Revision: "to"
      *
-     * @return array List of property changes, each as a hash array
+     * @return array|false List of property changes, each as a hash array
      * @see tasklist_driver::get_task_diff()
      */
     public function get_task_diff($prop, $rev1, $rev2)
     {
-/*
-        $this->_parse_id($prop);
-        $uid     = $prop'uid';
-        $list_id = $prop'list';
-        list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
-
-        // call Bonnie API
-        $result = $this->bonnie_api->diff('task', $uid, $rev1, $rev2, $mailbox, $msguid, $instance_id);
-        if (is_array($result) && $result'uid' == $uid) {
-            $result'rev1' = $rev1;
-            $result'rev2' = $rev2;
-
-            $keymap = array(
-                'start'    => 'start',
-                'due'      => 'date',
-                'dstamp'   => 'changed',
-                'summary'  => 'title',
-                'alarm'    => 'alarms',
-                'attendee' => 'attendees',
-                'attach'   => 'attachments',
-                'rrule'    => 'recurrence',
-                'related-to' => 'parent_id',
-                'percent-complete' => 'complete',
-                'lastmodified-date' => 'changed',
-            );
-            $prop_keymaps = array(
-                'attachments' => array('fmttype' => 'mimetype', 'label' => 'name'),
-                'attendees'   => array('partstat' => 'status'),
-            );
-            $special_changes = array();
+        /*
+                $this->_parse_id($prop);
+                $uid     = $prop'uid';
+                $list_id = $prop'list';
+                list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
+
+                // call Bonnie API
+                $result = $this->bonnie_api->diff('task', $uid, $rev1, $rev2, $mailbox, $msguid, $instance_id);
+                if (is_array($result) && $result'uid' == $uid) {
+                    $result'rev1' = $rev1;
+                    $result'rev2' = $rev2;
+
+                    $keymap = array(
+                        'start'    => 'start',
+                        'due'      => 'date',
+                        'dstamp'   => 'changed',
+                        'summary'  => 'title',
+                        'alarm'    => 'alarms',
+                        'attendee' => 'attendees',
+                        'attach'   => 'attachments',
+                        'rrule'    => 'recurrence',
+                        'related-to' => 'parent_id',
+                        'percent-complete' => 'complete',
+                        'lastmodified-date' => 'changed',
+                    );
+                    $prop_keymaps = array(
+                        'attachments' => array('fmttype' => 'mimetype', 'label' => 'name'),
+                        'attendees'   => array('partstat' => 'status'),
+                    );
+                    $special_changes = array();
+
+                    // map kolab event properties to keys the client expects
+                    array_walk($result'changes', function(&$change, $i) use ($keymap, $prop_keymaps, $special_changes) {
+                        if (array_key_exists($change'property', $keymap)) {
+                            $change'property' = $keymap$change'property';
+                        }
+                        if ($change'property' == 'priority') {
+                            $change'property' = 'flagged';
+                            $change'old' = $change'old' == 1 ? $this->plugin->gettext('yes') : null;
+                            $change'new' = $change'new' == 1 ? $this->plugin->gettext('yes') : null;
+                        }
+                        // map alarms trigger value
+                        if ($change'property' == 'alarms') {
+                            if (is_array($change'old') && is_array($change'old''trigger'))
+                                $change'old''trigger' = $change'old''trigger''value';
+                            if (is_array($change'new') && is_array($change'new''trigger'))
+                                $change'new''trigger' = $change'new''trigger''value';
+                        }
+                        // make all property keys uppercase
+                        if ($change'property' == 'recurrence') {
+                            $special_changes'recurrence' = $i;
+                            foreach (array('old','new') as $m) {
+                                if (is_array($change$m)) {
+                                    $props = array();
+                                    foreach ($change$m as $k => $v) {
+                                        $propsstrtoupper($k) = $v;
+                                    }
+                                    $change$m = $props;
+                                }
+                            }
+                        }
+                        // map property keys names
+                        if (is_array($prop_keymaps$change'property')) {
+                          foreach ($prop_keymaps$change'property' as $k => $dest) {
+                            if (is_array($change'old') && array_key_exists($k, $change'old')) {
+                                $change'old'$dest = $change'old'$k;
+                                unset($change'old'$k);
+                            }
+                            if (is_array($change'new') && array_key_exists($k, $change'new')) {
+                                $change'new'$dest = $change'new'$k;
+                                unset($change'new'$k);
+                            }
+                          }
+                        }
 
-            // map kolab event properties to keys the client expects
-            array_walk($result'changes', function(&$change, $i) use ($keymap, $prop_keymaps, $special_changes) {
-                if (array_key_exists($change'property', $keymap)) {
-                    $change'property' = $keymap$change'property';
-                }
-                if ($change'property' == 'priority') {
-                    $change'property' = 'flagged';
-                    $change'old' = $change'old' == 1 ? $this->plugin->gettext('yes') : null;
-                    $change'new' = $change'new' == 1 ? $this->plugin->gettext('yes') : null;
-                }
-                // map alarms trigger value
-                if ($change'property' == 'alarms') {
-                    if (is_array($change'old') && is_array($change'old''trigger'))
-                        $change'old''trigger' = $change'old''trigger''value';
-                    if (is_array($change'new') && is_array($change'new''trigger'))
-                        $change'new''trigger' = $change'new''trigger''value';
-                }
-                // make all property keys uppercase
-                if ($change'property' == 'recurrence') {
-                    $special_changes'recurrence' = $i;
-                    foreach (array('old','new') as $m) {
-                        if (is_array($change$m)) {
-                            $props = array();
-                            foreach ($change$m as $k => $v) {
-                                $propsstrtoupper($k) = $v;
+                        if ($change'property' == 'exdate') {
+                            $special_changes'exdate' = $i;
+                        }
+                        else if ($change'property' == 'rdate') {
+                            $special_changes'rdate' = $i;
+                        }
+                    });
+
+                    // merge some recurrence changes
+                    foreach (array('exdate','rdate') as $prop) {
+                        if (array_key_exists($prop, $special_changes)) {
+                            $exdate = $result'changes'$special_changes$prop;
+                            if (array_key_exists('recurrence', $special_changes)) {
+                                $recurrence = &$result'changes'$special_changes'recurrence';
+                            }
+                            else {
+                                $i = count($result'changes');
+                                $result'changes'$i = array('property' => 'recurrence', 'old' => array(), 'new' => array());
+                                $recurrence = &$result'changes'$i'recurrence';
                             }
-                            $change$m = $props;
+                            $key = strtoupper($prop);
+                            $recurrence'old'$key = $exdate'old';
+                            $recurrence'new'$key = $exdate'new';
+                            unset($result'changes'$special_changes$prop);
                         }
                     }
-                }
-                // map property keys names
-                if (is_array($prop_keymaps$change'property')) {
-                  foreach ($prop_keymaps$change'property' as $k => $dest) {
-                    if (is_array($change'old') && array_key_exists($k, $change'old')) {
-                        $change'old'$dest = $change'old'$k;
-                        unset($change'old'$k);
-                    }
-                    if (is_array($change'new') && array_key_exists($k, $change'new')) {
-                        $change'new'$dest = $change'new'$k;
-                        unset($change'new'$k);
-                    }
-                  }
-                }
 
-                if ($change'property' == 'exdate') {
-                    $special_changes'exdate' = $i;
-                }
-                else if ($change'property' == 'rdate') {
-                    $special_changes'rdate' = $i;
-                }
-            });
-
-            // merge some recurrence changes
-            foreach (array('exdate','rdate') as $prop) {
-                if (array_key_exists($prop, $special_changes)) {
-                    $exdate = $result'changes'$special_changes$prop;
-                    if (array_key_exists('recurrence', $special_changes)) {
-                        $recurrence = &$result'changes'$special_changes'recurrence';
-                    }
-                    else {
-                        $i = count($result'changes');
-                        $result'changes'$i = array('property' => 'recurrence', 'old' => array(), 'new' => array());
-                        $recurrence = &$result'changes'$i'recurrence';
-                    }
-                    $key = strtoupper($prop);
-                    $recurrence'old'$key = $exdate'old';
-                    $recurrence'new'$key = $exdate'new';
-                    unset($result'changes'$special_changes$prop);
+                    return $result;
                 }
-            }
-
-            return $result;
-        }
-*/
+        */
         return false;
     }
 
@@ -930,9 +921,9 @@
      *
      * @return array (uid,folder,msguid) tuple
      */
+    /*
     private function _resolve_task_identity($prop)
     {
-/*
         $mailbox = $msguid = null;
 
         $this->_parse_id($prop);
@@ -950,8 +941,8 @@
         }
 
         return array($uid, $mailbox, $msguid);
-*/
     }
+    */
 
     /**
      * Get a list of pending alarms to be displayed to the user
@@ -1030,9 +1021,10 @@
         // get alarm information stored in local database
         if (!empty($candidates)) {
             $alarm_ids = array_map($this->rc->db, 'quote', array_keys($candidates));
-            $result = $this->rc->db->query("SELECT *"
+            $result = $this->rc->db->query(
+                "SELECT *"
                 . " FROM " . $this->rc->db->table_name('kolab_alarms', true)
-                . " WHERE `alarm_id` IN (" . join(',', $alarm_ids) . ")"
+                . " WHERE `alarm_id` IN (" . implode(',', $alarm_ids) . ")"
                     . " AND `user_id` = ?",
                 $this->rc->user->ID
             );
@@ -1113,7 +1105,7 @@
     /**
      * Extract uid + list identifiers from the given input
      *
-     * @param mixed array or string with task identifier(s)
+     * @param array|string $prop Array or a string with task identifier(s)
      */
     private function _parse_id(&$prop)
     {
@@ -1128,19 +1120,16 @@
             if (!empty($prop'id')) {
                 if (!empty($prop'list')) {
                     $list_id = !empty($prop'_fromlist') ? $prop'_fromlist' : $prop'list';
-                    if (strpos($prop'id', $list_id.':') === 0) {
-                        $prop'uid' = substr($prop'id', strlen($list_id)+1);
-                    }
-                    else {
+                    if (strpos($prop'id', $list_id . ':') === 0) {
+                        $prop'uid' = substr($prop'id', strlen($list_id) + 1);
+                    } else {
                         $prop'uid' = $prop'id';
                     }
-                }
-                else {
+                } else {
                     $id = $prop'id';
                 }
             }
-        }
-        else {
+        } else {
             $id = strval($prop);
             $prop = ;
         }
@@ -1148,11 +1137,10 @@
         // split 'id' into list + uid
         if (!empty($id)) {
             if (strpos($id, ':')) {
-                list($list, $uid) = explode(':', $id, 2);
+                $list, $uid = explode(':', $id, 2);
                 $prop'uid' = $uid;
                 $prop'list' = $list;
-            }
-            else {
+            } else {
                 $prop'uid' = $id;
             }
         }
@@ -1208,23 +1196,23 @@
 
         if (isset($record'valarms')) {
             $task'valarms' = $record'valarms';
-        }
-        else if (isset($record'alarms')) {
+        } elseif (isset($record'alarms')) {
             $task'alarms' = $record'alarms';
         }
 
         if (!empty($task'attendees')) {
             foreach ((array) $task'attendees' as $i => $attendee) {
                 if (isset($attendee'delegated-from') && is_array($attendee'delegated-from')) {
-                    $task'attendees'$i'delegated-from' = join(', ', $attendee'delegated-from');
+                    $task'attendees'$i'delegated-from' = implode(', ', $attendee'delegated-from');
                 }
                 if (isset($attendee'delegated-to') && is_array($attendee'delegated-to')) {
-                    $task'attendees'$i'delegated-to' = join(', ', $attendee'delegated-to');
+                    $task'attendees'$i'delegated-to' = implode(', ', $attendee'delegated-to');
                 }
             }
         }
 
         if (!empty($record'_attachments')) {
+            $attachments = ;
             foreach ($record'_attachments' as $key => $attachment) {
                 if ($attachment !== false) {
                     if (empty($attachment'name')) {
@@ -1249,7 +1237,7 @@
         $object    = $task;
         $id_prefix = $task'list' . ':';
 
-        $toDT = function($date) {
+        $toDT = function ($date) {
             // Convert DateTime into libcalendaring_datetime
             return libcalendaring_datetime::createFromFormat(
                 'Y-m-d\\TH:i:s',
@@ -1288,8 +1276,7 @@
 
         if (!empty($task'flagged')) {
             $object'priority' = 1;
-        }
-        else {
+        } else {
             $object'priority' = isset($old'priority') && $old'priority' > 1 ? $old'priority' : 0;
         }
 
@@ -1316,8 +1303,7 @@
         // allow sequence increments if I'm the organizer
         if ($this->plugin->is_organizer($object) && empty($object'_method')) {
             unset($object'sequence');
-        }
-        else if (isset($old'sequence') && empty($object'_method')) {
+        } elseif (isset($old'sequence') && empty($object'_method')) {
             $object'sequence' = $old'sequence';
         }
 
@@ -1329,7 +1315,7 @@
     /**
      * Add a single task to the database
      *
-     * @param array Hash array with task properties (see header of tasklist_driver.php)
+     * @param array $task Hash array with task properties (see header of tasklist_driver.php)
      *
      * @return mixed New task ID on success, False on error
      */
@@ -1341,7 +1327,7 @@
     /**
      * Update a task entry with the given data
      *
-     * @param array Hash array with task properties (see header of tasklist_driver.php)
+     * @param array $task Hash array with task properties (see header of tasklist_driver.php)
      *
      * @return bool True on success, False on error
      */
@@ -1350,11 +1336,14 @@
         $this->_parse_id($task);
 
         if (empty($task'list') || !($folder = $this->get_folder($task'list'))) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Invalid list identifer to save task: " . print_r($task'list', true)
+                    'message' => "Invalid list identifer to save task: " . print_r($task'list', true),
                 ,
-                true, false);
+                true,
+                false
+            );
 
             return false;
         }
@@ -1389,11 +1378,14 @@
         $saved = $folder->save($object, 'task', !empty($old) ? $task'uid' : null);
 
         if (!$saved) {
-            rcube::raise_error(
+            rcube::raise_error(
+                
                     'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Error saving task object to Kolab server"
+                    'message' => "Error saving task object to Kolab server",
                 ,
-                true, false);
+                true,
+                false
+            );
 
             return false;
         }
@@ -1431,9 +1423,9 @@
     /**
      * Remove a single task from the database
      *
-     * @param array Hash array with task properties:
-     *      id: Task identifier
-     * @param bool  Remove record irreversible (mark as deleted otherwise, if supported by the backend)
+     * @param array $task  Hash array with task properties:
+     *                     id: Task identifier
+     * @param bool  $force Remove record irreversible (mark as deleted otherwise, if supported by the backend)
      *
      * @return bool True on success, False on error
      */
@@ -1453,9 +1445,9 @@
     /**
      * Restores a single deleted task (if supported)
      *
-     * @param array Hash array with task properties:
+     * @param array $prop Hash array with task properties:
      *      id: Task identifier
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      */
     public function undelete_task($prop)
     {
@@ -1467,13 +1459,13 @@
     /**
      * Get attachment properties
      *
-     * @param string $id    Attachment identifier
-     * @param array  $task  Hash array with event properties:
+     * @param string $id   Attachment identifier
+     * @param array  $task Hash array with event properties:
      *         id: Task identifier
      *       list: List identifier
      *        rev: Revision (optional)
      *
-     * @return array Hash array with attachment properties:
+     * @return array|null Hash array with attachment properties:
      *         id: Attachment identifier
      *       name: Attachment name
      *   mimetype: MIME content type of the attachment
@@ -1484,8 +1476,7 @@
         // get old revision of the object
         if (!empty($task'rev')) {
             $task = $this->get_task_revison($task, $task'rev');
-        }
-        else {
+        } else {
             $task = $this->get_task($task);
         }
 
@@ -1514,35 +1505,35 @@
      *       list: List identifier
      *        rev: Revision (optional)
      *
-     * @return string Attachment body
+     * @return string|false Attachment body
      */
     public function get_attachment_body($id, $task)
     {
         $this->_parse_id($task);
-/*
-        // get old revision of event
-        if ($task'rev') {
-            if (empty($this->bonnie_api)) {
-                return false;
-            }
+        /*
+                // get old revision of event
+                if ($task'rev') {
+                    if (empty($this->bonnie_api)) {
+                        return false;
+                    }
 
-            $cid = substr($id, 4);
+                    $cid = substr($id, 4);
 
-            // call Bonnie API and get the raw mime message
-            list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($task);
-            if ($msg_raw = $this->bonnie_api->rawdata('task', $uid, $task'rev', $mailbox, $msguid)) {
-                // parse the message and find the part with the matching content-id
-                $message = rcube_mime::parse_message($msg_raw);
-                foreach ((array)$message->parts as $part) {
-                    if ($part->headers'content-id' && trim($part->headers'content-id', '<>') == $cid) {
-                        return $part->body;
+                    // call Bonnie API and get the raw mime message
+                    list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($task);
+                    if ($msg_raw = $this->bonnie_api->rawdata('task', $uid, $task'rev', $mailbox, $msguid)) {
+                        // parse the message and find the part with the matching content-id
+                        $message = rcube_mime::parse_message($msg_raw);
+                        foreach ((array)$message->parts as $part) {
+                            if ($part->headers'content-id' && trim($part->headers'content-id', '<>') == $cid) {
+                                return $part->body;
+                            }
+                        }
                     }
-                }
-            }
 
-            return false;
-        }
-*/
+                    return false;
+                }
+        */
 
         if ($storage = $this->get_folder($task'list')) {
             return $storage->get_attachment($id, $task);
@@ -1558,15 +1549,15 @@
      */
     public function get_message_reference($uri_or_headers, $folder = null)
     {
-/*
-        if (is_object($uri_or_headers)) {
-            $uri_or_headers = kolab_storage_config::get_message_uri($uri_or_headers, $folder);
-        }
+        /*
+                if (is_object($uri_or_headers)) {
+                    $uri_or_headers = kolab_storage_config::get_message_uri($uri_or_headers, $folder);
+                }
 
-        if (is_string($uri_or_headers)) {
-            return kolab_storage_config::get_message_reference($uri_or_headers, 'task');
-        }
-*/
+                if (is_string($uri_or_headers)) {
+                    return kolab_storage_config::get_message_reference($uri_or_headers, 'task');
+                }
+        */
         return false;
     }
 
@@ -1578,20 +1569,20 @@
     public function get_message_related_tasks($headers, $folder)
     {
         return ;
-/*
-        $config = kolab_storage_config::get_instance();
-        $result = $config->get_message_relations($headers, $folder, 'task');
+        /*
+                $config = kolab_storage_config::get_instance();
+                $result = $config->get_message_relations($headers, $folder, 'task');
 
-        foreach ($result as $idx => $rec) {
-            $result$idx = $this->_to_rcube_task($rec, kolab_storage::folder_id($rec'_mailbox'));
-        }
+                foreach ($result as $idx => $rec) {
+                    $result$idx = $this->_to_rcube_task($rec, kolab_storage::folder_id($rec'_mailbox'));
+                }
 
-        return $result;
-*/
+                return $result;
+        */
     }
 
     /**
-     * 
+     *
      */
     public function tasklist_edit_form($action, $list, $fieldprop)
     {
@@ -1599,8 +1590,7 @@
 
         if (!empty($list'id') && ($list = $this->lists$list'id')) {
             $folder_name = $this->get_folder($list'id')->name;
-        }
-        else {
+        } else {
             $folder_name = '';
         }
 
@@ -1615,7 +1605,7 @@
             'properties' => 
                 'name'   => $this->rc->gettext('properties'),
                 'fields' => ,
-            
+            ,
         ;
 
         foreach ('name', 'showalarms' as $f) {

roundcubemail-1.5.tar.gz/plugins/tasklist/drivers/database/tasklist_database_driver.php Changed

@@ -24,16 +24,17 @@
 
 class tasklist_database_driver extends tasklist_driver
 {
-    const IS_COMPLETE_SQL = "(`status` = 'COMPLETED' OR (`complete` = 1 AND `status` = ''))";
+    public const IS_COMPLETE_SQL = "(`status` = 'COMPLETED' OR (`complete` = 1 AND `status` = ''))";
 
     public $undelete    = true; // yes, we can
     public $sortable    = false;
-    public $alarm_types = array('DISPLAY');
+    public $alarm_types = 'DISPLAY';
 
+    private $db;
     private $rc;
     private $plugin;
-    private $lists    = array();
-    private $tags     = array();
+    private $lists    = ;
+    private $tags     = ;
     private $list_ids = '';
     private $db_tasks = 'tasks';
     private $db_lists = 'tasklists';
@@ -48,9 +49,9 @@
         $this->plugin = $plugin;
 
         // read database config
-        $db = $this->rc->get_dbh();
-        $this->db_lists = $this->rc->config->get('db_table_lists', $db->table_name($this->db_lists));
-        $this->db_tasks = $this->rc->config->get('db_table_tasks', $db->table_name($this->db_tasks));
+        $this->db = $this->rc->get_dbh();
+        $this->db_lists = $this->rc->config->get('db_table_lists', $this->db->table_name($this->db_lists));
+        $this->db_tasks = $this->rc->config->get('db_table_tasks', $this->db->table_name($this->db_tasks));
 
         $this->_read_lists();
     }
@@ -63,15 +64,15 @@
         $hidden = array_filter(explode(',', $this->rc->config->get('hidden_tasklists', '')));
 
         if (!empty($this->rc->user->ID)) {
-            $list_ids = array();
-            $result = $this->rc->db->query(
+            $list_ids = ;
+            $result = $this->db->query(
                 "SELECT *, `tasklist_id` AS id FROM " . $this->db_lists
                 . " WHERE `user_id` = ?"
                 . " ORDER BY CASE WHEN `name` = 'INBOX' THEN 0 ELSE 1 END, `name`",
                 $this->rc->user->ID
             );
 
-            while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
+            while ($result && ($arr = $this->db->fetch_assoc($result))) {
                 $arr'showalarms' = intval($arr'showalarms');
                 $arr'active'     = !in_array($arr'id', $hidden);
                 $arr'name'       = html::quote($arr'name');
@@ -80,10 +81,10 @@
                 $arr'rights'     = 'lrswikxtea';
 
                 $this->lists$arr'id' = $arr;
-                $list_ids = $this->rc->db->quote($arr'id');
+                $list_ids = $this->db->quote($arr'id');
             }
 
-            $this->list_ids = join(',', $list_ids);
+            $this->list_ids = implode(',', $list_ids);
         }
     }
 
@@ -94,7 +95,7 @@
     {
         // attempt to create a default list for this user
         if (empty($this->lists)) {
-            $prop = array('name' => 'Default', 'color' => '000000');
+            $prop = 'name' => 'Default', 'color' => '000000';
             if ($this->create_list($prop)) {
                 $this->_read_lists();
             }
@@ -106,13 +107,14 @@
     /**
      * Create a new list assigned to the current user
      *
-     * @param array Hash array with list properties
-     * @return mixed ID of the new list on success, False on error
+     * @param array $prop Hash array with list properties
+     *
+     * @return string|false ID of the new list on success, False on error
      * @see tasklist_driver::create_list()
      */
     public function create_list(&$prop)
     {
-        $result = $this->rc->db->query(
+        $result = $this->db->query(
             "INSERT INTO " . $this->db_lists
              . " (`user_id`, `name`, `color`, `showalarms`)"
              . " VALUES (?, ?, ?, ?)",
@@ -124,7 +126,7 @@
 
         if ($result) {
             $prop'rights' = 'lrswikxtea';
-            return $this->rc->db->insert_id($this->db_lists);
+            return $this->db->insert_id($this->db_lists);
         }
 
         return false;
@@ -133,13 +135,14 @@
     /**
      * Update properties of an existing tasklist
      *
-     * @param array Hash array with list properties
-     * @return boolean True on success, Fales on failure
+     * @param array $prop Hash array with list properties
+     *
+     * @return bool|string True on success, Fales on failure
      * @see tasklist_driver::edit_list()
      */
     public function edit_list(&$prop)
     {
-        $query = $this->rc->db->query(
+        $query = $this->db->query(
             "UPDATE " . $this->db_lists . " SET `name` = ?, `color` = ?, `showalarms` = ?"
              . " WHERE `tasklist_id` = ? AND `user_id` = ?",
             strval($prop'name'),
@@ -149,14 +152,15 @@
             $this->rc->user->ID
         );
 
-        return $this->rc->db->affected_rows($query);
+        return $this->db->affected_rows($query) > 0;
     }
 
     /**
      * Set active/subscribed state of a list
      *
-     * @param array Hash array with list properties
-     * @return boolean True on success, Fales on failure
+     * @param array $prop Hash array with list properties
+     *
+     * @return bool True on success, Fales on failure
      * @see tasklist_driver::subscribe_list()
      */
     public function subscribe_list($prop)
@@ -165,19 +169,19 @@
 
         if (!empty($prop'active')) {
             unset($hidden$prop'id');
-        }
-        else {
+        } else {
             $hidden$prop'id' = 1;
         }
 
-        return $this->rc->user->save_prefs(array('hidden_tasklists' => join(',', array_keys($hidden))));
+        return $this->rc->user->save_prefs('hidden_tasklists' => implode(',', array_keys($hidden)));
     }
 
     /**
      * Delete the given list with all its contents
      *
-     * @param array Hash array with list properties
-     * @return boolean True on success, Fales on failure
+     * @param array $prop Hash array with list properties
+     *
+     * @return bool True on success, Fales on failure
      * @see tasklist_driver::delete_list()
      */
     public function delete_list($prop)
@@ -185,13 +189,13 @@
         $list_id = $prop'id';
 
         if ($this->lists$list_id) {
-            $query = $this->rc->db->query(
+            $query = $this->db->query(
                 "DELETE FROM " . $this->db_lists . " WHERE `tasklist_id` = ? AND `user_id` = ?",
                 $list_id,
                 $this->rc->user->ID
             );
 
-            return $this->rc->db->affected_rows($query);
+            return $this->db->affected_rows($query);
         }
 
         return false;
@@ -200,14 +204,14 @@
     /**
      * Search for shared or otherwise not listed tasklists the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
      *
      * @return array List of tasklists
      */
     public function search_lists($query, $source)
     {
-        return array();
+        return ;
     }
 
     /**
@@ -223,46 +227,47 @@
     /**
      * Get number of tasks matching the given filter
      *
-     * @param array List of lists to count tasks of
+     * @param array $lists List of lists to count tasks of
+     *
      * @return array Hash array with counts grouped by status (all|flagged|today|tomorrow|overdue|nodate)
      * @see tasklist_driver::count_tasks()
      */
-    function count_tasks($lists = null)
+    public function count_tasks($lists = null)
     {
         if (empty($lists)) {
             $lists = array_keys($this->lists);
-        }
-        else if (!is_array($lists)) {
+        } elseif (!is_array($lists)) {
             $lists = explode(',', (string) $lists);
         }
 
         // only allow to select from lists of this user
-        $list_ids = array_map(array($this->rc->db, 'quote'), array_intersect($lists, array_keys($this->lists)));
+        $list_ids = array_map($this->rc->db, 'quote', array_intersect($lists, array_keys($this->lists)));
 
         $today_date    = new DateTime('now', $this->plugin->timezone);
         $today         = $today_date->format('Y-m-d');
         $tomorrow_date = new DateTime('now + 1 day', $this->plugin->timezone);
         $tomorrow      = $tomorrow_date->format('Y-m-d');
 
-        $result = $this->rc->db->query(sprintf(
+        $result = $this->db->query(sprintf(
             "SELECT `task_id`, `flagged`, `date` FROM " . $this->db_tasks
              . " WHERE `tasklist_id` IN (%s) AND `del` = 0 AND NOT " . self::IS_COMPLETE_SQL,
-            join(',', $list_ids)
+            implode(',', $list_ids)
         ));
 
-        $counts = array('all' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'later' => 0);
-        while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
+        $counts = 'all' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'later' => 0;
+        while ($result && ($rec = $this->db->fetch_assoc($result))) {
             $counts'all'++;
-            if (empty($rec'date'))
+            if (empty($rec'date')) {
                 $counts'later'++;
-            else if ($rec'date' == $today)
+            } elseif ($rec'date' == $today) {
                 $counts'today'++;
-            else if ($rec'date' == $tomorrow)
+            } elseif ($rec'date' == $tomorrow) {
                 $counts'tomorrow'++;
-            else if ($rec'date' < $today)
+            } elseif ($rec'date' < $today) {
                 $counts'overdue'++;
-            else if ($rec'date' > $tomorrow)
+            } elseif ($rec'date' > $tomorrow) {
                 $counts'later'++;
+            }
         }
 
         return $counts;
@@ -271,37 +276,35 @@
     /**
      * Get all task records matching the given filter
      *
-     * @param array Hash array wiht filter criterias
-     * @param array List of lists to get tasks from
+     * @param array $filter Hash array wiht filter criterias
+     * @param array $lists  List of lists to get tasks from
      *
      * @return array List of tasks records matchin the criteria
      * @see tasklist_driver::list_tasks()
      */
-    function list_tasks($filter, $lists = null)
+    public function list_tasks($filter, $lists = null)
     {
         if (empty($lists)) {
             $lists = array_keys($this->lists);
-        }
-        else if (!is_array($lists)) {
+        } elseif (!is_array($lists)) {
             $lists = explode(',', (string) $lists);
         }
 
         // only allow to select from lists of this user
-        $list_ids = array_map(array($this->rc->db, 'quote'), array_intersect($lists, array_keys($this->lists)));
+        $list_ids = array_map($this->rc->db, 'quote', array_intersect($lists, array_keys($this->lists)));
         $sql_add  = '';
 
         // add filter criteria
         if ($filter) {
             if (!empty($filter'from') || ($filter'mask' & tasklist::FILTER_MASK_TODAY)) {
-                $sql_add .= " AND (`date` IS NULL OR `date` >= " . $this->rc->db->quote($filter'from') . ")";
+                $sql_add .= " AND (`date` IS NULL OR `date` >= " . $this->db->quote($filter'from') . ")";
             }
 
             if (!empty($filter'to')) {
                 if ($filter'mask' & tasklist::FILTER_MASK_OVERDUE) {
-                    $sql_add .= " AND (`date` IS NOT NULL AND `date` <= " . $this->rc->db->quote($filter'to') . ")";
-                }
-                else {
-                    $sql_add .= " AND (`date` IS NULL OR `date` <= " . $this->rc->db->quote($filter'to') . ")";
+                    $sql_add .= " AND (`date` IS NOT NULL AND `date` <= " . $this->db->quote($filter'to') . ")";
+                } else {
+                    $sql_add .= " AND (`date` IS NULL OR `date` <= " . $this->db->quote($filter'to') . ")";
                 }
             }
 
@@ -311,8 +314,7 @@
 
             if ($filter'mask' & tasklist::FILTER_MASK_COMPLETE) {
                 $sql_add .= " AND " . self::IS_COMPLETE_SQL;
-            }
-            else if (empty($filter'since')) {
+            } elseif (empty($filter'since')) {
                 // don't show complete tasks by default
                 $sql_add .= " AND NOT " . self::IS_COMPLETE_SQL;
             }
@@ -324,31 +326,32 @@
             // compose (slow) SQL query for searching
             // FIXME: improve searching using a dedicated col and normalized values
             if ($filter'search') {
-                $sql_query = array();
-                foreach (array('title', 'description', 'organizer', 'attendees') as $col) {
-                    $sql_query = $this->rc->db->ilike($col, '%' . $filter'search' . '%');
+                $sql_query = ;
+                foreach ('title', 'description', 'organizer', 'attendees' as $col) {
+                    $sql_query = $this->db->ilike($col, '%' . $filter'search' . '%');
                 }
-                $sql_add = " AND (" . join(" OR ", $sql_query) . ")";
+                $sql_add = " AND (" . implode(" OR ", $sql_query) . ")";
             }
 
             if (!empty($filter'since') && is_numeric($filter'since')) {
-                $sql_add .= " AND `changed` >= " . $this->rc->db->quote(date('Y-m-d H:i:s', $filter'since'));
+                $sql_add .= " AND `changed` >= " . $this->db->quote(date('Y-m-d H:i:s', $filter'since'));
             }
 
             if (!empty($filter'uid')) {
-                $sql_add .= " AND `uid` IN (" . implode(',', array_map(array($this->rc->db, 'quote'), $filter'uid')) . ")";
+                $sql_add .= " AND `uid` IN (" . implode(',', array_map($this->rc->db, 'quote', $filter'uid')) . ")";
             }
         }
 
-        $tasks = array();
+        $tasks = ;
         if (!empty($list_ids)) {
-            $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks
-                . " WHERE `tasklist_id` IN (" . join(',', $list_ids) . ")"
+            $result = $this->db->query(
+                "SELECT * FROM " . $this->db_tasks
+                . " WHERE `tasklist_id` IN (" . implode(',', $list_ids) . ")"
                     . " AND `del` = 0" . $sql_add
                 . " ORDER BY `parent_id`, `task_id` ASC"
             );
 
-            while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
+            while ($result && ($rec = $this->db->fetch_assoc($result))) {
                 $tasks = $this->_read_postprocess($rec);
             }
         }
@@ -359,28 +362,29 @@
     /**
      * Return data of a specific task
      *
-     * @param mixed   Hash array with task properties or task UID
-     * @param integer Bitmask defining filter criterias.
-     *                See FILTER_* constants for possible values.
+     * @param mixed $prop   Hash array with task properties or task UID
+     * @param int   $filter Bitmask defining filter criterias.
+     *                      See FILTER_* constants for possible values.
      *
-     * @return array Hash array with task properties or false if not found
+     * @return array|false Hash array with task properties or false if not found
      */
     public function get_task($prop, $filter = 0)
     {
         if (is_string($prop)) {
-            $prop'uid' = $prop;
+            $prop = 'uid' => $prop;
         }
 
         $query_col = !empty($prop'id') ? 'task_id' : 'uid';
 
-        $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks
+        $result = $this->db->query(
+            "SELECT * FROM " . $this->db_tasks
             . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"
             . " AND `$query_col` = ? AND `del` = 0",
             !empty($prop'id') ? $prop'id' : $prop'uid'
         );
 
-        if ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
-             return $this->_read_postprocess($rec);
+        if ($result && ($rec = $this->db->fetch_assoc($result))) {
+            return $this->_read_postprocess($rec);
         }
 
         return false;
@@ -389,8 +393,8 @@
     /**
      * Get all decendents of the given task record
      *
-     * @param mixed   Hash array with task properties or task UID
-     * @param boolean True if all childrens children should be fetched
+     * @param mixed $prop      Hash array with task properties or task UID
+     * @param bool  $recursive True if all childrens children should be fetched
      *
      * @return array List of all child task IDs
      */
@@ -398,30 +402,30 @@
     {
         // resolve UID first
         if (is_string($prop)) {
-            $result = $this->rc->db->query(
+            $result = $this->db->query(
                 "SELECT `task_id` AS id, `tasklist_id` AS list FROM " . $this->db_tasks
                 . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"
                     . " AND `uid` = ?",
                 $prop
             );
 
-            $prop = $this->rc->db->fetch_assoc($result);
+            $prop = $this->db->fetch_assoc($result);
         }
 
-        $childs   = array();
-        $task_ids = array($prop'id');
+        $childs   = ;
+        $task_ids = $prop'id';
 
         // query for childs (recursively)
         while (!empty($task_ids)) {
-            $result = $this->rc->db->query(
+            $result = $this->db->query(
                 "SELECT `task_id` AS id FROM " . $this->db_tasks
                 . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"
-                    . " AND `parent_id` IN (" . join(',', array_map(array($this->rc->db, 'quote'), $task_ids)) . ")"
+                    . " AND `parent_id` IN (" . implode(',', array_map($this->rc->db, 'quote', $task_ids)) . ")"
                     . " AND `del` = 0"
             );
 
-            $task_ids = array();
-            while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
+            $task_ids = ;
+            while ($result && ($rec = $this->db->fetch_assoc($result))) {
                 $childs   = $rec'id';
                 $task_ids = $rec'id';
             }
@@ -437,39 +441,39 @@
     /**
      * Get a list of pending alarms to be displayed to the user
      *
-     * @param integer Current time (unix timestamp)
-     * @param mixed   List of list IDs to show alarms for (either as array or comma-separated string)
+     * @param int   $time  Current time (unix timestamp)
+     * @param mixed $lists List of list IDs to show alarms for (either as array or comma-separated string)
      *
-     * @return array   A list of alarms, each encoded as hash array with task properties
+     * @return array A list of alarms, each encoded as hash array with task properties
      * @see tasklist_driver::pending_alarms()
      */
     public function pending_alarms($time, $lists = null)
     {
         if (empty($lists)) {
             $lists = array_keys($this->lists);
-        }
-        else if (!is_array($lists)) {
+        } elseif (!is_array($lists)) {
             $lists = explode(',', (string) $lists);
         }
 
         // only allow to select from calendars with activated alarms
-        $list_ids = array();
+        $list_ids = ;
         foreach ($lists as $lid) {
             if ($this->lists$lid && $this->lists$lid'showalarms') {
                 $list_ids = $lid;
             }
         }
-        $list_ids = array_map(array($this->rc->db, 'quote'), $list_ids);
+        $list_ids = array_map($this->rc->db, 'quote', $list_ids);
 
-        $alarms = array();
+        $alarms = ;
         if (!empty($list_ids)) {
-            $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks
-                . " WHERE `tasklist_id` IN (" . join(',', $list_ids) . ")"
-                    . " AND `notify` <= " . $this->rc->db->fromunixtime($time)
+            $result = $this->db->query(
+                "SELECT * FROM " . $this->db_tasks
+                . " WHERE `tasklist_id` IN (" . implode(',', $list_ids) . ")"
+                    . " AND `notify` <= " . $this->db->fromunixtime($time)
                     . " AND NOT " . self::IS_COMPLETE_SQL
             );
 
-            while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
+            while ($result && ($rec = $this->db->fetch_assoc($result))) {
                 $alarms = $this->_read_postprocess($rec);
             }
         }
@@ -487,20 +491,21 @@
         // set new notifyat time or unset if not snoozed
         $notify_at = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
 
-        $query = $this->rc->db->query("UPDATE " . $this->db_tasks
-            . " SET `changed` = " . $this->rc->db->now() . ", `notify` = ?"
+        $query = $this->db->query(
+            "UPDATE " . $this->db_tasks
+            . " SET `changed` = " . $this->db->now() . ", `notify` = ?"
             . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
             $notify_at,
             $task_id
         );
 
-        return $this->rc->db->affected_rows($query);
+        return $this->db->affected_rows($query);
     }
 
     /**
      * Remove alarm dismissal or snooze state
      *
-     * @param  string  Task identifier
+     * @param string $id Task identifier
      */
     public function clear_alarms($id)
     {
@@ -545,7 +550,7 @@
     /**
      * Add a single task to the database
      *
-     * @param array Hash array with task properties (see header of this file)
+     * @param array $prop Hash array with task properties (see header of this file)
      *
      * @return mixed New event ID on success, False on error
      * @see tasklist_driver::create_task()
@@ -570,16 +575,17 @@
             $prop'complete' = number_format($prop'complete', 2, '.', '');
         }
 
-        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status', 'complete') as $col) {
+        foreach ('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status', 'complete' as $col) {
             if (empty($prop$col)) {
                 $prop$col = null;
             }
         }
 
         $notify_at = $this->_get_notification($prop);
-        $now       = $this->rc->db->now();
+        $now       = $this->db->now();
 
-        $result = $this->rc->db->query("INSERT INTO " . $this->db_tasks
+        $result = $this->db->query(
+            "INSERT INTO " . $this->db_tasks
             . " (`tasklist_id`, `uid`, `parent_id`, `created`, `changed`, `title`, `date`, `time`,"
                 . " `startdate`, `starttime`, `description`, `tags`, `flagged`, `complete`, `status`,"
                 . " `alarms`, `recurrence`, `notify`)"
@@ -593,17 +599,17 @@
             $prop'startdate',
             $prop'starttime',
             isset($prop'description') ? strval($prop'description') : '',
-            !empty($prop'tags') ? join(',', (array)$prop'tags') : '',
+            !empty($prop'tags') ? implode(',', (array)$prop'tags') : '',
             !empty($prop'flagged') ? 1 : 0,
             $prop'complete' ?: 0,
             strval($prop'status'),
-            isset($prop'alarms') ? $prop'alarms' : '',
-            isset($prop'recurrence') ? $prop'recurrence' : '',
+            $prop'alarms' ?? '',
+            $prop'recurrence' ?? '',
             $notify_at
         );
 
         if ($result) {
-            return $this->rc->db->insert_id($this->db_tasks);
+            return $this->db->insert_id($this->db_tasks);
         }
 
         return false;
@@ -612,9 +618,9 @@
     /**
      * Update an task entry with the given data
      *
-     * @param array Hash array with task properties
+     * @param array $prop Hash array with task properties
      *
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      * @see tasklist_driver::edit_task()
      */
     public function edit_task($prop)
@@ -629,49 +635,50 @@
             $prop'complete' = number_format($prop'complete', 2, '.', '');
         }
 
-        $sql_set = array();
-        foreach (array('title', 'description', 'flagged', 'complete') as $col) {
+        $sql_set = ;
+        foreach ('title', 'description', 'flagged', 'complete' as $col) {
             if (isset($prop$col)) {
-                $sql_set = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($prop$col);
+                $sql_set = $this->db->quote_identifier($col) . '=' . $this->db->quote($prop$col);
             }
         }
-        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence') as $col) {
+        foreach ('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence' as $col) {
             if (isset($prop$col)) {
-                $sql_set = $this->rc->db->quote_identifier($col) . '=' . (empty($prop$col) ? 'NULL' : $this->rc->db->quote($prop$col));
+                $sql_set = $this->db->quote_identifier($col) . '=' . (empty($prop$col) ? 'NULL' : $this->db->quote($prop$col));
             }
         }
         if (isset($prop'status')) {
-            $sql_set = $this->rc->db->quote_identifier('status') . '=' . $this->rc->db->quote($prop'status');
+            $sql_set = $this->db->quote_identifier('status') . '=' . $this->db->quote($prop'status');
         }
         if (isset($prop'tags')) {
-            $sql_set = $this->rc->db->quote_identifier('tags') . '=' . $this->rc->db->quote(join(',', (array)$prop'tags'));
+            $sql_set = $this->db->quote_identifier('tags') . '=' . $this->db->quote(implode(',', (array)$prop'tags'));
         }
 
         if (isset($prop'date') || isset($prop'time') || isset($prop'alarms')) {
             $notify_at = $this->_get_notification($prop);
-            $sql_set = $this->rc->db->quote_identifier('notify') . '=' . (empty($notify_at) ? 'NULL' : $this->rc->db->quote($notify_at));
+            $sql_set = $this->db->quote_identifier('notify') . '=' . (empty($notify_at) ? 'NULL' : $this->db->quote($notify_at));
         }
 
         // moved from another list
         if (!empty($prop'_fromlist') && ($newlist = $prop'list')) {
-            $sql_set = $this->rc->db->quote_identifier('tasklist_id') . '=' . $this->rc->db->quote($newlist);
+            $sql_set = $this->db->quote_identifier('tasklist_id') . '=' . $this->db->quote($newlist);
         }
 
-        $result = $this->rc->db->query("UPDATE " . $this->db_tasks
-            . " SET `changed` = " . $this->rc->db->now() . ($sql_set ? ', ' . join(', ', $sql_set) : '')
+        $result = $this->db->query(
+            "UPDATE " . $this->db_tasks
+            . " SET `changed` = " . $this->db->now() . ($sql_set ? ', ' . implode(', ', $sql_set) : '')
             . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
             $prop'id'
         );
 
-        return $this->rc->db->affected_rows($result);
+        return $this->db->affected_rows($result);
     }
 
     /**
      * Move a single task to another list
      *
-     * @param array   Hash array with task properties
+     * @param array $prop Hash array with task properties
      *
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      * @see tasklist_driver::move_task()
      */
     public function move_task($prop)
@@ -682,50 +689,56 @@
     /**
      * Remove a single task from the database
      *
-     * @param array   Hash array with task properties
-     * @param boolean Remove record irreversible
+     * @param array $prop  Hash array with task properties
+     * @param bool  $force Remove record irreversible
      *
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      * @see tasklist_driver::delete_task()
      */
     public function delete_task($prop, $force = true)
     {
+        if (empty($prop'id')) {
+            return false;
+        }
+
         $task_id = $prop'id';
 
-        if ($task_id && $force) {
-            $result = $this->rc->db->query("DELETE FROM " . $this->db_tasks
+        if ($force) {
+            $result = $this->db->query(
+                "DELETE FROM " . $this->db_tasks
                 . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
                 $task_id
             );
-        }
-        else if ($task_id) {
-            $result = $this->rc->db->query("UPDATE " . $this->db_tasks
-                . " SET `changed` = " . $this->rc->db->now() . ", `del` = 1"
+        } else {
+            $result = $this->db->query(
+                "UPDATE " . $this->db_tasks
+                . " SET `changed` = " . $this->db->now() . ", `del` = 1"
                 . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
                 $task_id
             );
         }
 
-        return $this->rc->db->affected_rows($result);
+        return $this->db->affected_rows($result) > 0;
     }
 
     /**
      * Restores a single deleted task (if supported)
      *
-     * @param array Hash array with task properties
+     * @param array $prop Hash array with task properties
      *
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      * @see tasklist_driver::undelete_task()
      */
     public function undelete_task($prop)
     {
-        $result = $this->rc->db->query("UPDATE " . $this->db_tasks
-            . " SET `changed` = " . $this->rc->db->now() . ", `del` = 0"
+        $result = $this->db->query(
+            "UPDATE " . $this->db_tasks
+            . " SET `changed` = " . $this->db->now() . ", `del` = 0"
             . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
             $prop'id'
         );
 
-        return $this->rc->db->affected_rows($result);
+        return $this->db->affected_rows($result);
     }
 
     /**
@@ -768,22 +781,21 @@
                 if ($alarm'trigger'0 == '@') {
                     try {
                         $valarms$i'trigger' = new DateTime(substr($alarm'trigger', 1));
-                    }
-                    catch (Exception $e) {
+                    } catch (Exception $e) {
                         unset($valarms$i);
                     }
                 }
             }
         }
         // convert legacy alarms data
-        else if (strlen($alarms)) {
-            list($trigger, $action) = explode(':', $alarms, 2);
+        elseif (strlen($alarms)) {
+            $trigger, $action = explode(':', $alarms, 2);
             if ($trigger = libcalendaring::parse_alarm_value($trigger)) {
-                $valarms = array(array('action' => $action, 'trigger' => $trigger3 ?: $trigger0));
+                $valarms = 'action' => $action, 'trigger' => $trigger3 ?: $trigger0;
             }
         }
 
-        return $valarms;
+        return $valarms ?? null;
     }
 
     /**
@@ -811,14 +823,12 @@
                 if ($val0 == '@') {
                     try {
                         $recurrence$k = new DateTime(substr($val, 1));
-                    }
-                    catch (Exception $e) {
+                    } catch (Exception $e) {
                         unset($recurrence$k);
                     }
                 }
             }
-        }
-        else {
+        } else {
             $recurrence = '';
         }
 
@@ -830,19 +840,19 @@
      */
     public function user_delete($args)
     {
-        $db = $this->rc->db;
+        $lists = $this->db->query("SELECT `tasklist_id` FROM " . $this->db_lists . " WHERE `user_id` = ?", $args'user'->ID);
 
-        $lists = $db->query("SELECT `tasklist_id` FROM " . $this->db_lists . " WHERE `user_id` = ?", $args'user'->ID);
-
-        $list_ids = array();
-        while ($row = $db->fetch_assoc($lists)) {
+        $list_ids = ;
+        while ($row = $this->db->fetch_assoc($lists)) {
             $list_ids = $row'tasklist_id';
         }
 
         if (!empty($list_ids)) {
-            foreach (array($this->db_tasks, $this->db_lists) as $table) {
-                $db->query(sprintf("DELETE FROM $table WHERE `tasklist_id` IN (%s)", join(',', $list_ids)));
+            foreach ($this->db_tasks, $this->db_lists as $table) {
+                $this->db->query(sprintf("DELETE FROM $table WHERE `tasklist_id` IN (%s)", implode(',', $list_ids)));
             }
         }
+
+        return $args;
     }
 }

roundcubemail-1.5.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

@@ -29,15 +29,15 @@
     public $attachments = true;
     public $attendees   = true;
     public $undelete    = false; // task undelete action
-    public $alarm_types = array('DISPLAY','AUDIO');
+    public $alarm_types = 'DISPLAY','AUDIO';
     public $search_more_results;
 
     private $rc;
     private $plugin;
     private $lists;
-    private $folders = array();
-    private $tasks   = array();
-    private $tags    = array();
+    private $folders = ;
+    private $tasks   = ;
+    private $tags    = ;
     private $bonnie_api = false;
 
 
@@ -59,7 +59,7 @@
         // get configuration for the Bonnie API
         $this->bonnie_api = libkolab::get_bonnie_api();
 
-        $this->plugin->register_action('folder-acl', array($this, 'folder_acl'));
+        $this->plugin->register_action('folder-acl', $this, 'folder_acl');
     }
 
     /**
@@ -74,15 +74,16 @@
 
         // get all folders that have type "task"
         $folders = kolab_storage::sort_folders(kolab_storage::get_folders('task'));
-        $this->lists = $this->folders = array();
+        $this->lists = $this->folders = ;
 
         $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
 
         // find default folder
         $default_index = 0;
         foreach ($folders as $i => $folder) {
-            if ($folder->default && strpos($folder->name, $delim) === false)
+            if ($folder->default && strpos($folder->name, $delim) === false) {
                 $default_index = $i;
+            }
         }
 
         // put default folder (aka INBOX) on top of the list
@@ -92,7 +93,7 @@
             array_unshift($folders, $default_folder);
         }
 
-        $prefs = $this->rc->config->get('kolab_tasklists', array());
+        $prefs = $this->rc->config->get('kolab_tasklists', );
 
         foreach ($folders as $folder) {
             $tasklist = $this->folder_props($folder, $prefs);
@@ -115,18 +116,18 @@
             $editable = true;
             $rights = 'lrswikxtea';
             $alarms = true;
-        }
-        else {
+        } else {
             $alarms = false;
             $rights = 'lr';
             $editable = false;
             if ($myrights = $folder->get_myrights()) {
                 $rights = $myrights;
-                if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false)
+                if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
                     $editable = strpos($rights, 'i') !== false;
+                }
             }
             $info = $folder->get_folder_info();
-            $norename = $readonly || $info'norename' || $info'protected';
+            $norename = !$editable || !empty($info'norename') || !empty($info'protected');
         }
 
         $list_id = $folder->id; #kolab_storage::folder_id($folder->name);
@@ -136,13 +137,13 @@
             $prefs$list_id'showalarms' = $prefs$old_id'showalarms';
         }
 
-        return array(
+        return 
             'id' => $list_id,
             'name' => $folder->get_name(),
             'listname' => $folder->get_foldername(),
             'editname' => $folder->get_foldername(),
             'color' => $folder->get_color('0000CC'),
-            'showalarms' => isset($prefs$list_id'showalarms') ? $prefs$list_id'showalarms' : $alarms,
+            'showalarms' => $prefs$list_id'showalarms' ?? $alarms,
             'editable' => $editable,
             'rights'    => $rights,
             'norename' => $norename,
@@ -150,7 +151,7 @@
             'owner' => $folder->get_owner(),
             'parentfolder' => $folder->get_parent(),
             'default' => $folder->default,
-            'virtual' => !empty($folder->virtual),
+            'virtual' => $folder instanceof kolab_storage_folder_virtual,
             'children' => true,  // TODO: determine if that folder indeed has child folders
             'subscribed' => (bool)$folder->is_subscribed(),
             'removable' => !$folder->default,
@@ -159,14 +160,15 @@
             'class' => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
             'caldavuid' => $folder->get_uid(),
             'history' => !empty($this->bonnie_api),
-        );
+        ;
     }
 
     /**
      * Get a list of available task lists from this source
      *
-     * @param integer Bitmask defining filter criterias.
-     *                See FILTER_* constants for possible values.
+     * @param int        $filter Bitmask defining filter criterias.
+     *                           See FILTER_* constants for possible values.
+     * @param array|null $tree   Folders tree
      */
     public function get_lists($filter = 0, &$tree = null)
     {
@@ -174,9 +176,10 @@
 
         // attempt to create a default list for this user
         if (empty($this->lists) && !isset($this->search_more_results)) {
-            $prop = array('name' => 'Tasks', 'color' => '0000CC', 'default' => true);
-            if ($this->create_list($prop))
+            $prop = 'name' => 'Tasks', 'color' => '0000CC', 'default' => true;
+            if ($this->create_list($prop)) {
                 $this->_read_lists(true);
+            }
         }
 
         $folders = $this->filter_folders($filter);
@@ -187,19 +190,18 @@
         }
 
         $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
-        $prefs = $this->rc->config->get('kolab_tasklists', array());
+        $prefs = $this->rc->config->get('kolab_tasklists', );
 
-        $lists = array();
+        $lists = ;
         foreach ($folders as $folder) {
             $list_id   = $folder->id; // kolab_storage::folder_id($folder->name);
             $imap_path = explode($delim, $folder->name);
 
             // find parent
             do {
-              array_pop($imap_path);
-              $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
-            }
-            while (count($imap_path) > 1 && !$this->folders$parent_id);
+                array_pop($imap_path);
+                $parent_id = kolab_storage::folder_id(implode($delim, $imap_path));
+            } while (count($imap_path) > 1 && !$this->folders$parent_id);
 
             // restore "real" parent ID
             if ($parent_id && !$this->folders$parent_id) {
@@ -211,7 +213,7 @@
 
             // special handling for virtual folders
             if ($folder instanceof kolab_storage_folder_user) {
-                $lists$list_id = array(
+                $lists$list_id = 
                     'id'       => $list_id,
                     'name'     => $fullname,
                     'listname' => $listname,
@@ -222,10 +224,9 @@
                     'group'    => 'other virtual',
                     'class'    => 'user',
                     'parent'   => $parent_id,
-                );
-            }
-            else if (!empty($folder->virtual)) {
-                $lists$list_id = array(
+                ;
+            } elseif ($folder instanceof kolab_storage_folder_virtual) {
+                $lists$list_id = 
                     'id'       => $list_id,
                     'name'     => $fullname,
                     'listname' => $listname,
@@ -235,9 +236,8 @@
                     'group'    => $folder->get_namespace(),
                     'class'    => 'folder',
                     'parent'   => $parent_id,
-                );
-            }
-            else {
+                ;
+            } else {
                 if (!$this->lists$list_id) {
                     $this->lists$list_id = $this->folder_props($folder, $prefs);
                     $this->folders$list_id = $folder;
@@ -253,7 +253,7 @@
     /**
      * Get list of folders according to specified filters
      *
-     * @param integer Bitmask defining restrictions. See FILTER_* constants for possible values.
+     * @param int $filter Bitmask defining restrictions. See FILTER_* constants for possible values.
      *
      * @return array List of task folders
      */
@@ -261,15 +261,14 @@
     {
         $this->_read_lists();
 
-        $folders = array();
+        $folders = ;
         foreach ($this->lists as $id => $list) {
             if (!empty($this->folders$id)) {
                 $folder = $this->folders$id;
 
                 if ($folder->get_namespace() == 'personal') {
                     $folder->editable = true;
-                }
-                else if ($rights = $folder->get_myrights()) {
+                } elseif ($rights = $folder->get_myrights()) {
                     if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
                         $folder->editable = strpos($rights, 'i') !== false;
                     }
@@ -279,11 +278,11 @@
             }
         }
 
-        $plugin = $this->rc->plugins->exec_hook('tasklist_list_filter', array(
+        $plugin = $this->rc->plugins->exec_hook('tasklist_list_filter', 
             'list'      => $folders,
             'filter'    => $filter,
             'tasklists' => $folders,
-        ));
+        );
 
         if ($plugin'abort' || !$filter) {
             return $plugin'tasklists';
@@ -292,12 +291,12 @@
         $personal = $filter & self::FILTER_PERSONAL;
         $shared   = $filter & self::FILTER_SHARED;
 
-        $tasklists = array();
+        $tasklists = ;
         foreach ($folders as $folder) {
             if (($filter & self::FILTER_WRITEABLE) && !$folder->editable) {
                 continue;
             }
-/*
+            /*
             if (($filter & self::FILTER_INSERTABLE) && !$folder->insert) {
                 continue;
             }
@@ -310,7 +309,7 @@
             if (($filter & self::FILTER_CONFIDENTIAL) && $folder->subtype != 'confidential') {
                 continue;
             }
-*/
+            */
             if ($personal || $shared) {
                 $ns = $folder->get_namespace();
                 if (!(($personal && $ns == 'personal') || ($shared && $ns == 'shared'))) {
@@ -327,8 +326,9 @@
     /**
      * Get the kolab_calendar instance for the given calendar ID
      *
-     * @param string List identifier (encoded imap folder name)
-     * @return object kolab_storage_folder Object nor null if list doesn't exist
+     * @param string $id List identifier (encoded imap folder name)
+     *
+     * @return kolab_storage_folder|null Object nor null if list doesn't exist
      */
     protected function get_folder($id)
     {
@@ -339,7 +339,7 @@
             $folder = kolab_storage::get_folder(kolab_storage::id_decode($id));
             if ($folder && $folder->type) {
                 $this->folders$id = $folder;
-                $this->lists$id = $this->folder_props($folder, $this->rc->config->get('kolab_tasklists', array()));
+                $this->lists$id = $this->folder_props($folder, $this->rc->config->get('kolab_tasklists', ));
             }
         }
 
@@ -350,11 +350,12 @@
     /**
      * Create a new list assigned to the current user
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *        name: List name
      *       color: The color of the list
      *  showalarms: True if alarms are enabled
-     * @return mixed ID of the new list on success, False on error
+     *
+     * @return string|false ID of the new list on success, False on error
      */
     public function create_list(&$prop)
     {
@@ -371,21 +372,22 @@
         // create ID
         $id = kolab_storage::folder_id($folder);
 
-        $prefs'kolab_tasklists' = $this->rc->config->get('kolab_tasklists', array());
+        $prefs'kolab_tasklists' = $this->rc->config->get('kolab_tasklists', );
 
-        if (isset($prop'showalarms'))
+        if (isset($prop'showalarms')) {
             $prefs'kolab_tasklists'$id'showalarms' = $prop'showalarms' ? true : false;
+        }
 
-        if ($prefs'kolab_tasklists'$id)
+        if ($prefs'kolab_tasklists'$id) {
             $this->rc->user->save_prefs($prefs);
+        }
 
         // force page reload to properly render folder hierarchy
         if (!empty($prop'parent')) {
             $prop'_reload' = true;
-        }
-        else {
+        } else {
             $folder = kolab_storage::get_folder($folder);
-            $prop += $this->folder_props($folder, array());
+            $prop += $this->folder_props($folder, );
         }
 
         return $id;
@@ -394,12 +396,13 @@
     /**
      * Update properties of an existing tasklist
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *          id: List Identifier
      *        name: List name
      *       color: The color of the list
      *  showalarms: True if alarms are enabled (if supported)
-     * @return boolean True on success, Fales on failure
+     *
+     * @return bool True on success, Fales on failure
      */
     public function edit_list(&$prop)
     {
@@ -417,20 +420,25 @@
             $id = kolab_storage::folder_id($newfolder);
 
             // fallback to local prefs
-            $prefs'kolab_tasklists' = $this->rc->config->get('kolab_tasklists', array());
+            $prefs'kolab_tasklists' = $this->rc->config->get('kolab_tasklists', );
             unset($prefs'kolab_tasklists'$prop'id');
 
-            if (isset($prop'showalarms'))
+            if (isset($prop'showalarms')) {
                 $prefs'kolab_tasklists'$id'showalarms' = $prop'showalarms' ? true : false;
+            }
 
-            if ($prefs'kolab_tasklists'$id)
+            if ($prefs'kolab_tasklists'$id) {
                 $this->rc->user->save_prefs($prefs);
+            }
 
             // force page reload if folder name/hierarchy changed
-            if ($newfolder != $prop'oldname')
+            if ($newfolder != $prop'oldname') {
                 $prop'_reload' = true;
+            }
 
-            return $id;
+            $list'id' = $id;
+
+            return true;
         }
 
         return false;
@@ -439,28 +447,33 @@
     /**
      * Set active/subscribed state of a list
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *          id: List Identifier
      *      active: True if list is active, false if not
      *   permanent: True if list is to be subscribed permanently
-     * @return boolean True on success, Fales on failure
+     *
+     * @return bool True on success, Fales on failure
      */
     public function subscribe_list($prop)
     {
         if ($prop'id' && ($folder = $this->get_folder($prop'id'))) {
             $ret = false;
-            if (isset($prop'permanent'))
+            if (isset($prop'permanent')) {
                 $ret |= $folder->subscribe(intval($prop'permanent'));
-            if (isset($prop'active'))
+            }
+            if (isset($prop'active')) {
                 $ret |= $folder->activate(intval($prop'active'));
+            }
 
             // apply to child folders, too
             if (!empty($prop'recursive')) {
                 foreach ((array) kolab_storage::list_folders($folder->name, '*', 'task') as $subfolder) {
-                    if (isset($prop'permanent'))
+                    if (isset($prop'permanent')) {
                         ($prop'permanent' ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
-                    if (isset($prop'active'))
+                    }
+                    if (isset($prop'active')) {
                         ($prop'active' ? kolab_storage::folder_activate($subfolder) : kolab_storage::folder_deactivate($subfolder));
+                    }
                 }
             }
 
@@ -473,9 +486,9 @@
     /**
      * Delete the given list with all its contents
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *      id: list Identifier
-     * @return boolean True on success, Fales on failure
+     * @return bool True on success, Fales on failure
      */
     public function delete_list($prop)
     {
@@ -493,44 +506,46 @@
     /**
      * Search for shared or otherwise not listed tasklists the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
+     *
      * @return array List of tasklists
      */
     public function search_lists($query, $source)
     {
         if (!kolab_storage::setup()) {
-            return array();
+            return ;
         }
 
         $this->search_more_results = false;
-        $this->lists = $this->folders = array();
+        $this->lists = $this->folders = ;
 
         // find unsubscribed IMAP folders that have "event" type
         if ($source == 'folders') {
-            foreach ((array)kolab_storage::search_folders('task', $query, array('other')) as $folder) {
+            foreach ((array)kolab_storage::search_folders('task', $query, 'other') as $folder) {
                 $this->folders$folder->id = $folder;
-                $this->lists$folder->id = $this->folder_props($folder, array());
+                $this->lists$folder->id = $this->folder_props($folder, );
             }
         }
         // search other user's namespace via LDAP
-        else if ($source == 'users') {
+        elseif ($source == 'users') {
             $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
-            foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
-                $folders = array();
+            foreach (kolab_storage::search_users($query, 0, , $limit * 10) as $user) {
+                $folders = ;
                 // search for tasks folders shared by this user
                 foreach (kolab_storage::list_user_folders($user, 'task', false) as $foldername) {
                     $folders = new kolab_storage_folder($foldername, 'task');
                 }
 
+                $count = 0;
                 if (count($folders)) {
                     $userfolder = new kolab_storage_folder_user($user'kolabtargetfolder', '', $user);
                     $this->folders$userfolder->id = $userfolder;
-                    $this->lists$userfolder->id = $this->folder_props($userfolder, array());
+                    $this->lists$userfolder->id = $this->folder_props($userfolder, );
 
                     foreach ($folders as $folder) {
                         $this->folders$folder->id = $folder;
-                        $this->lists$folder->id = $this->folder_props($folder, array());
+                        $this->lists$folder->id = $this->folder_props($folder, );
                         $count++;
                     }
                 }
@@ -554,7 +569,7 @@
     {
         $config = kolab_storage_config::get_instance();
         $tags   = $config->get_tags();
-        $backend_tags = array_map(function($v) { return $v'name'; }, $tags);
+        $backend_tags = array_map(function ($v) { return $v'name'; }, $tags);
 
         return array_values(array_unique(array_merge($this->tags, $backend_tags)));
     }
@@ -562,7 +577,8 @@
     /**
      * Get number of tasks matching the given filter
      *
-     * @param array List of lists to count tasks of
+     * @param array $lists List of lists to count tasks of
+     *
      * @return array Hash array with counts grouped by status (all|flagged|completed|today|tomorrow|nodate)
      */
     public function count_tasks($lists = null)
@@ -570,8 +586,7 @@
         if (empty($lists)) {
             $lists = $this->_read_lists();
             $lists = array_keys($lists);
-        }
-        else if (is_string($lists)) {
+        } elseif (is_string($lists)) {
             $lists = explode(',', $lists);
         }
 
@@ -580,30 +595,32 @@
         $tomorrow_date = new DateTime('now + 1 day', $this->plugin->timezone);
         $tomorrow      = $tomorrow_date->format('Y-m-d');
 
-        $counts = array('all' => 0, 'today' => 0, 'tomorrow' => 0, 'later' => 0, 'overdue'  => 0);
+        $counts = 'all' => 0, 'today' => 0, 'tomorrow' => 0, 'later' => 0, 'overdue'  => 0;
 
         foreach ($lists as $list_id) {
             if (!$folder = $this->get_folder($list_id)) {
                 continue;
             }
 
-            foreach ($folder->select(array(array('tags','!~','x-complete')), true) as $record) {
+            foreach ($folder->select('tags','!~','x-complete', true) as $record) {
                 $rec = $this->_to_rcube_task($record, $list_id, false);
 
-                if ($this->is_complete($rec))  // don't count complete tasks
+                if ($this->is_complete($rec)) {  // don't count complete tasks
                     continue;
+                }
 
                 $counts'all'++;
-                if (empty($rec'date'))
+                if (empty($rec'date')) {
                     $counts'later'++;
-                else if ($rec'date' == $today)
+                } elseif ($rec'date' == $today) {
                     $counts'today'++;
-                else if ($rec'date' == $tomorrow)
+                } elseif ($rec'date' == $tomorrow) {
                     $counts'tomorrow'++;
-                else if ($rec'date' < $today)
+                } elseif ($rec'date' < $today) {
                     $counts'overdue'++;
-                else if ($rec'date' > $tomorrow)
+                } elseif ($rec'date' > $tomorrow) {
                     $counts'later'++;
+                }
             }
         }
 
@@ -616,13 +633,14 @@
     /**
      * Get all task records matching the given filter
      *
-     * @param array Hash array with filter criterias:
+     * @param array $filter Hash array with filter criterias:
      *  - mask:  Bitmask representing the filter selection (check against tasklist::FILTER_MASK_* constants)
      *  - from:  Date range start as string (Y-m-d)
      *  - to:    Date range end as string (Y-m-d)
      *  - search: Search query string
      *  - uid:   Task UIDs
-     * @param array List of lists to get tasks from
+     * @param array $lists  List of lists to get tasks from
+     *
      * @return array List of tasks records matchin the criteria
      */
     public function list_tasks($filter, $lists = null)
@@ -630,35 +648,35 @@
         if (empty($lists)) {
             $lists = $this->_read_lists();
             $lists = array_keys($lists);
-        }
-        else if (is_string($lists)) {
+        } elseif (is_string($lists)) {
             $lists = explode(',', $lists);
         }
 
         $config  = kolab_storage_config::get_instance();
-        $results = array();
+        $results = ;
 
         // query Kolab storage
-        $query = array();
-        if (!empty($filter'mask') && $filter'mask' & tasklist::FILTER_MASK_COMPLETE)
-            $query = array('tags','~','x-complete');
-        else if (empty($filter'since'))
-            $query = array('tags','!~','x-complete');
+        $query = ;
+        if (!empty($filter'mask') && $filter'mask' & tasklist::FILTER_MASK_COMPLETE) {
+            $query = 'tags','~','x-complete';
+        } elseif (empty($filter'since')) {
+            $query = 'tags','!~','x-complete';
+        }
 
         // full text search (only works with cache enabled)
         if (!empty($filter'search')) {
             $search = mb_strtolower($filter'search');
             foreach (rcube_utils::normalize_string($search, true) as $word) {
-                $query = array('words', '~', $word);
+                $query = 'words', '~', $word;
             }
         }
 
         if (!empty($filter'since')) {
-            $query = array('changed', '>=', $filter'since');
+            $query = 'changed', '>=', $filter'since';
         }
 
         if (!empty($filter'uid')) {
-            $query = array('uid', '=', (array) $filter'uid');
+            $query = 'uid', '=', (array) $filter'uid';
         }
 
         foreach ($lists as $list_id) {
@@ -689,11 +707,11 @@
     /**
      * Return data of a specific task
      *
-     * @param mixed   Hash array with task properties or task UID
-     * @param integer Bitmask defining filter criterias for folders.
-     *                See FILTER_* constants for possible values.
+     * @param mixed $prop   Hash array with task properties or task UID
+     * @param int   $filter Bitmask defining filter criterias for folders.
+     *                      See FILTER_* constants for possible values.
      *
-     * @return array Hash array with task properties or false if not found
+     * @return array|false Hash array with task properties or false if not found
      */
     public function get_task($prop, $filter = 0)
     {
@@ -701,14 +719,16 @@
 
         $id      = $prop'uid';
         $list_id = $prop'list';
-        $folders = $list_id ? array($list_id => $this->get_folder($list_id)) : $this->get_lists($filter);
+        $folders = $list_id ? $list_id => $this->get_folder($list_id) : $this->get_lists($filter);
 
         // find task in the available folders
         foreach ($folders as $list_id => $folder) {
-            if (is_array($folder))
+            if (is_array($folder)) {
                 $folder = $this->folders$list_id;
-            if (is_numeric($list_id) || !$folder)
+            }
+            if (is_numeric($list_id) || !$folder) {
                 continue;
+            }
             if (empty($this->tasks$id) && ($object = $folder->get_object($id))) {
                 $this->load_tags($object);
                 $this->tasks$id = $this->_to_rcube_task($object, $list_id);
@@ -716,36 +736,36 @@
             }
         }
 
-        return $this->tasks$id;
+        return $this->tasks$id ?? false;
     }
 
     /**
      * Get all decendents of the given task record
      *
-     * @param mixed  Hash array with task properties or task UID
-     * @param boolean True if all childrens children should be fetched
+     * @param mixed $prop      Hash array with task properties or task UID
+     * @param bool  $recursive True if all childrens children should be fetched
+     *
      * @return array List of all child task IDs
      */
     public function get_childs($prop, $recursive = false)
     {
         if (is_string($prop)) {
             $task = $this->get_task($prop);
-            $prop = array('uid' => $task'uid', 'list' => $task'list');
-        }
-        else {
+            $prop = 'uid' => $task'uid', 'list' => $task'list';
+        } else {
             $this->_parse_id($prop);
         }
 
-        $childs = array();
+        $childs = ;
         $list_id = $prop'list';
-        $task_ids = array($prop'uid');
+        $task_ids = $prop'uid';
         $folder = $this->get_folder($list_id);
 
         // query for childs (recursively)
         while ($folder && !empty($task_ids)) {
-            $query_ids = array();
+            $query_ids = ;
             foreach ($task_ids as $task_id) {
-                $query = array(array('tags','=','x-parent:' . $task_id));
+                $query = 'tags','=','x-parent:' . $task_id;
                 foreach ($folder->select($query) as $record) {
                     // don't rely on kolab_storage_folder filtering
                     if ($record'parent_id' == $task_id) {
@@ -755,8 +775,9 @@
                 }
             }
 
-            if (!$recursive)
+            if (!$recursive) {
                 break;
+            }
 
             $task_ids = $query_ids;
         }
@@ -767,8 +788,9 @@
     /**
      * Provide a list of revisions for the given task
      *
-     * @param array  $task Hash array with task properties
-     * @return array List of changes, each as a hash array
+     * @param array $prop Hash array with task properties
+     *
+     * @return array|false List of changes, each as a hash array
      * @see tasklist_driver::get_task_changelog()
      */
     public function get_task_changelog($prop)
@@ -777,7 +799,7 @@
             return false;
         }
 
-        list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
+        $uid, $mailbox, $msguid = $this->_resolve_task_identity($prop);
 
         $result = $uid && $mailbox ? $this->bonnie_api->changelog('task', $uid, $mailbox, $msguid) : null;
         if (is_array($result) && $result'uid' == $uid) {
@@ -790,10 +812,10 @@
     /**
      * Return full data of a specific revision of an event
      *
-     * @param mixed  $task UID string or hash array with task properties
-     * @param mixed  $rev Revision number
+     * @param mixed $prop UID string or hash array with task properties
+     * @param mixed $rev  Revision number
      *
-     * @return array Task object as hash array
+     * @return array|false Task object as hash array
      * @see tasklist_driver::get_task_revision()
      */
     public function get_task_revison($prop, $rev)
@@ -805,7 +827,7 @@
         $this->_parse_id($prop);
         $uid     = $prop'uid';
         $list_id = $prop'list';
-        list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
+        $uid, $mailbox, $msguid = $this->_resolve_task_identity($prop);
 
         // call Bonnie API
         $result = $this->bonnie_api->get('task', $uid, $rev, $mailbox, $msguid);
@@ -829,10 +851,10 @@
      * Command the backend to restore a certain revision of a task.
      * This shall replace the current object with an older version.
      *
-     * @param mixed  $task UID string or hash array with task properties
-     * @param mixed  $rev Revision number
+     * @param mixed $prop UID string or hash array with task properties
+     * @param mixed $rev  Revision number
      *
-     * @return boolean True on success, False on failure
+     * @return bool True on success, False on failure
      * @see tasklist_driver::restore_task_revision()
      */
     public function restore_task_revision($prop, $rev)
@@ -844,7 +866,7 @@
         $this->_parse_id($prop);
         $uid     = $prop'uid';
         $list_id = $prop'list';
-        list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
+        $uid, $mailbox, $msguid = $this->_resolve_task_identity($prop);
 
         $folder  = $this->get_folder($list_id);
         $success = false;
@@ -868,10 +890,11 @@
     /**
      * Get a list of property changes beteen two revisions of a task object
      *
-     * @param array  $task Hash array with task properties
-     * @param mixed  $rev   Revisions: "from:to"
+     * @param array $prop Hash array with task properties
+     * @param mixed $rev1 Revision "from"
+     * @param mixed $rev2 Revision "to"
      *
-     * @return array List of property changes, each as a hash array
+     * @return array|false List of property changes, each as a hash array
      * @see tasklist_driver::get_task_diff()
      */
     public function get_task_diff($prop, $rev1, $rev2)
@@ -879,15 +902,15 @@
         $this->_parse_id($prop);
         $uid     = $prop'uid';
         $list_id = $prop'list';
-        list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);
+        $uid, $mailbox, $msguid = $this->_resolve_task_identity($prop);
 
         // call Bonnie API
-        $result = $this->bonnie_api->diff('task', $uid, $rev1, $rev2, $mailbox, $msguid, $instance_id);
+        $result = $this->bonnie_api->diff('task', $uid, $rev1, $rev2, $mailbox, $msguid);
         if (is_array($result) && $result'uid' == $uid) {
             $result'rev1' = $rev1;
             $result'rev2' = $rev2;
 
-            $keymap = array(
+            $keymap = 
                 'start'    => 'start',
                 'due'      => 'date',
                 'dstamp'   => 'changed',
@@ -899,15 +922,15 @@
                 'related-to' => 'parent_id',
                 'percent-complete' => 'complete',
                 'lastmodified-date' => 'changed',
-            );
-            $prop_keymaps = array(
-                'attachments' => array('fmttype' => 'mimetype', 'label' => 'name'),
-                'attendees'   => array('partstat' => 'status'),
-            );
-            $special_changes = array();
+            ;
+            $prop_keymaps = 
+                'attachments' => 'fmttype' => 'mimetype', 'label' => 'name',
+                'attendees'   => 'partstat' => 'status',
+            ;
+            $special_changes = ;
 
             // map kolab event properties to keys the client expects
-            array_walk($result'changes', function(&$change, $i) use ($keymap, $prop_keymaps, $special_changes) {
+            array_walk($result'changes', function (&$change, $i) use ($keymap, $prop_keymaps, &$special_changes) {
                 if (array_key_exists($change'property', $keymap)) {
                     $change'property' = $keymap$change'property';
                 }
@@ -918,17 +941,19 @@
                 }
                 // map alarms trigger value
                 if ($change'property' == 'alarms') {
-                    if (is_array($change'old') && is_array($change'old''trigger'))
+                    if (is_array($change'old') && is_array($change'old''trigger')) {
                         $change'old''trigger' = $change'old''trigger''value';
-                    if (is_array($change'new') && is_array($change'new''trigger'))
+                    }
+                    if (is_array($change'new') && is_array($change'new''trigger')) {
                         $change'new''trigger' = $change'new''trigger''value';
+                    }
                 }
                 // make all property keys uppercase
                 if ($change'property' == 'recurrence') {
                     $special_changes'recurrence' = $i;
-                    foreach (array('old','new') as $m) {
+                    foreach ('old','new' as $m) {
                         if (is_array($change$m)) {
-                            $props = array();
+                            $props = ;
                             foreach ($change$m as $k => $v) {
                                 $propsstrtoupper($k) = $v;
                             }
@@ -938,36 +963,34 @@
                 }
                 // map property keys names
                 if (is_array($prop_keymaps$change'property')) {
-                  foreach ($prop_keymaps$change'property' as $k => $dest) {
-                    if (is_array($change'old') && array_key_exists($k, $change'old')) {
-                        $change'old'$dest = $change'old'$k;
-                        unset($change'old'$k);
-                    }
-                    if (is_array($change'new') && array_key_exists($k, $change'new')) {
-                        $change'new'$dest = $change'new'$k;
-                        unset($change'new'$k);
+                    foreach ($prop_keymaps$change'property' as $k => $dest) {
+                        if (is_array($change'old') && array_key_exists($k, $change'old')) {
+                            $change'old'$dest = $change'old'$k;
+                            unset($change'old'$k);
+                        }
+                        if (is_array($change'new') && array_key_exists($k, $change'new')) {
+                            $change'new'$dest = $change'new'$k;
+                            unset($change'new'$k);
+                        }
                     }
-                  }
                 }
 
                 if ($change'property' == 'exdate') {
                     $special_changes'exdate' = $i;
-                }
-                else if ($change'property' == 'rdate') {
+                } elseif ($change'property' == 'rdate') {
                     $special_changes'rdate' = $i;
                 }
             });
 
             // merge some recurrence changes
-            foreach (array('exdate','rdate') as $prop) {
+            foreach ('exdate','rdate' as $prop) {
                 if (array_key_exists($prop, $special_changes)) {
                     $exdate = $result'changes'$special_changes$prop;
                     if (array_key_exists('recurrence', $special_changes)) {
                         $recurrence = &$result'changes'$special_changes'recurrence';
-                    }
-                    else {
+                    } else {
                         $i = count($result'changes');
-                        $result'changes'$i = array('property' => 'recurrence', 'old' => array(), 'new' => array());
+                        $result'changes'$i = 'property' => 'recurrence', 'old' => , 'new' => ;
                         $recurrence = &$result'changes'$i'recurrence';
                     }
                     $key = strtoupper($prop);
@@ -1006,15 +1029,16 @@
             }
         }
 
-        return array($uid, $mailbox, $msguid);
+        return $uid, $mailbox, $msguid;
     }
 
     /**
      * Get a list of pending alarms to be displayed to the user
      *
-     * @param  integer Current time (unix timestamp)
-     * @param  mixed   List of list IDs to show alarms for (either as array or comma-separated string)
-     * @return array   A list of alarms, each encoded as hash array with task properties
+     * @param int   $time  Current time (unix timestamp)
+     * @param mixed $lists List of list IDs to show alarms for (either as array or comma-separated string)
+     *
+     * @return array A list of alarms, each encoded as hash array with task properties
      * @see tasklist_driver::pending_alarms()
      */
     public function pending_alarms($time, $lists = null)
@@ -1029,31 +1053,36 @@
         $last -= $last % $interval;
 
         // only check for alerts once in 5 minutes
-        if ($last == $slot)
-            return array();
+        if ($last == $slot) {
+            return ;
+        }
 
-        if ($lists && is_string($lists))
+        if ($lists && is_string($lists)) {
             $lists = explode(',', $lists);
+        }
 
         $time = $slot + $interval;
 
-        $candidates = array();
-        $query      = array(
-            array('tags', '=', 'x-has-alarms'),
-            array('tags', '!=', 'x-complete')
-        );
+        $dbdata     = ;
+        $candidates = ;
+        $query      = 
+            'tags', '=', 'x-has-alarms',
+            'tags', '!=', 'x-complete',
+        ;
 
         $this->_read_lists();
 
         foreach ($this->lists as $lid => $list) {
             // skip lists with alarms disabled
-            if (!$list'showalarms' || ($lists && !in_array($lid, $lists)))
+            if (!$list'showalarms' || ($lists && !in_array($lid, $lists))) {
                 continue;
+            }
 
             $folder = $this->get_folder($lid);
             foreach ($folder->select($query) as $record) {
-                if (!($record'valarms' || $record'alarms') || $record'status' == 'COMPLETED' || $record'complete' == 100)  // don't trust query :-)
+                if (!($record'valarms' || $record'alarms') || $record'status' == 'COMPLETED' || $record'complete' == 100) {  // don't trust query :-)
                     continue;
+                }
 
                 $task = $this->_to_rcube_task($record, $lid, false);
 
@@ -1061,24 +1090,25 @@
                 $alarm = libcalendaring::get_next_alarm($task, 'task');
                 if ($alarm && $alarm'time' && $alarm'time' <= $time && in_array($alarm'action', $this->alarm_types)) {
                     $id = $alarm'id';  // use alarm-id as primary identifier
-                    $candidates$id = array(
+                    $candidates$id = 
                         'id'       => $id,
                         'title'    => $task'title',
                         'date'     => $task'date',
                         'time'     => $task'time',
                         'notifyat' => $alarm'time',
                         'action'   => $alarm'action',
-                    );
+                    ;
                 }
             }
         }
 
         // get alarm information stored in local database
         if (!empty($candidates)) {
-            $alarm_ids = array_map(array($this->rc->db, 'quote'), array_keys($candidates));
-            $result = $this->rc->db->query("SELECT *"
+            $alarm_ids = array_map($this->rc->db, 'quote', array_keys($candidates));
+            $result = $this->rc->db->query(
+                "SELECT *"
                 . " FROM " . $this->rc->db->table_name('kolab_alarms', true)
-                . " WHERE `alarm_id` IN (" . join(',', $alarm_ids) . ")"
+                . " WHERE `alarm_id` IN (" . implode(',', $alarm_ids) . ")"
                     . " AND `user_id` = ?",
                 $this->rc->user->ID
             );
@@ -1088,16 +1118,18 @@
             }
         }
 
-        $alarms = array();
+        $alarms = ;
         foreach ($candidates as $id => $task) {
-          // skip dismissed
-          if ($dbdata$id'dismissed')
-              continue;
+            // skip dismissed
+            if (!empty($dbdata$id'dismissed')) {
+                continue;
+            }
 
-          // snooze function may have shifted alarm time
-          $notifyat = $dbdata$id'notifyat' ? strtotime($dbdata$id'notifyat') : $task'notifyat';
-          if ($notifyat <= $time)
-              $alarms = $task;
+            // snooze function may have shifted alarm time
+            $notifyat = !empty($dbdata$id'notifyat') ? strtotime($dbdata$id'notifyat') : $task'notifyat';
+            if ($notifyat <= $time) {
+                $alarms = $task;
+            }
         }
 
         return $alarms;
@@ -1107,8 +1139,8 @@
      * (User) feedback after showing an alarm notification
      * This should mark the alarm as 'shown' or snooze it for the given amount of time
      *
-     * @param  string  Task identifier
-     * @param  integer Suspend the alarm for this number of seconds
+     * @param string $id     Task identifier
+     * @param int    $snooze Suspend the alarm for this number of seconds
      */
     public function dismiss_alarm($id, $snooze = 0)
     {
@@ -1139,7 +1171,7 @@
     /**
      * Remove alarm dismissal or snooze state
      *
-     * @param  string  Task identifier
+     * @param string $id Task identifier
      */
     public function clear_alarms($id)
     {
@@ -1166,11 +1198,10 @@
             if (!empty($object'tags')) {
                 $this->tags = array_merge($this->tags, $object'tags');
             }
-        }
-        else {
+        } else {
             $config = kolab_storage_config::get_instance();
             $tags   = $config->get_tags($object'uid');
-            $object'tags' = array_map(function($v) { return $v'name'; }, $tags);
+            $object'tags' = array_map(function ($v) { return $v'name'; }, $tags);
         }
     }
 
@@ -1204,7 +1235,7 @@
     /**
      * Extract uid + list identifiers from the given input
      *
-     * @param mixed array or string with task identifier(s)
+     * @param array|string $prop Array or string with task identifier(s)
      */
     private function _parse_id(&$prop)
     {
@@ -1219,31 +1250,27 @@
             if (!empty($prop'id')) {
                 if (!empty($prop'list')) {
                     $list_id = $prop'_fromlist' ?: $prop'list';
-                    if (strpos($prop'id', $list_id.':') === 0) {
-                        $prop'uid' = substr($prop'id', strlen($list_id)+1);
-                    }
-                    else {
+                    if (strpos($prop'id', $list_id . ':') === 0) {
+                        $prop'uid' = substr($prop'id', strlen($list_id) + 1);
+                    } else {
                         $prop'uid' = $prop'id';
                     }
-                }
-                else {
+                } else {
                     $id_ = $prop'id';
                 }
             }
-        }
-        else {
+        } else {
             $id_ = strval($prop);
-            $prop = array();
+            $prop = ;
         }
 
         // split 'id' into list + uid
         if (!empty($id_)) {
-            list($list, $uid) = explode(':', $id_, 2);
+            $list, $uid = explode(':', $id_, 2);
             if (!empty($uid)) {
                 $prop'uid' = $uid;
                 $prop'list' = $list;
-            }
-            else {
+            } else {
                 $prop'uid' = $id_;
             }
         }
@@ -1255,7 +1282,7 @@
     private function _to_rcube_task($record, $list_id, $all = true)
     {
         $id_prefix = $list_id . ':';
-        $task = array(
+        $task = 
             'id' => $id_prefix . $record'uid',
             'uid' => $record'uid',
             'title' => $record'title' ?? null,
@@ -1272,7 +1299,7 @@
             'tags' => $record'tags' ?? null,
             'list' => $list_id,
             'links' => $record'links' ?? null,
-        );
+        ;
 
         // we can sometimes skip this expensive operation
         if ($all && !array_key_exists('links', $task)) {
@@ -1304,23 +1331,23 @@
 
         if (!empty($record'valarms')) {
             $task'valarms' = $record'valarms';
-        }
-        else if (!empty($record'alarms')) {
+        } elseif (!empty($record'alarms')) {
             $task'alarms' = $record'alarms';
         }
 
         if (!empty($task'attendees')) {
             foreach ((array)$task'attendees' as $i => $attendee) {
                 if (isset($attendee'delegated-from') && is_array($attendee'delegated-from')) {
-                    $task'attendees'$i'delegated-from' = join(', ', $attendee'delegated-from');
+                    $task'attendees'$i'delegated-from' = implode(', ', $attendee'delegated-from');
                 }
                 if (isset($attendee'delegated-to') && is_array($attendee'delegated-to')) {
-                    $task'attendees'$i'delegated-to' = join(', ', $attendee'delegated-to');
+                    $task'attendees'$i'delegated-to' = implode(', ', $attendee'delegated-to');
                 }
             }
         }
 
         if (!empty($record'_attachments')) {
+            $attachments = ;
             foreach ($record'_attachments' as $key => $attachment) {
                 if ($attachment !== false) {
                     if (empty($attachment'name')) {
@@ -1345,7 +1372,7 @@
         $object    = $task;
         $id_prefix = $task'list' . ':';
 
-        $toDT = function($date) {
+        $toDT = function ($date) {
             // Convert DateTime into libcalendaring_datetime
             return libcalendaring_datetime::createFromFormat(
                 'Y-m-d\\TH:i:s',
@@ -1355,7 +1382,7 @@
         };
 
         if (!empty($task'date')) {
-            $object'due' = $toDT(rcube_utils::anytodatetime($task'date'.' '.$task'time', $this->plugin->timezone));
+            $object'due' = $toDT(rcube_utils::anytodatetime($task'date' . ' ' . $task'time', $this->plugin->timezone));
             if (empty($task'time')) {
                 $object'due'->_dateonly = true;
             }
@@ -1363,7 +1390,7 @@
         }
 
         if (!empty($task'startdate')) {
-            $object'start' = $toDT(rcube_utils::anytodatetime($task'startdate'.' '.$task'starttime', $this->plugin->timezone));
+            $object'start' = $toDT(rcube_utils::anytodatetime($task'startdate' . ' ' . $task'starttime', $this->plugin->timezone));
             if (empty($task'starttime')) {
                 $object'start'->_dateonly = true;
             }
@@ -1378,13 +1405,15 @@
         }
 
         $object'complete' = $task'complete' * 100;
-        if ($task'complete' == 1.0 && empty($task'complete'))
+        if ($task'complete' == 1.0 && empty($task'complete')) {
             $object'status' = 'COMPLETED';
+        }
 
-        if (!empty($task'flagged'))
+        if (!empty($task'flagged')) {
             $object'priority' = 1;
-        else
+        } else {
             $object'priority' = ($old'priority' ?? 0) > 1 ? $old'priority' : 0;
+        }
 
         // remove list: prefix from parent_id
         if (!empty($task'parent_id') && strpos($task'parent_id', $id_prefix) === 0) {
@@ -1393,8 +1422,9 @@
 
         // copy meta data (starting with _) from old object
         foreach ((array)$old as $key => $val) {
-            if (!isset($object$key) && $key0 == '_')
+            if (!isset($object$key) && $key0 == '_') {
                 $object$key = $val;
+            }
         }
 
         // copy recurrence rules if the client didn't submit it (#2713)
@@ -1408,8 +1438,7 @@
         // allow sequence increments if I'm the organizer
         if ($this->plugin->is_organizer($object) && empty($object'_method')) {
             unset($object'sequence');
-        }
-        else if (isset($old'sequence') && empty($object'_method')) {
+        } elseif (isset($old'sequence') && empty($object'_method')) {
             $object'sequence' = $old'sequence';
         }
 
@@ -1420,7 +1449,8 @@
     /**
      * Add a single task to the database
      *
-     * @param array Hash array with task properties (see header of tasklist_driver.php)
+     * @param array $task Hash array with task properties (see header of tasklist_driver.php)
+     *
      * @return mixed New task ID on success, False on error
      */
     public function create_task($task)
@@ -1431,19 +1461,23 @@
     /**
      * Update an task entry with the given data
      *
-     * @param array Hash array with task properties (see header of tasklist_driver.php)
-     * @return boolean True on success, False on error
+     * @param array $task Hash array with task properties (see header of tasklist_driver.php)
+     *
+     * @return bool True on success, False on error
      */
     public function edit_task($task)
     {
         $this->_parse_id($task);
         $list_id = $task'list';
         if (!$list_id || !($folder = $this->get_folder($list_id))) {
-            rcube::raise_error(array(
+            rcube::raise_error(
+                
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Invalid list identifer to save task: " . print_r($list_id, true)),
-                true, false);
+                'message' => "Invalid list identifer to save task: " . print_r($list_id, true),
+                true,
+                false
+            );
             return false;
         }
 
@@ -1454,8 +1488,9 @@
 
         // moved from another folder
         if (($task'_fromlist' ?? false) && ($fromfolder = $this->get_folder($task'_fromlist'))) {
-            if (!$fromfolder->move($task'uid', $folder))
+            if (!$fromfolder->move($task'uid', $folder)) {
                 return false;
+            }
 
             unset($task'_fromlist');
         }
@@ -1464,12 +1499,14 @@
         $old = null;
         if (!empty($task'id')) {
             $old = $folder->get_object($task'uid');
-            if (!$old || PEAR::isError($old))
+            if (!$old || PEAR::isError($old)) {
                 return false;
+            }
 
             // merge existing properties if the update isn't complete
-            if (!isset($task'title') || !isset($task'complete'))
+            if (!isset($task'title') || !isset($task'complete')) {
                 $task += $this->_to_rcube_task($old, $list_id);
+            }
         }
 
         // generate new task object from RC input
@@ -1477,14 +1514,16 @@
         $saved  = $folder->save($object, 'task', $task'uid');
 
         if (!$saved) {
-            rcube::raise_error(array(
+            rcube::raise_error(
+                
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Error saving task object to Kolab server"),
-                true, false);
+                'message' => "Error saving task object to Kolab server",
+                true,
+                false
+            );
             $saved = false;
-        }
-        else {
+        } else {
             // save links in configuration.relation object
             $this->save_links($object'uid', $links);
             // save tags in configuration.relation object
@@ -1501,16 +1540,18 @@
     /**
      * Move a single task to another list
      *
-     * @param array   Hash array with task properties:
-     * @return boolean True on success, False on error
+     * @param array $task Hash array with task properties:
+     *
+     * @return bool True on success, False on error
      * @see tasklist_driver::move_task()
      */
     public function move_task($task)
     {
         $this->_parse_id($task);
         $list_id = $task'list';
-        if (!$list_id || !($folder = $this->get_folder($list_id)))
+        if (!$list_id || !($folder = $this->get_folder($list_id))) {
             return false;
+        }
 
         // execute move command
         if ($task'_fromlist' && ($fromfolder = $this->get_folder($task'_fromlist'))) {
@@ -1523,17 +1564,19 @@
     /**
      * Remove a single task from the database
      *
-     * @param array   Hash array with task properties:
-     *      id: Task identifier
-     * @param boolean Remove record irreversible (mark as deleted otherwise, if supported by the backend)
-     * @return boolean True on success, False on error
+     * @param array $task  Hash array with task properties:
+     *                     id: Task identifier
+     * @param bool  $force Remove record irreversible (mark as deleted otherwise, if supported by the backend)
+     *
+     * @return bool True on success, False on error
      */
     public function delete_task($task, $force = true)
     {
         $this->_parse_id($task);
         $list_id = $task'list';
-        if (!$list_id || !($folder = $this->get_folder($list_id)))
+        if (!$list_id || !($folder = $this->get_folder($list_id))) {
             return false;
+        }
 
         $status = $folder->delete($task'uid');
 
@@ -1549,9 +1592,9 @@
     /**
      * Restores a single deleted task (if supported)
      *
-     * @param array Hash array with task properties:
+     * @param array $prop Hash array with task properties:
      *      id: Task identifier
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      */
     public function undelete_task($prop)
     {
@@ -1569,7 +1612,7 @@
      *       list: List identifier
      *        rev: Revision (optional)
      *
-     * @return array Hash array with attachment properties:
+     * @return array|null Hash array with attachment properties:
      *         id: Attachment identifier
      *       name: Attachment name
      *   mimetype: MIME content type of the attachment
@@ -1580,15 +1623,15 @@
         // get old revision of the object
         if ($task'rev') {
             $task = $this->get_task_revison($task, $task'rev');
-        }
-        else {
+        } else {
             $task = $this->get_task($task);
         }
 
         if ($task && !empty($task'attachments')) {
             foreach ($task'attachments' as $att) {
-                if ($att'id' == $id)
+                if ($att'id' == $id) {
                     return $att;
+                }
             }
         }
 
@@ -1604,7 +1647,7 @@
      *       list: List identifier
      *        rev: Revision (optional)
      *
-     * @return string Attachment body
+     * @return string|false Attachment body
      */
     public function get_attachment_body($id, $task)
     {
@@ -1619,7 +1662,7 @@
             $cid = substr($id, 4);
 
             // call Bonnie API and get the raw mime message
-            list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($task);
+            $uid, $mailbox, $msguid = $this->_resolve_task_identity($task);
             if ($msg_raw = $this->bonnie_api->rawdata('task', $uid, $task'rev', $mailbox, $msguid)) {
                 // parse the message and find the part with the matching content-id
                 $message = rcube_mime::parse_message($msg_raw);
@@ -1677,7 +1720,7 @@
     }
 
     /**
-     * 
+     *
      */
     public function tasklist_edit_form($action, $list, $fieldprop)
     {
@@ -1685,14 +1728,14 @@
 
         if ($list'id' && ($list = $this->lists$list'id')) {
             $folder_name = $this->get_folder($list'id')->name; // UTF7
-        }
-        else {
+        } else {
             $folder_name = '';
         }
 
         $storage = $this->rc->get_storage();
         $delim   = $storage->get_hierarchy_delimiter();
-        $form    = array();
+        $form    = ;
+        $options = ;
 
         if (strlen($folder_name)) {
             $path_imap = explode($delim, $folder_name);
@@ -1700,37 +1743,36 @@
             $path_imap = implode($delim, $path_imap);
 
             $options = $storage->folder_info($folder_name);
-        }
-        else {
+        } else {
             $path_imap = '';
         }
 
-        $hidden_fields = array('name' => 'oldname', 'value' => $folder_name);
+        $hidden_fields = 'name' => 'oldname', 'value' => $folder_name;
 
         // folder name (default field)
-        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'taskedit-tasklistname', 'size' => 20));
-        $fieldprop'name''value' = $input_name->show($list'editname', array('disabled' => ($options'norename' || $options'protected')));
+        $input_name = new html_inputfield('name' => 'name', 'id' => 'taskedit-tasklistname', 'size' => 20);
+        $disabled = !empty($options'norename') || !empty($options'protected');
+        $fieldprop'name''value' = $input_name->show($list'editname', 'disabled' => $disabled);
 
         // prevent user from moving folder
-        if (!empty($options) && ($options'norename' || $options'protected')) {
-            $hidden_fields = array('name' => 'parent', 'value' => $path_imap);
-        }
-        else {
-            $select = kolab_storage::folder_selector('task', array('name' => 'parent', 'id' => 'taskedit-parentfolder'), $folder_name);
-            $fieldprop'parent' = array(
+        if ($disabled) {
+            $hidden_fields = 'name' => 'parent', 'value' => $path_imap;
+        } else {
+            $select = kolab_storage::folder_selector('task', 'name' => 'parent', 'id' => 'taskedit-parentfolder', $folder_name);
+            $fieldprop'parent' = 
                 'id'    => 'taskedit-parentfolder',
                 'label' => $this->plugin->gettext('parentfolder'),
                 'value' => $select->show($path_imap),
-            );
+            ;
         }
 
         // General tab
-        $form'properties' = array(
+        $form'properties' = 
             'name' => $this->rc->gettext('properties'),
-            'fields' => array(),
-        );
+            'fields' => ,
+        ;
 
-        foreach (array('name','parent','showalarms') as $f) {
+        foreach ('name','parent','showalarms' as $f) {
             $form'properties''fields'$f = $fieldprop$f;
         }

roundcubemail-1.5.tar.gz/plugins/tasklist/drivers/tasklist_driver.php Changed

@@ -22,47 +22,47 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
- /**
-  * Struct of an internal task object how it is passed from/to the driver classes:
-  *
-  *  $task = array(
-  *            'id' => 'Task ID used for editing',  // must be unique for the current user
-  *     'parent_id' => 'ID of parent task',  // null if top-level task
-  *           'uid' => 'Unique identifier of this task',
-  *          'list' => 'Task list identifier to add the task to or where the task is stored',
-  *       'changed' => <DateTime>,  // Last modification date/time of the record
-  *         'title' => 'Event title/summary',
-  *   'description' => 'Event description',
-  *          'tags' => array(),      // List of tags for this task
-  *          'date' => 'Due date',   // as string of format YYYY-MM-DD or null if no date is set
-  *          'time' => 'Due time',   // as string of format hh::ii or null if no due time is set
-  *     'startdate' => 'Start date'  // Delay start of the task until that date
-  *     'starttime' => 'Start time'  // ...and time
-  *    'categories' => 'Task category',
-  *       'flagged' => 'Boolean value whether this record is flagged',
-  *      'complete' => 'Float value representing the completeness state (range 0..1)',
-  *      'status'   => 'Task status string according to (NEEDS-ACTION, IN-PROCESS, COMPLETED, CANCELLED) RFC 2445',
-  *       'valarms' => array(           // List of reminders (new format), each represented as a hash array:
-  *                array(
-  *                   'trigger' => '-PT90M',     // ISO 8601 period string prefixed with '+' or '-', or DateTime object
-  *                    'action' => 'DISPLAY|EMAIL|AUDIO',
-  *                  'duration' => 'PT15M',      // ISO 8601 period string
-  *                    'repeat' => 0,            // number of repetitions
-  *               'description' => '',           // text to display for DISPLAY actions
-  *                   'summary' => '',           // message text for EMAIL actions
-  *                 'attendees' => array(),      // list of email addresses to receive alarm messages
-  *                ),
-  *    ),
-  *    'recurrence' => array(   // Recurrence definition according to iCalendar (RFC 2445) specification as list of key-value pairs
-  *              'FREQ' => 'DAILY|WEEKLY|MONTHLY|YEARLY',
-  *          'INTERVAL' => 1...n,
-  *             'UNTIL' => DateTime,
-  *             'COUNT' => 1..n,     // number of times
-  *             'RDATE' => array(),  // complete list of DateTime objects denoting individual repeat dates
-  *     ),
-  *     '_fromlist' => 'List identifier where the task was stored before',
-  *  );
-  */
+/**
+ * Struct of an internal task object how it is passed from/to the driver classes:
+ *
+ *  $task = array(
+ *            'id' => 'Task ID used for editing',  // must be unique for the current user
+ *     'parent_id' => 'ID of parent task',  // null if top-level task
+ *           'uid' => 'Unique identifier of this task',
+ *          'list' => 'Task list identifier to add the task to or where the task is stored',
+ *       'changed' => <DateTime>,  // Last modification date/time of the record
+ *         'title' => 'Event title/summary',
+ *   'description' => 'Event description',
+ *          'tags' => array(),      // List of tags for this task
+ *          'date' => 'Due date',   // as string of format YYYY-MM-DD or null if no date is set
+ *          'time' => 'Due time',   // as string of format hh::ii or null if no due time is set
+ *     'startdate' => 'Start date'  // Delay start of the task until that date
+ *     'starttime' => 'Start time'  // ...and time
+ *    'categories' => 'Task category',
+ *       'flagged' => 'Boolean value whether this record is flagged',
+ *      'complete' => 'Float value representing the completeness state (range 0..1)',
+ *      'status'   => 'Task status string according to (NEEDS-ACTION, IN-PROCESS, COMPLETED, CANCELLED) RFC 2445',
+ *       'valarms' => array(           // List of reminders (new format), each represented as a hash array:
+ *                array(
+ *                   'trigger' => '-PT90M',     // ISO 8601 period string prefixed with '+' or '-', or DateTime object
+ *                    'action' => 'DISPLAY|EMAIL|AUDIO',
+ *                  'duration' => 'PT15M',      // ISO 8601 period string
+ *                    'repeat' => 0,            // number of repetitions
+ *               'description' => '',           // text to display for DISPLAY actions
+ *                   'summary' => '',           // message text for EMAIL actions
+ *                 'attendees' => array(),      // list of email addresses to receive alarm messages
+ *                ),
+ *    ),
+ *    'recurrence' => array(   // Recurrence definition according to iCalendar (RFC 2445) specification as list of key-value pairs
+ *              'FREQ' => 'DAILY|WEEKLY|MONTHLY|YEARLY',
+ *          'INTERVAL' => 1...n,
+ *             'UNTIL' => DateTime,
+ *             'COUNT' => 1..n,     // number of times
+ *             'RDATE' => array(),  // complete list of DateTime objects denoting individual repeat dates
+ *     ),
+ *     '_fromlist' => 'List identifier where the task was stored before',
+ *  );
+ */
 
 /**
  * Driver interface for the Tasklist plugin
@@ -79,148 +79,155 @@
     public $alarm_absolute = true;
     public $last_error;
 
-    const FILTER_ALL           = 0;
-    const FILTER_WRITEABLE     = 1;
-    const FILTER_INSERTABLE    = 2;
-    const FILTER_ACTIVE        = 4;
-    const FILTER_PERSONAL      = 8;
-    const FILTER_PRIVATE       = 16;
-    const FILTER_CONFIDENTIAL  = 32;
-    const FILTER_SHARED        = 64;
+    public const FILTER_ALL           = 0;
+    public const FILTER_WRITEABLE     = 1;
+    public const FILTER_INSERTABLE    = 2;
+    public const FILTER_ACTIVE        = 4;
+    public const FILTER_PERSONAL      = 8;
+    public const FILTER_PRIVATE       = 16;
+    public const FILTER_CONFIDENTIAL  = 32;
+    public const FILTER_SHARED        = 64;
 
 
     /**
      * Get a list of available task lists from this source
-     * @param integer Bitmask defining filter criterias.
-     *                See FILTER_* constants for possible values.
+     * @param int $filter Bitmask defining filter criterias.
+     *                    See FILTER_* constants for possible values.
      */
-    abstract function get_lists($filter = 0);
+    abstract public function get_lists($filter = 0);
 
     /**
      * Create a new list assigned to the current user
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *        name: List name
      *       color: The color of the list
      *  showalarms: True if alarms are enabled
-     * @return mixed ID of the new list on success, False on error
+     *
+     * @return string|false ID of the new list on success, False on error
      */
-    abstract function create_list(&$prop);
+    abstract public function create_list(&$prop);
 
     /**
      * Update properties of an existing tasklist
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *          id: List Identifier
      *        name: List name
      *       color: The color of the list
      *  showalarms: True if alarms are enabled (if supported)
-     * @return boolean True on success, Fales on failure
+     *
+     * @return bool True on success, Fales on failure
      */
-    abstract function edit_list(&$prop);
+    abstract public function edit_list(&$prop);
 
     /**
      * Set active/subscribed state of a list
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *          id: List Identifier
      *      active: True if list is active, false if not
-     * @return boolean True on success, Fales on failure
+     * @return bool True on success, Fales on failure
      */
-    abstract function subscribe_list($prop);
+    abstract public function subscribe_list($prop);
 
     /**
      * Delete the given list with all its contents
      *
-     * @param array Hash array with list properties
+     * @param array $prop Hash array with list properties
      *      id: list Identifier
-     * @return boolean True on success, Fales on failure
+     * @return bool True on success, Fales on failure
      */
-    abstract function delete_list($prop);
+    abstract public function delete_list($prop);
 
     /**
      * Search for shared or otherwise not listed tasklists the user has access
      *
-     * @param string Search string
-     * @param string Section/source to search
+     * @param string $query  Search string
+     * @param string $source Section/source to search
+     *
      * @return array List of tasklists
      */
-    abstract function search_lists($query, $source);
+    abstract public function search_lists($query, $source);
 
     /**
      * Get number of tasks matching the given filter
      *
-     * @param array List of lists to count tasks of
+     * @param array $lists List of lists to count tasks of
+     *
      * @return array Hash array with counts grouped by status (all|flagged|completed|today|tomorrow|nodate)
      */
-    abstract function count_tasks($lists = null);
+    abstract public function count_tasks($lists = null);
 
     /**
      * Get all task records matching the given filter
      *
-     * @param array Hash array with filter criterias:
+     * @param array $filter Hash array with filter criterias:
      *  - mask:  Bitmask representing the filter selection (check against tasklist::FILTER_MASK_* constants)
      *  - from:  Date range start as string (Y-m-d)
      *  - to:    Date range end as string (Y-m-d)
      *  - search: Search query string
-     * @param array List of lists to get tasks from
+     * @param array $lists List of lists to get tasks from
+     *
      * @return array List of tasks records matchin the criteria
      */
-    abstract function list_tasks($filter, $lists = null);
+    abstract public function list_tasks($filter, $lists = null);
 
     /**
      * Get a list of tags to assign tasks to
      *
      * @return array List of tags
      */
-    abstract function get_tags();
+    abstract public function get_tags();
 
     /**
      * Get a list of pending alarms to be displayed to the user
      *
-     * @param  integer Current time (unix timestamp)
-     * @param  mixed   List of list IDs to show alarms for (either as array or comma-separated string)
-     * @return array   A list of alarms, each encoded as hash array with task properties
+     * @param int          $time  Current time (unix timestamp)
+     * @param string|array $lists List of list IDs to show alarms for (either as array or comma-separated string)
+     *
+     * @return array A list of alarms, each encoded as hash array with task properties
      *         id: Task identifier
      *        uid: Unique identifier of this task
      *       date: Task due date
      *       time: Task due time
      *      title: Task title/summary
      */
-    abstract function pending_alarms($time, $lists = null);
+    abstract public function pending_alarms($time, $lists = null);
 
     /**
      * (User) feedback after showing an alarm notification
      * This should mark the alarm as 'shown' or snooze it for the given amount of time
      *
-     * @param  string  Task identifier
-     * @param  integer Suspend the alarm for this number of seconds
+     * @param string $id     Task identifier
+     * @param int    $snooze Suspend the alarm for this number of seconds
      */
-    abstract function dismiss_alarm($id, $snooze = 0);
+    abstract public function dismiss_alarm($id, $snooze = 0);
 
     /**
      * Remove alarm dismissal or snooze state
      *
-     * @param  string  Task identifier
+     * @param string $id Task identifier
      */
     abstract public function clear_alarms($id);
 
     /**
      * Return data of a specific task
      *
-     * @param mixed   Hash array with task properties or task UID
-     * @param integer Bitmask defining filter criterias for folders.
-     *                See FILTER_* constants for possible values.
+     * @param mixed $prop   Hash array with task properties or task UID
+     * @param int   $filter Bitmask defining filter criterias for folders.
+     *                      See FILTER_* constants for possible values.
      *
-     * @return array Hash array with task properties or false if not found
+     * @return array|false Hash array with task properties or false if not found
      */
     abstract public function get_task($prop, $filter = 0);
 
     /**
      * Get decendents of the given task record
      *
-     * @param mixed  Hash array with task properties or task UID
-     * @param boolean True if all childrens children should be fetched
+     * @param mixed $prop      Hash array with task properties or task UID
+     * @param bool  $recursive True if all childrens children should be fetched
+     *
      * @return array List of all child task IDs
      */
     abstract public function get_childs($prop, $recursive = false);
@@ -228,47 +235,51 @@
     /**
      * Add a single task to the database
      *
-     * @param array Hash array with task properties (see header of this file)
+     * @param array $prop Hash array with task properties (see header of this file)
+     *
      * @return mixed New event ID on success, False on error
      */
-    abstract function create_task($prop);
+    abstract public function create_task($prop);
 
     /**
      * Update an task entry with the given data
      *
-     * @param array Hash array with task properties (see header of this file)
-     * @return boolean True on success, False on error
+     * @param array $prop Hash array with task properties (see header of this file)
+     *
+     * @return bool True on success, False on error
      */
-    abstract function edit_task($prop);
+    abstract public function edit_task($prop);
 
     /**
      * Move a single task to another list
      *
-     * @param array   Hash array with task properties:
+     * @param array $prop Hash array with task properties:
      *      id: Task identifier
      *      list: New list identifier to move to
      *      _fromlist: Previous list identifier
-     * @return boolean True on success, False on error
+     *
+     * @return bool True on success, False on error
      */
-    abstract function move_task($prop);
+    abstract public function move_task($prop);
 
     /**
      * Remove a single task from the database
      *
-     * @param array   Hash array with task properties:
+     * @param array $prop  Hash array with task properties:
      *      id: Task identifier
      *    list: Tasklist identifer
-     * @param boolean Remove record irreversible (mark as deleted otherwise, if supported by the backend)
-     * @return boolean True on success, False on error
+     * @param bool  $force Remove record irreversible (mark as deleted otherwise, if supported by the backend)
+     *
+     * @return bool True on success, False on error
      */
-    abstract function delete_task($prop, $force = true);
+    abstract public function delete_task($prop, $force = true);
 
     /**
      * Restores a single deleted task (if supported)
      *
-     * @param array Hash array with task properties:
+     * @param array $prop Hash array with task properties:
      *      id: Task identifier
-     * @return boolean True on success, False on error
+     * @return bool True on success, False on error
      */
     public function undelete_task($prop)
     {
@@ -278,41 +289,47 @@
     /**
      * Get attachment properties
      *
-     * @param string $id    Attachment identifier
-     * @param array  $task  Hash array with event properties:
+     * @param string $id   Attachment identifier
+     * @param array  $task Hash array with event properties:
      *         id: Task identifier
      *       list: List identifier
      *        rev: Revision (optional)
      *
-     * @return array Hash array with attachment properties:
+     * @return array|null Hash array with attachment properties:
      *         id: Attachment identifier
      *       name: Attachment name
      *   mimetype: MIME content type of the attachment
      *       size: Attachment size
      */
-    public function get_attachment($id, $task) { }
+    public function get_attachment($id, $task)
+    {
+        return null;
+    }
 
     /**
      * Get attachment body
      *
-     * @param string $id    Attachment identifier
-     * @param array  $task  Hash array with event properties:
+     * @param string $id   Attachment identifier
+     * @param array  $task Hash array with event properties:
      *         id: Task identifier
      *       list: List identifier
      *        rev: Revision (optional)
      *
-     * @return string Attachment body
+     * @return string|false Attachment body
      */
-    public function get_attachment_body($id, $task) { }
+    public function get_attachment_body($id, $task)
+    {
+        return false;
+    }
 
     /**
      * Build a struct representing the given message reference
      *
-     * @param object|string $uri_or_headers rcube_message_header instance holding the message headers
-     *                         or an URI from a stored link referencing a mail message.
-     * @param string $folder  IMAP folder the message resides in
+     * @param rcube_message_header|string $uri_or_headers Message headers or an URI from a stored link
+     *                                                    referencing a mail message.
+     * @param string                      $folder         IMAP folder the message resides in
      *
-     * @return array An struct referencing the given IMAP message
+     * @return array|false A struct referencing the given IMAP message
      */
     public function get_message_reference($uri_or_headers, $folder = null)
     {
@@ -323,10 +340,10 @@
     /**
      * Find tasks assigned to a specified message
      *
-     * @param object $message rcube_message_header instance
-     * @param string $folder  IMAP folder the message resides in
+     * @param rcube_message_header $headers Message headers
+     * @param string               $folder  IMAP folder the message resides in
      *
-     * @param array List of linked task objects
+     * @return array List of linked task objects
      */
     public function get_message_related_tasks($headers, $folder)
     {
@@ -337,8 +354,9 @@
     /**
      * Helper method to determine whether the given task is considered "complete"
      *
-     * @param array  $task  Hash array with event properties
-     * @return boolean True if complete, False otherwiese
+     * @param array $task Hash array with event properties
+     *
+     * @return bool True if complete, False otherwiese
      */
     public function is_complete($task)
     {
@@ -353,7 +371,7 @@
      *         id: Task identifier
      *       list: List identifier
      *
-     * @return array List of changes, each as a hash array:
+     * @return array|false List of changes, each as a hash array:
      *         rev: Revision number
      *        type: Type of the change (create, update, move, delete)
      *        date: Change date
@@ -375,7 +393,7 @@
      * @param mixed  $rev1   Old Revision
      * @param mixed  $rev2   New Revision
      *
-     * @return array List of property changes, each as a hash array:
+     * @return array|false List of property changes, each as a hash array:
      *    property: Revision number
      *         old: Old property value
      *         new: Updated property value
@@ -393,7 +411,7 @@
      *       list: List identifier
      * @param mixed  $rev Revision number
      *
-     * @return array Task object as hash array
+     * @return array|false Task object as hash array
      * @see self::get_task()
      */
     public function get_task_revison($task, $rev)
@@ -405,12 +423,12 @@
      * Command the backend to restore a certain revision of a task.
      * This shall replace the current object with an older version.
      *
-     * @param mixed  $task UID string or hash array with task properties:
+     * @param mixed $task UID string or hash array with task properties:
      *         id: Task identifier
      *       list: List identifier
-     * @param mixed  $rev Revision number
+     * @param mixed $rev Revision number
      *
-     * @return boolean True on success, False on failure
+     * @return bool True on success, False on failure
      */
     public function restore_task_revision($task, $rev)
     {
@@ -421,18 +439,19 @@
      * Build the edit/create form for lists.
      * This gives the drivers the opportunity to add more list properties
      *
-     * @param string  The action called this form
-     * @param array   Tasklist properties
-     * @param array   List with form fields to be rendered
+     * @param string $action     The action called this form
+     * @param array  $list       Tasklist properties
+     * @param array  $formfields List with form fields to be rendered
      *
      * @return string HTML content of the form
      */
     public function tasklist_edit_form($action, $list, $formfields)
     {
+        $rcmail = rcube::get_instance();
         $table = new html_table('cols' => 2, 'class' => 'propform');
 
         foreach ($formfields as $col => $colprop) {
-            $label = !empty($colprop'label') ? $colprop'label' : $rcmail->gettext("$domain.$col");
+            $label = !empty($colprop'label') ? $colprop'label' : $rcmail->gettext("tasklist.{$col}");
 
             $table->add('title', html::label($colprop'id', rcube::Q($label)));
             $table->add(null, $colprop'value');
@@ -462,7 +481,7 @@
     /**
      * Handler for user_delete plugin hook
      *
-     * @param array Hash array with hook arguments
+     * @param array $args Hash array with hook arguments
      * @return array Return arguments for plugin hooks
      */
     public function user_delete($args)

roundcubemail-1.5.tar.gz/plugins/tasklist/localization/en_US.inc Changed

roundcubemail-1.5.tar.gz/plugins/tasklist/tasklist.php Changed

@@ -25,20 +25,20 @@
 #AllowDynamicProperties
 class tasklist extends rcube_plugin
 {
-    const FILTER_MASK_TODAY = 1;
-    const FILTER_MASK_TOMORROW = 2;
-    const FILTER_MASK_WEEK = 4;
-    const FILTER_MASK_LATER = 8;
-    const FILTER_MASK_NODATE = 16;
-    const FILTER_MASK_OVERDUE = 32;
-    const FILTER_MASK_FLAGGED = 64;
-    const FILTER_MASK_COMPLETE = 128;
-    const FILTER_MASK_ASSIGNED = 256;
-    const FILTER_MASK_MYTASKS = 512;
+    public const FILTER_MASK_TODAY = 1;
+    public const FILTER_MASK_TOMORROW = 2;
+    public const FILTER_MASK_WEEK = 4;
+    public const FILTER_MASK_LATER = 8;
+    public const FILTER_MASK_NODATE = 16;
+    public const FILTER_MASK_OVERDUE = 32;
+    public const FILTER_MASK_FLAGGED = 64;
+    public const FILTER_MASK_COMPLETE = 128;
+    public const FILTER_MASK_ASSIGNED = 256;
+    public const FILTER_MASK_MYTASKS = 512;
 
-    const SESSION_KEY = 'tasklist_temp';
+    public const SESSION_KEY = 'tasklist_temp';
 
-    public static $filter_masks = array(
+    public static $filter_masks = 
         'today'    => self::FILTER_MASK_TODAY,
         'tomorrow' => self::FILTER_MASK_TOMORROW,
         'week'     => self::FILTER_MASK_WEEK,
@@ -49,10 +49,10 @@
         'complete' => self::FILTER_MASK_COMPLETE,
         'assigned' => self::FILTER_MASK_ASSIGNED,
         'mytasks'  => self::FILTER_MASK_MYTASKS,
-    );
+    ;
 
     public $task = '?(?!login|logout).*';
-    public $allowed_prefs = array('tasklist_sort_col','tasklist_sort_order');
+    public $allowed_prefs = 'tasklist_sort_col','tasklist_sort_order';
 
     public $rc;
     public $lib;
@@ -65,15 +65,16 @@
     // public $itip;
     // public $ical;
 
-    private $collapsed_tasks = array();
-    private $message_tasks   = array();
-    private $task_titles     = array();
+    private $collapsed_tasks = ;
+    private $message_tasks   = ;
+    private $task_titles     = ;
+    private $task_tree       = ;
 
 
     /**
      * Plugin initialization.
      */
-    function init()
+    public function init()
     {
         $this->require_plugin('libcalendaring');
         $this->require_plugin('libkolab');
@@ -85,10 +86,10 @@
         $this->lib      = libcalendaring::get_instance();
         $this->timezone = $this->lib->timezone;
 
-        $this->register_task('tasks', 'tasklist');
+        $this->register_task('tasks');
 
-        $this->add_hook('startup', array($this, 'startup'));
-        $this->add_hook('user_delete', array($this, 'user_delete'));
+        $this->add_hook('startup', $this, 'startup');
+        $this->add_hook('user_delete', $this, 'user_delete');
     }
 
     /**
@@ -103,53 +104,57 @@
 
         // load localizations
         $this->add_texts('localization/', $args'task' == 'tasks' && (!$args'action' || $args'action' == 'print'));
-        $this->rc->load_language($_SESSION'language', array('tasks.tasks' => $this->gettext('navtitle')));  // add label for task title
+        $this->rc->load_language($_SESSION'language', 'tasks.tasks' => $this->gettext('navtitle'));  // add label for task title
 
         if ($args'task' == 'tasks' && $args'action' != 'save-pref') {
             $this->load_driver();
 
             // register calendar actions
-            $this->register_action('index', array($this, 'tasklist_view'));
-            $this->register_action('task', array($this, 'task_action'));
-            $this->register_action('tasklist', array($this, 'tasklist_action'));
-            $this->register_action('counts', array($this, 'fetch_counts'));
-            $this->register_action('fetch', array($this, 'fetch_tasks'));
-            $this->register_action('print', array($this, 'print_tasks'));
-            $this->register_action('dialog-ui', array($this, 'mail_message2task'));
-            $this->register_action('get-attachment', array($this, 'attachment_get'));
-            $this->register_action('upload', array($this, 'attachment_upload'));
-            $this->register_action('import', array($this, 'import_tasks'));
-            $this->register_action('export', array($this, 'export_tasks'));
-            $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
-            $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
-            $this->register_action('itip-status', array($this, 'task_itip_status'));
-            $this->register_action('itip-remove', array($this, 'task_itip_remove'));
-            $this->register_action('itip-decline-reply', array($this, 'mail_itip_decline_reply'));
-            $this->register_action('itip-delegate', array($this, 'mail_itip_delegate'));
-            $this->add_hook('refresh', array($this, 'refresh'));
+            $this->register_action('index', $this, 'tasklist_view');
+            $this->register_action('task', $this, 'task_action');
+            $this->register_action('tasklist', $this, 'tasklist_action');
+            $this->register_action('counts', $this, 'fetch_counts');
+            $this->register_action('fetch', $this, 'fetch_tasks');
+            $this->register_action('print', $this, 'print_tasks');
+            $this->register_action('dialog-ui', $this, 'mail_message2task');
+            $this->register_action('get-attachment', $this, 'attachment_get');
+            $this->register_action('upload', $this, 'attachment_upload');
+            $this->register_action('import', $this, 'import_tasks');
+            $this->register_action('export', $this, 'export_tasks');
+            $this->register_action('mailimportitip', $this, 'mail_import_itip');
+            $this->register_action('mailimportattach', $this, 'mail_import_attachment');
+            $this->register_action('itip-status', $this, 'task_itip_status');
+            $this->register_action('itip-remove', $this, 'task_itip_remove');
+            $this->register_action('itip-decline-reply', $this, 'mail_itip_decline_reply');
+            $this->register_action('itip-delegate', $this, 'mail_itip_delegate');
+            $this->add_hook('refresh', $this, 'refresh');
 
             $this->collapsed_tasks = array_filter(explode(',', $this->rc->config->get('tasklist_collapsed_tasks', '')));
-        }
-        else if ($args'task' == 'mail') {
+        } elseif ($args'task' == 'mail') {
             if ($args'action' == 'show' || $args'action' == 'preview') {
                 if ($this->rc->config->get('tasklist_mail_embed', true)) {
-                    $this->add_hook('message_load', array($this, 'mail_message_load'));
+                    $this->add_hook('message_load', $this, 'mail_message_load');
                 }
-                $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
+                $this->add_hook('template_object_messagebody', $this, 'mail_messagebody_html');
             }
 
             // add 'Create event' item to message menu
             if ($this->api->output->type == 'html' && (empty($_GET'_rel') || $_GET'_rel' != 'task')) {
-                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
-                    $this->api->output->button(array(
-                        'command'  => 'tasklist-create-from-mail',
-                        'label'    => 'tasklist.createfrommail',
-                        'type'     => 'link',
-                        'classact' => 'icon taskaddlink active',
-                        'class'    => 'icon taskaddlink disabled',
-                        'innerclass' => 'icon taskadd',
-                    ))),
-                'messagemenu');
+                $this->api->add_content(
+                    html::tag(
+                        'li',
+                        'role' => 'menuitem',
+                        $this->api->output->button(
+                            'command'  => 'tasklist-create-from-mail',
+                            'label'    => 'tasklist.createfrommail',
+                            'type'     => 'link',
+                            'classact' => 'icon taskaddlink active',
+                            'class'    => 'icon taskaddlink disabled',
+                            'innerclass' => 'icon taskadd',
+                        )
+                    ),
+                    'messagemenu'
+                );
 
                 $this->api->output->add_label('tasklist.createfrommail');
             }
@@ -168,8 +173,8 @@
         }
 
         // add hooks for alarms handling
-        $this->add_hook('pending_alarms', array($this, 'pending_alarms'));
-        $this->add_hook('dismiss_alarms', array($this, 'dismiss_alarms'));
+        $this->add_hook('pending_alarms', $this, 'pending_alarms');
+        $this->add_hook('dismiss_alarms', $this, 'dismiss_alarms');
     }
 
     /**
@@ -222,302 +227,305 @@
         }
 
         switch ($action) {
-        case 'new':
-            $oldrec = null;
-            $rec = $this->prepare_task($rec);
-            $rec'uid' = $this->generate_uid();
-            $temp_id = !empty($rec'tempid') ? $rec'tempid' : null;
-            if ($success = $this->driver->create_task($rec)) {
-                $refresh = $this->driver->get_task($rec);
-                if ($temp_id) $refresh'tempid' = $temp_id;
-                $this->cleanup_task($rec);
-            }
-            break;
-
-        case 'complete':
-            $complete = intval(rcube_utils::get_input_value('complete', rcube_utils::INPUT_POST));
-            if (!($rec = $this->driver->get_task($rec))) {
+            case 'new':
+                $oldrec = null;
+                $rec = $this->prepare_task($rec);
+                $rec'uid' = $this->generate_uid();
+                $temp_id = !empty($rec'tempid') ? $rec'tempid' : null;
+                if ($success = $this->driver->create_task($rec)) {
+                    $refresh = $this->driver->get_task($rec);
+                    if ($temp_id) {
+                        $refresh'tempid' = $temp_id;
+                    }
+                    $this->cleanup_task($rec);
+                }
                 break;
-            }
 
-            $oldrec = $rec;
-            $rec'status' = $complete ? 'COMPLETED' : ($rec'complete' > 0 ? 'IN-PROCESS' : 'NEEDS-ACTION');
+            case 'complete':
+                $complete = intval(rcube_utils::get_input_value('complete', rcube_utils::INPUT_POST));
+                if (!($rec = $this->driver->get_task($rec))) {
+                    break;
+                }
+
+                $oldrec = $rec;
+                $rec'status' = $complete ? 'COMPLETED' : ($rec'complete' > 0 ? 'IN-PROCESS' : 'NEEDS-ACTION');
 
-            // sent itip notifications if enabled (no user interaction here)
-            if (($itip_send_option & 1)) {
-                if ($this->is_attendee($rec)) {
-                    $rec'_reportpartstat' = $rec'status';
-                }
-                else if ($this->is_organizer($rec)) {
-                    $rec'_notify' = 1;
+                // sent itip notifications if enabled (no user interaction here)
+                if (($itip_send_option & 1)) {
+                    if ($this->is_attendee($rec)) {
+                        $rec'_reportpartstat' = $rec'status';
+                    } elseif ($this->is_organizer($rec)) {
+                        $rec'_notify' = 1;
+                    }
                 }
-            }
 
-        case 'edit':
-            $oldrec = $this->driver->get_task($rec);
-            $rec = $this->prepare_task($rec);
-            $clone = $this->handle_recurrence($rec, $this->driver->get_task($rec));
-            if ($success = $this->driver->edit_task($rec)) {
-                $new_task = $this->driver->get_task($rec);
-                $new_task'tempid' = $rec'id';
-                $refresh = $new_task;
-                $this->cleanup_task($rec);
-
-                // add clone from recurring task
-                if ($clone && $this->driver->create_task($clone)) {
-                    $new_clone = $this->driver->get_task($clone);
-                    $new_clone'tempid' = $clone'id';
-                    $refresh = $new_clone;
-                    $this->driver->clear_alarms($rec'id');
-                }
-
-                // move all childs if list assignment was changed
-                if (!empty($rec'_fromlist') && !empty($rec'list') && $rec'_fromlist' != $rec'list') {
-                    foreach ($this->driver->get_childs(array('id' => $rec'id', 'list' => $rec'_fromlist'), true) as $cid) {
-                        $child = array('id' => $cid, 'list' => $rec'list', '_fromlist' => $rec'_fromlist');
-                        if ($this->driver->move_task($child)) {
-                            $r = $this->driver->get_task($child);
-                            if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
-                                $r'tempid' = $cid;
-                                $refresh = $r;
+                // no break
+            case 'edit':
+                $oldrec = $this->driver->get_task($rec);
+                $rec = $this->prepare_task($rec);
+                $clone = $this->handle_recurrence($rec, $this->driver->get_task($rec));
+                if ($success = $this->driver->edit_task($rec)) {
+                    $new_task = $this->driver->get_task($rec);
+                    $new_task'tempid' = $rec'id';
+                    $refresh = $new_task;
+                    $this->cleanup_task($rec);
+
+                    // add clone from recurring task
+                    if ($clone && $this->driver->create_task($clone)) {
+                        $new_clone = $this->driver->get_task($clone);
+                        $new_clone'tempid' = $clone'id';
+                        $refresh = $new_clone;
+                        $this->driver->clear_alarms($rec'id');
+                    }
+
+                    // move all childs if list assignment was changed
+                    if (!empty($rec'_fromlist') && !empty($rec'list') && $rec'_fromlist' != $rec'list') {
+                        foreach ($this->driver->get_childs('id' => $rec'id', 'list' => $rec'_fromlist', true) as $cid) {
+                            $child = 'id' => $cid, 'list' => $rec'list', '_fromlist' => $rec'_fromlist';
+                            if ($this->driver->move_task($child)) {
+                                $r = $this->driver->get_task($child);
+                                if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
+                                    $r'tempid' = $cid;
+                                    $refresh = $r;
+                                }
                             }
                         }
                     }
                 }
-            }
-            break;
+                break;
 
-          case 'move':
-              foreach ((array)$rec'id' as $id) {
-                  $r = $rec;
-                  $r'id' = $id;
-                  if ($this->driver->move_task($r) && ($new_task = $this->driver->get_task($r))) {
-                      $new_task'tempid' = $id;
-                      $refresh = $new_task;
-                      $success = true;
-
-                      // move all childs, too
-                      foreach ($this->driver->get_childs(array('id' => $id, 'list' => $rec'_fromlist'), true) as $cid) {
-                          $child = $rec;
-                          $child'id' = $cid;
-                          if ($this->driver->move_task($child)) {
-                              $r = $this->driver->get_task($child);
-                              if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
-                                  $r'tempid' = $cid;
-                                  $refresh = $r;
-                              }
-                          }
-                      }
-                  }
-              }
-              break;
-
-        case 'delete':
-            $mode  = intval(rcube_utils::get_input_value('mode', rcube_utils::INPUT_POST));
-            $oldrec = $this->driver->get_task($rec);
-            if ($success = $this->driver->delete_task($rec, false)) {
-                // delete/modify all childs
-                foreach ($this->driver->get_childs($rec, $mode) as $cid) {
-                    $child = array('id' => $cid, 'list' => $rec'list');
-
-                    if ($mode == 1) {  // delete all childs
-                        if ($this->driver->delete_task($child, false)) {
-                            if ($this->driver->undelete)
-                                $_SESSION'tasklist_undelete'$rec'id' = $cid;
-                        }
-                        else
-                            $success = false;
-                    }
-                    else {
-                        $child'parent_id' = strval($oldrec'parent_id');
-                        $this->driver->edit_task($child);
-                    }
-                }
-                // update parent task to adjust list of children
-                if (!empty($oldrec'parent_id')) {
-                    $parent = array('id' => $oldrec'parent_id', 'list' => $rec'list');
-                    if ($parent = $this->driver->get_task($parent)) {
-                        $refresh = $parent;
-                    }
-                }
-            }
-
-            if (!$success)
-                $this->rc->output->command('plugin.reload_data');
-            break;
-
-        case 'undelete':
-            if ($success = $this->driver->undelete_task($rec)) {
-                $refresh = $this->driver->get_task($rec);
-                foreach ((array)$_SESSION'tasklist_undelete'$rec'id' as $cid) {
-                    if ($this->driver->undelete_task($rec)) {
-                        $refresh = $this->driver->get_task($rec);
-                    }
-                }
-            }
-            break;
-
-        case 'collapse':
-            foreach (explode(',', $rec'id') as $rec_id) {
-                if (intval(rcube_utils::get_input_value('collapsed', rcube_utils::INPUT_GPC))) {
-                    $this->collapsed_tasks = $rec_id;
-                }
-                else {
-                    $i = array_search($rec_id, $this->collapsed_tasks);
-                    if ($i !== false)
-                        unset($this->collapsed_tasks$i);
-                }
-            }
-
-            $this->rc->user->save_prefs(array('tasklist_collapsed_tasks' => join(',', array_unique($this->collapsed_tasks))));
-            return;  // avoid further actions
-
-        case 'rsvp':
-            $status = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC);
-            $noreply = intval(rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC)) || $status == 'needs-action';
-            $task = $this->driver->get_task($rec);
-            $task'attendees' = $rec'attendees';
-            $task'_type' = 'task';
+            case 'move':
+                foreach ((array)$rec'id' as $id) {
+                    $r = $rec;
+                    $r'id' = $id;
+                    if ($this->driver->move_task($r) && ($new_task = $this->driver->get_task($r))) {
+                        $new_task'tempid' = $id;
+                        $refresh = $new_task;
+                        $success = true;
 
-            // send invitation to delegatee + add it as attendee
-            if ($status == 'delegated' && $rec'to') {
-                $itip = $this->load_itip();
-                if ($itip->delegate_to($task, $rec'to', (bool)$rec'rsvp')) {
-                    $this->rc->output->show_message('tasklist.itipsendsuccess', 'confirmation');
-                    $refresh = $task;
-                    $noreply = false;
+                        // move all childs, too
+                        foreach ($this->driver->get_childs('id' => $id, 'list' => $rec'_fromlist', true) as $cid) {
+                            $child = $rec;
+                            $child'id' = $cid;
+                            if ($this->driver->move_task($child)) {
+                                $r = $this->driver->get_task($child);
+                                if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
+                                    $r'tempid' = $cid;
+                                    $refresh = $r;
+                                }
+                            }
+                        }
+                    }
                 }
-            }
+                break;
 
-            $rec = $task;
+            case 'delete':
+                $mode  = intval(rcube_utils::get_input_value('mode', rcube_utils::INPUT_POST));
+                $oldrec = $this->driver->get_task($rec);
+                if ($success = $this->driver->delete_task($rec, false)) {
+                    // delete/modify all childs
+                    foreach ($this->driver->get_childs($rec, $mode) as $cid) {
+                        $child = 'id' => $cid, 'list' => $rec'list';
+
+                        if ($mode == 1) {  // delete all childs
+                            if ($this->driver->delete_task($child, false)) {
+                                if ($this->driver->undelete) {
+                                    $_SESSION'tasklist_undelete'$rec'id' = $cid;
+                                }
+                            } else {
+                                $success = false;
+                            }
+                        } else {
+                            $child'parent_id' = strval($oldrec'parent_id');
+                            $this->driver->edit_task($child);
+                        }
+                    }
+                    // update parent task to adjust list of children
+                    if (!empty($oldrec'parent_id')) {
+                        $parent = 'id' => $oldrec'parent_id', 'list' => $rec'list';
+                        if ($parent = $this->driver->get_task($parent)) {
+                            $refresh = $parent;
+                        }
+                    }
+                }
 
-            if ($success = $this->driver->edit_task($rec)) {
-                if (!$noreply) {
-                    // let the reply clause further down send the iTip message
-                    $rec'_reportpartstat' = $status;
-                }
-            }
-            break;
-
-        case 'changelog':
-            $data = $this->driver->get_task_changelog($rec);
-            if (is_array($data) && !empty($data)) {
-                $lib = $this->lib;
-                $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
-                array_walk($data, function(&$change) use ($lib, $dtformat) {
-                  if ($change'date') {
-                      $dt = $lib->adjust_timezone($change'date');
-                      if ($dt instanceof DateTime) {
-                          $change'date' = $this->rc->format_date($dt, $dtformat, false);
-                      }
-                  }
-                });
-                $this->rc->output->command('plugin.task_render_changelog', $data);
-            }
-            else {
-                $this->rc->output->command('plugin.task_render_changelog', false);
-            }
-            $got_msg = true;
-            break;
-
-        case 'diff':
-            $data = $this->driver->get_task_diff($rec, $rec'rev1', $rec'rev2');
-            if (is_array($data)) {
-                // convert some properties, similar to self::_client_event()
-                $lib = $this->lib;
-                $date_format = $this->rc->config->get('date_format', 'Y-m-d');
-                $time_format = $this->rc->config->get('time_format', 'H:i');
-                array_walk($data'changes', function(&$change, $i) use ($lib, $date_format, $time_format) {
-                    // convert date cols
-                    if (in_array($change'property', array('date','start','created','changed'))) {
-                        if (!empty($change'old')) {
-                            $dtformat = strlen($change'old') == 10 ? $date_format : $date_format . ' ' . $time_format;
-                            $change'old_' = $lib->adjust_timezone($change'old', strlen($change'old') == 10)->format($dtformat);
-                        }
-                        if (!empty($change'new')) {
-                            $dtformat = strlen($change'new') == 10 ? $date_format : $date_format . ' ' . $time_format;
-                            $change'new_' = $lib->adjust_timezone($change'new', strlen($change'new') == 10)->format($dtformat);
-                        }
-                    }
-                    // create textual representation for alarms and recurrence
-                    if ($change'property' == 'alarms') {
-                        if (is_array($change'old'))
-                            $change'old_' = libcalendaring::alarm_text($change'old');
-                        if (is_array($change'new'))
-                            $change'new_' = libcalendaring::alarm_text(array_merge((array)$change'old', $change'new'));
-                    }
-                    if ($change'property' == 'recurrence') {
-                        if (is_array($change'old'))
-                            $change'old_' = $lib->recurrence_text($change'old');
-                        if (is_array($change'new'))
-                            $change'new_' = $lib->recurrence_text(array_merge((array)$change'old', $change'new'));
-                    }
-                    if ($change'property' == 'complete') {
-                        $change'old_' = intval($change'old') . '%';
-                        $change'new_' = intval($change'new') . '%';
-                    }
-                    if ($change'property' == 'attachments') {
-                        if (is_array($change'old'))
-                            $change'old''classname' = rcube_utils::file2class($change'old''mimetype', $change'old''name');
-                        if (is_array($change'new')) {
-                            $change'new' = array_merge((array)$change'old', $change'new');
-                            $change'new''classname' = rcube_utils::file2class($change'new''mimetype', $change'new''name');
-                        }
-                    }
-                    // resolve parent_id to the refered task title for display
-                    if ($change'property' == 'parent_id') {
-                        $change'property' = 'parent-title';
-                        if (!empty($change'old') && ($old_parent = $this->driver->get_task(array('id' => $change'old', 'list' => $rec'list')))) {
-                            $change'old_' = $old_parent'title';
-                        }
-                        if (!empty($change'new') && ($new_parent = $this->driver->get_task(array('id' => $change'new', 'list' => $rec'list')))) {
-                            $change'new_' = $new_parent'title';
-                        }
-                    }
-                    // compute a nice diff of description texts
-                    if ($change'property' == 'description') {
-                        $change'diff_' = libkolab::html_diff($change'old', $change'new');
-                    }
-                });
-                $this->rc->output->command('plugin.task_show_diff', $data);
-            }
-            else {
-                $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
-            }
-            $got_msg = true;
-            break;
-
-        case 'show':
-            if ($rec = $this->driver->get_task_revison($rec, $rec'rev')) {
-                $this->encode_task($rec);
-                $rec'readonly' = 1;
-                $this->rc->output->command('plugin.task_show_revision', $rec);
-            }
-            else {
-                $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
-            }
-            $got_msg = true;
-            break;
-
-        case 'restore':
-            if ($success = $this->driver->restore_task_revision($rec, $rec'rev')) {
-                $refresh = $this->driver->get_task($rec);
-                $this->rc->output->command('display_message', $this->gettext(array('name' => 'objectrestoresuccess', 'vars' => array('rev' => $rec'rev'))), 'confirmation');
-                $this->rc->output->command('plugin.close_history_dialog');
-            }
-            else {
-                $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
-            }
-            $got_msg = true;
-            break;
+                if (!$success) {
+                    $this->rc->output->command('plugin.reload_data');
+                }
+                break;
+
+            case 'undelete':
+                if ($success = $this->driver->undelete_task($rec)) {
+                    $refresh = $this->driver->get_task($rec);
+                    foreach ((array)$_SESSION'tasklist_undelete'$rec'id' as $cid) {
+                        if ($this->driver->undelete_task($rec)) {
+                            $refresh = $this->driver->get_task($rec);
+                        }
+                    }
+                }
+                break;
+
+            case 'collapse':
+                foreach (explode(',', $rec'id') as $rec_id) {
+                    if (intval(rcube_utils::get_input_value('collapsed', rcube_utils::INPUT_GPC))) {
+                        $this->collapsed_tasks = $rec_id;
+                    } else {
+                        $i = array_search($rec_id, $this->collapsed_tasks);
+                        if ($i !== false) {
+                            unset($this->collapsed_tasks$i);
+                        }
+                    }
+                }
+
+                $this->rc->user->save_prefs('tasklist_collapsed_tasks' => implode(',', array_unique($this->collapsed_tasks)));
+                return;  // avoid further actions
+
+            case 'rsvp':
+                $status = rcube_utils::get_input_value('status', rcube_utils::INPUT_GPC);
+                $noreply = intval(rcube_utils::get_input_value('noreply', rcube_utils::INPUT_GPC)) || $status == 'needs-action';
+                $task = $this->driver->get_task($rec);
+                $task'attendees' = $rec'attendees';
+                $task'_type' = 'task';
+
+                // send invitation to delegatee + add it as attendee
+                if ($status == 'delegated' && $rec'to') {
+                    $itip = $this->load_itip();
+                    if ($itip->delegate_to($task, $rec'to', (bool)$rec'rsvp')) {
+                        $this->rc->output->show_message('tasklist.itipsendsuccess', 'confirmation');
+                        $refresh = $task;
+                        $noreply = false;
+                    }
+                }
+
+                $rec = $task;
+
+                if ($success = $this->driver->edit_task($rec)) {
+                    if (!$noreply) {
+                        // let the reply clause further down send the iTip message
+                        $rec'_reportpartstat' = $status;
+                    }
+                }
+                break;
+
+            case 'changelog':
+                $data = $this->driver->get_task_changelog($rec);
+                if (is_array($data) && !empty($data)) {
+                    $lib = $this->lib;
+                    $dtformat = $this->rc->config->get('date_format') . ' ' . $this->rc->config->get('time_format');
+                    array_walk($data, function (&$change) use ($lib, $dtformat) {
+                        if ($change'date') {
+                            $dt = $lib->adjust_timezone($change'date');
+                            if ($dt instanceof DateTime) {
+                                $change'date' = $this->rc->format_date($dt, $dtformat, false);
+                            }
+                        }
+                    });
+                    $this->rc->output->command('plugin.task_render_changelog', $data);
+                } else {
+                    $this->rc->output->command('plugin.task_render_changelog', false);
+                }
+                $got_msg = true;
+                break;
+
+            case 'diff':
+                $data = $this->driver->get_task_diff($rec, $rec'rev1', $rec'rev2');
+                if (is_array($data)) {
+                    // convert some properties, similar to self::_client_event()
+                    $lib = $this->lib;
+                    $date_format = $this->rc->config->get('date_format', 'Y-m-d');
+                    $time_format = $this->rc->config->get('time_format', 'H:i');
+                    array_walk($data'changes', function (&$change, $i) use ($lib, $date_format, $time_format, $rec) {
+                        // convert date cols
+                        if (in_array($change'property', 'date','start','created','changed')) {
+                            if (!empty($change'old')) {
+                                $dtformat = strlen($change'old') == 10 ? $date_format : $date_format . ' ' . $time_format;
+                                $change'old_' = $lib->adjust_timezone($change'old', strlen($change'old') == 10)->format($dtformat);
+                            }
+                            if (!empty($change'new')) {
+                                $dtformat = strlen($change'new') == 10 ? $date_format : $date_format . ' ' . $time_format;
+                                $change'new_' = $lib->adjust_timezone($change'new', strlen($change'new') == 10)->format($dtformat);
+                            }
+                        }
+                        // create textual representation for alarms and recurrence
+                        if ($change'property' == 'alarms') {
+                            if (is_array($change'old')) {
+                                $change'old_' = libcalendaring::alarm_text($change'old');
+                            }
+                            if (is_array($change'new')) {
+                                $change'new_' = libcalendaring::alarm_text(array_merge((array)$change'old', $change'new'));
+                            }
+                        }
+                        if ($change'property' == 'recurrence') {
+                            if (is_array($change'old')) {
+                                $change'old_' = $lib->recurrence_text($change'old');
+                            }
+                            if (is_array($change'new')) {
+                                $change'new_' = $lib->recurrence_text(array_merge((array)$change'old', $change'new'));
+                            }
+                        }
+                        if ($change'property' == 'complete') {
+                            $change'old_' = intval($change'old') . '%';
+                            $change'new_' = intval($change'new') . '%';
+                        }
+                        if ($change'property' == 'attachments') {
+                            if (is_array($change'old')) {
+                                $change'old''classname' = rcube_utils::file2class($change'old''mimetype', $change'old''name');
+                            }
+                            if (is_array($change'new')) {
+                                $change'new' = array_merge((array)$change'old', $change'new');
+                                $change'new''classname' = rcube_utils::file2class($change'new''mimetype', $change'new''name');
+                            }
+                        }
+                        // resolve parent_id to the refered task title for display
+                        if ($change'property' == 'parent_id') {
+                            $change'property' = 'parent-title';
+                            if (!empty($change'old') && ($old_parent = $this->driver->get_task('id' => $change'old', 'list' => $rec'list'))) {
+                                $change'old_' = $old_parent'title';
+                            }
+                            if (!empty($change'new') && ($new_parent = $this->driver->get_task('id' => $change'new', 'list' => $rec'list'))) {
+                                $change'new_' = $new_parent'title';
+                            }
+                        }
+                        // compute a nice diff of description texts
+                        if ($change'property' == 'description') {
+                            $change'diff_' = libkolab::html_diff($change'old', $change'new');
+                        }
+                    });
+                    $this->rc->output->command('plugin.task_show_diff', $data);
+                } else {
+                    $this->rc->output->command('display_message', $this->gettext('objectdiffnotavailable'), 'error');
+                }
+                $got_msg = true;
+                break;
+
+            case 'show':
+                if ($rec = $this->driver->get_task_revison($rec, $rec'rev')) {
+                    $this->encode_task($rec);
+                    $rec'readonly' = 1;
+                    $this->rc->output->command('plugin.task_show_revision', $rec);
+                } else {
+                    $this->rc->output->command('display_message', $this->gettext('objectnotfound'), 'error');
+                }
+                $got_msg = true;
+                break;
+
+            case 'restore':
+                if ($success = $this->driver->restore_task_revision($rec, $rec'rev')) {
+                    $refresh = $this->driver->get_task($rec);
+                    $this->rc->output->command('display_message', $this->gettext('name' => 'objectrestoresuccess', 'vars' => 'rev' => $rec'rev'), 'confirmation');
+                    $this->rc->output->command('plugin.close_history_dialog');
+                } else {
+                    $this->rc->output->command('display_message', $this->gettext('objectrestoreerror'), 'error');
+                }
+                $got_msg = true;
+                break;
 
         }
 
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
             $this->update_counts($oldrec, $refresh);
-        }
-        else if (!$got_msg) {
+        } elseif (!$got_msg) {
             $this->rc->output->show_message('tasklist.errorsaving', 'error');
         }
 
@@ -529,16 +537,17 @@
             // only notify if data really changed (TODO: do diff check on client already)
             if (!$oldrec || $action == 'delete' || self::task_diff($task, $oldrec)) {
                 $sent = $this->notify_attendees($task, $oldrec, $action, $rec'_comment');
-                if ($sent > 0)
+                if ($sent > 0) {
                     $this->rc->output->show_message('tasklist.itipsendsuccess', 'confirmation');
-                else if ($sent < 0)
+                } elseif ($sent < 0) {
                     $this->rc->output->show_message('tasklist.errornotifying', 'error');
+                }
             }
         }
 
         if ($success && !empty($rec'_reportpartstat') && $rec'_reportpartstat' != 'NEEDS-ACTION') {
             // get the full record after update
-            if (!$task) {
+            if (empty($task)) {
                 $task = $this->driver->get_task($rec);
             }
 
@@ -547,16 +556,16 @@
                 $sender = $task'attendees'$idx;
                 $status = strtolower($sender'status');
 
-                if (!empty($_POST'comment'))
+                if (!empty($_POST'comment')) {
                     $task'comment' = rcube_utils::get_input_value('comment', rcube_utils::INPUT_POST);
+                }
 
                 $itip = $this->load_itip();
                 $itip->set_sender_email($sender'email');
 
                 if ($itip->send_itip_message($this->to_libcal($task), 'REPLY', $task'organizer', 'itipsubject' . $status, 'itipmailbody' . $status)) {
-                    $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $task'organizer''name' ?: $task'organizer''email'))), 'confirmation');
-                }
-                else {
+                    $this->rc->output->command('display_message', $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $task'organizer''name' ?: $task'organizer''email'), 'confirmation');
+                } else {
                     $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
                 }
             }
@@ -568,15 +577,13 @@
         if (!empty($refresh)) {
             if (!empty($refresh'id')) {
                 $this->encode_task($refresh);
-            }
-            else if (is_array($refresh)) {
+            } elseif (is_array($refresh)) {
                 foreach ($refresh as $i => $r) {
                     $this->encode_task($refresh$i);
                 }
             }
             $this->rc->output->command('plugin.update_task', $refresh);
-        }
-        else if ($success && ($action == 'delete' || $action == 'undelete')) {
+        } elseif ($success && ($action == 'delete' || $action == 'undelete')) {
             $this->rc->output->command('plugin.refresh_tagcloud');
         }
     }
@@ -589,8 +596,8 @@
         if (empty($this->itip)) {
             require_once __DIR__ . '/../libcalendaring/lib/libcalendaring_itip.php';
             $this->itip = new libcalendaring_itip($this, 'tasklist');
-            $this->itip->set_rsvp_actions(array('accepted','declined','delegated'));
-            $this->itip->set_rsvp_status(array('accepted','tentative','declined','delegated','in-process','completed'));
+            $this->itip->set_rsvp_actions('accepted','declined','delegated');
+            $this->itip->set_rsvp_status('accepted','tentative','declined','delegated','in-process','completed');
         }
 
         return $this->itip;
@@ -603,17 +610,17 @@
     {
         // try to be smart and extract date from raw input
         if (!empty($rec'raw')) {
-            foreach (array('today','tomorrow','sunday','monday','tuesday','wednesday','thursday','friday','saturday','sun','mon','tue','wed','thu','fri','sat') as $word) {
+            foreach ('today','tomorrow','sunday','monday','tuesday','wednesday','thursday','friday','saturday','sun','mon','tue','wed','thu','fri','sat' as $word) {
                 $locwords = '/^' . preg_quote(mb_strtolower($this->gettext($word))) . '\b/i';
                 $normwords = $word;
                 $datewords = $word;
             }
-            foreach (array('jan','feb','mar','apr','may','jun','jul','aug','sep','oct','now','dec') as $month) {
-                $locwords = '/(' . preg_quote(mb_strtolower($this->gettext('long'.$month))) . '|' . preg_quote(mb_strtolower($this->gettext($month))) . ')\b/i';
+            foreach ('jan','feb','mar','apr','may','jun','jul','aug','sep','oct','now','dec' as $month) {
+                $locwords = '/(' . preg_quote(mb_strtolower($this->gettext('long' . $month))) . '|' . preg_quote(mb_strtolower($this->gettext($month))) . ')\b/i';
                 $normwords = $month;
                 $datewords = $month;
             }
-            foreach (array('on','this','next','at') as $word) {
+            foreach ('on','this','next','at' as $word) {
                 $fillwords = preg_quote(mb_strtolower($this->gettext($word)));
                 $fillwords = $word;
             }
@@ -622,17 +629,18 @@
             $date_str = '';
 
             // translate localized keywords
-            $raw = preg_replace('/^(' . join('|', $fillwords) . ')\s*/i', '', $raw);
+            $raw = preg_replace('/^(' . implode('|', $fillwords) . ')\s*/i', '', $raw);
             $raw = preg_replace($locwords, $normwords, $raw);
 
             // find date pattern
-            $date_pattern = '!^(\d+./-\s*)?((?:\d+./-)|' . join('|', $datewords) . ')\.?(\s+\d{4})?:;,?\s+!i';
+            $date_pattern = '!^(\d+./-\s*)?((?:\d+./-)|' . implode('|', $datewords) . ')\.?(\s+\d{4})?:;,?\s+!i';
             if (preg_match($date_pattern, $raw, $m)) {
                 $date_str .= $m1 . $m2 . $m3;
-                $raw = preg_replace(array($date_pattern, '/^(' . join('|', $fillwords) . ')\s*/i'), '', $raw);
+                $raw = preg_replace($date_pattern, '/^(' . implode('|', $fillwords) . ')\s*/i', '', $raw);
                 // add year to date string
-                if ($m1 && !$m3)
+                if ($m1 && !$m3) {
                     $date_str .= date('Y');
+                }
             }
 
             // find time pattern
@@ -644,32 +652,38 @@
             }
 
             // yes, raw input matched a (valid) date
-            if (strlen($date_str) && strtotime($date_str) && ($date = new DateTime($date_str, $this->timezone))) {
+            if (strlen($date_str) && strtotime($date_str)) {
+                $date = new DateTime($date_str, $this->timezone);
                 $rec'date' = $date->format('Y-m-d');
-                if ($has_time)
+                if (!empty($has_time)) {
                     $rec'time' = $date->format('H:i');
+                }
                 $rec'title' = $raw;
-            }
-            else
+            } else {
                 $rec'title' = $rec'raw';
+            }
         }
 
         // normalize input from client
         if (isset($rec'complete')) {
             $rec'complete' = floatval($rec'complete');
-            if ($rec'complete' > 1)
+            if ($rec'complete' > 1) {
                 $rec'complete' /= 100;
+            }
         }
-        if (isset($rec'flagged'))
+        if (isset($rec'flagged')) {
             $rec'flagged' = intval($rec'flagged');
+        }
 
         // fix for garbage input
-        if ($rec'description' == 'null')
+        if ($rec'description' == 'null') {
             $rec'description' = '';
+        }
 
         foreach ($rec as $key => $val) {
-            if ($val === 'null')
+            if ($val === 'null') {
                 $rec$key = null;
+            }
         }
 
         if (!empty($rec'date')) {
@@ -687,11 +701,12 @@
 
         // convert the submitted alarm values
         if (!empty($rec'valarms')) {
-            $valarms = array();
+            $valarms = ;
             foreach (libcalendaring::from_client_alarms($rec'valarms') as $alarm) {
                 // alarms can only work with a date (either task start, due or absolute alarm date)
-                if (is_a($alarm'trigger', 'DateTime') || $rec'date' || $rec'startdate')
+                if (is_a($alarm'trigger', 'DateTime') || $rec'date' || $rec'startdate') {
                     $valarms = $alarm;
+                }
             }
             $rec'valarms' = $valarms;
         }
@@ -701,8 +716,7 @@
             $refdate = null;
             if (!empty($rec'date')) {
                 $refdate = new DateTime($rec'date' . ' ' . ($rec'time' ?? ''), $this->timezone);
-            }
-            else if (!empty($rec'startdate')) {
+            } elseif (!empty($rec'startdate')) {
                 $refdate = new DateTime($rec'startdate' . ' ' . ($rec'starttime' ?? ''), $this->timezone);
             }
 
@@ -720,8 +734,7 @@
                         unset($rec'recurrence''COUNT');
                     }
                 }
-            }
-            else {  // recurrence requires a reference date
+            } else {  // recurrence requires a reference date
                 $rec'recurrence' = '';
             }
         }
@@ -731,12 +744,12 @@
 
         // convert link references into simple URIs
         if (array_key_exists('links', $rec)) {
-            $rec'links' = array_map(function($link) { return is_array($link) ? $link'uri' : strval($link); }, (array)$rec'links');
+            $rec'links' = array_map(function ($link) { return is_array($link) ? $link'uri' : strval($link); }, (array)$rec'links');
         }
 
         // convert invalid data
         if (isset($rec'attendees') && !is_array($rec'attendees')) {
-            $rec'attendees' = array();
+            $rec'attendees' = ;
         }
 
         if (!empty($rec'attendees')) {
@@ -750,21 +763,23 @@
         // copy the task status to my attendee partstat
         if (!empty($rec'_reportpartstat')) {
             if (($idx = $this->is_attendee($rec)) !== false) {
-                if (!($rec'_reportpartstat' == 'NEEDS-ACTION' && $rec'attendees'$idx'status' == 'ACCEPTED'))
+                if (!($rec'_reportpartstat' == 'NEEDS-ACTION' && $rec'attendees'$idx'status' == 'ACCEPTED')) {
                     $rec'attendees'$idx'status' = $rec'_reportpartstat';
-                else
+                } else {
                     unset($rec'_reportpartstat');
+                }
             }
         }
 
         // set organizer from identity selector
         if ((isset($rec'_identity') || (!empty($rec'attendees') && empty($rec'organizer'))) &&
                 ($identity = $this->rc->user->get_identity($rec'_identity'))) {
-            $rec'organizer' = array('name' => $identity'name', 'email' => $identity'email');
+            $rec'organizer' = 'name' => $identity'name', 'email' => $identity'email';
         }
 
-        if (is_numeric($rec'id') && $rec'id' < 0)
+        if (is_numeric($rec'id') && $rec'id' < 0) {
             unset($rec'id');
+        }
 
         return $rec;
     }
@@ -790,8 +805,7 @@
             }
 
             return true;
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $rec$date_key = $rec$time_key = null;
         }
 
@@ -817,12 +831,13 @@
         if ($this->driver->is_complete($rec) && $old && !$this->driver->is_complete($old) && !empty($rec'recurrence')) {
             $engine = libcalendaring::get_recurrence();
             $rrule = $rec'recurrence';
-            $updates = array();
+            $updates = ;
 
             // compute the next occurrence of date attributes
-            foreach (array('date'=>'time', 'startdate'=>'starttime') as $date_key => $time_key) {
-                if (empty($rec$date_key))
+            foreach ('date' => 'time', 'startdate' => 'starttime' as $date_key => $time_key) {
+                if (empty($rec$date_key)) {
                     continue;
+                }
 
                 $date = new DateTime($rec$date_key . ' ' . ($rec$time_key ?? ''), $this->timezone);
                 $engine->init($rrule, $date);
@@ -836,7 +851,7 @@
 
             // shift absolute alarm dates
             if (!empty($updates) && is_array($rec'valarms')) {
-                $updates'valarms' = array();
+                $updates'valarms' = ;
                 unset($rrule'UNTIL', $rrule'COUNT');  // make recurrence rule unlimited
 
                 foreach ($rec'valarms' as $i => $alarm) {
@@ -872,6 +887,7 @@
      */
     private function notify_attendees($task, $old, $action = 'edit', $comment = null)
     {
+        $is_cancelled = false;
         if ($action == 'delete' || ($task'status' == 'CANCELLED' && $old'status' != $task'status')) {
             $task'cancelled' = true;
             $is_cancelled      = true;
@@ -893,13 +909,14 @@
         $message = $itip->compose_itip_message($object, $method, $task'sequence' > $old'sequence');
 
         // list existing attendees from the $old task
-        $old_attendees = array();
+        $old_attendees = ;
         foreach ((array)$old'attendees' as $attendee) {
             $old_attendees = $attendee'email';
         }
 
         // send to every attendee
-        $sent = 0; $current = array();
+        $sent = 0;
+        $current = ;
         foreach ((array)$task'attendees' as $attendee) {
             $current = strtolower($attendee'email');
 
@@ -922,13 +939,14 @@
             $is_new   = !in_array($attendee'email', $old_attendees);
             $is_rsvp  = $is_new || $task'sequence' > $old'sequence';
             $bodytext = $is_cancelled ? 'itipcancelmailbody' : ($is_new ? 'invitationmailbody' : 'itipupdatemailbody');
-            $subject  = $is_cancelled ? 'itipcancelsubject'  : ($is_new ? 'invitationsubject' : ($task'title' ? 'itipupdatesubject' : 'itipupdatesubjectempty'));
+            $subject  = $is_cancelled ? 'itipcancelsubject' : ($is_new ? 'invitationsubject' : ($task'title' ? 'itipupdatesubject' : 'itipupdatesubjectempty'));
 
             // finally send the message
-            if ($itip->send_itip_message($object, $method, $attendee, $subject, $bodytext, $message, $is_rsvp))
+            if ($itip->send_itip_message($object, $method, $attendee, $subject, $bodytext, $message, $is_rsvp)) {
                 $sent++;
-            else
+            } else {
                 $sent = -100;
+            }
         }
 
         // send CANCEL message to removed attendees
@@ -939,13 +957,14 @@
 
             $vtodo = $this->to_libcal($old);
             $vtodo'cancelled' = $is_cancelled;
-            $vtodo'attendees' = array($attendee);
+            $vtodo'attendees' = $attendee;
             $vtodo'comment'   = $comment;
 
-            if ($itip->send_itip_message($vtodo, 'CANCEL', $attendee, 'itipcancelsubject', 'itipcancelmailbody'))
+            if ($itip->send_itip_message($vtodo, 'CANCEL', $attendee, 'itipcancelsubject', 'itipcancelmailbody')) {
                 $sent++;
-            else
+            } else {
                 $sent = -100;
+            }
         }
 
         return $sent;
@@ -954,23 +973,26 @@
     /**
      * Compare two task objects and return differing properties
      *
-     * @param array Event A
-     * @param array Event B
+     * @param array $a Event A
+     * @param array $b Event B
+     *
      * @return array List of differing task properties
      */
     public static function task_diff($a, $b)
     {
-        $diff   = array();
-        $ignore = array('changed' => 1, 'attachments' => 1);
+        $diff   = ;
+        $ignore = 'changed' => 1, 'attachments' => 1;
 
         foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
-            if (!$ignore$key && $a$key != $b$key)
+            if (empty($ignore$key) && $a$key != $b$key) {
                 $diff = $key;
+            }
         }
 
         // only compare number of attachments
-        if (count($a'attachments') != count($b'attachments'))
+        if (count($a'attachments') != count($b'attachments')) {
             $diff = 'attachments';
+        }
 
         return $diff;
     }
@@ -983,6 +1005,7 @@
         $action  = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
         $list    = rcube_utils::get_input_value('l', rcube_utils::INPUT_GPC, true);
         $success = false;
+        $jsenv = ;
 
         unset($list'_token');
 
@@ -991,76 +1014,74 @@
         }
 
         switch ($action) {
-        case 'form-new':
-        case 'form-edit':
-            $this->load_ui();
-            echo $this->ui->tasklist_editform($action, $list);
-            exit;
-
-        case 'new':
-            $list += array('showalarms' => true, 'active' => true, 'editable' => true);
-            if ($insert_id = $this->driver->create_list($list)) {
-                $list'id' = $insert_id;
-                if (empty($list'_reload')) {
-                    $this->load_ui();
-                    $list'html' = $this->ui->tasklist_list_item($insert_id, $list, $jsenv);
-                    $list += (array)$jsenv$insert_id;
+            case 'form-new':
+            case 'form-edit':
+                $this->load_ui();
+                echo $this->ui->tasklist_editform($action, $list);
+                exit;
+
+            case 'new':
+                $list += 'showalarms' => true, 'active' => true, 'editable' => true;
+                if ($insert_id = $this->driver->create_list($list)) {
+                    $list'id' = $insert_id;
+                    if (empty($list'_reload')) {
+                        $this->load_ui();
+                        $list'html' = $this->ui->tasklist_list_item($insert_id, $list, $jsenv);
+                        $list += $jsenv$insert_id ?? ; // @phpstan-ignore-line
+                    }
+                    $this->rc->output->command('plugin.insert_tasklist', $list);
+                    $success = true;
                 }
-                $this->rc->output->command('plugin.insert_tasklist', $list);
-                $success = true;
-            }
-            break;
+                break;
 
-        case 'edit':
-            if ($newid = $this->driver->edit_list($list)) {
+            case 'edit':
                 $list'oldid' = $list'id';
-                $list'id' = $newid;
-                $this->rc->output->command('plugin.update_tasklist', $list);
-                $success = true;
-            }
-            break;
-
-        case 'subscribe':
-            $success = $this->driver->subscribe_list($list);
-            break;
-
-        case 'delete':
-            if (($success = $this->driver->delete_list($list)))
-                $this->rc->output->command('plugin.destroy_tasklist', $list);
-            break;
-
-        case 'search':
-            $this->load_ui();
-            $results = array();
-            $query   = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
-            $source  = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+                if ($success = $this->driver->edit_list($list)) {
+                    $this->rc->output->command('plugin.update_tasklist', $list);
+                }
+                break;
 
-            foreach ((array)$this->driver->search_lists($query, $source) as $id => $prop) {
-                $editname = $prop'editname';
-                unset($prop'editname');  // force full name to be displayed
-                $prop'active' = false;
+            case 'subscribe':
+                $success = $this->driver->subscribe_list($list);
+                break;
 
-                // let the UI generate HTML and CSS representation for this calendar
-                $html = $this->ui->tasklist_list_item($id, $prop, $jsenv);
-                $prop += (array)$jsenv$id;
-                $prop'editname' = $editname;
-                $prop'html' = $html;
+            case 'delete':
+                if (($success = $this->driver->delete_list($list))) {
+                    $this->rc->output->command('plugin.destroy_tasklist', $list);
+                }
+                break;
 
-                $results = $prop;
-            }
-            // report more results available
-            if (!empty($this->driver->search_more_results)) {
-                $this->rc->output->show_message('autocompletemore', 'notice');
-            }
+            case 'search':
+                $this->load_ui();
+                $results = ;
+                $query   = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
+                $source  = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+
+                foreach ((array)$this->driver->search_lists($query, $source) as $id => $prop) {
+                    $editname = $prop'editname';
+                    unset($prop'editname');  // force full name to be displayed
+                    $prop'active' = false;
+
+                    // let the UI generate HTML and CSS representation for this calendar
+                    $html = $this->ui->tasklist_list_item($id, $prop, $jsenv);
+                    $prop += $jsenv$id ?? ; // @phpstan-ignore-line
+                    $prop'editname' = $editname;
+                    $prop'html' = $html;
+
+                    $results = $prop;
+                }
+                // report more results available
+                if (!empty($this->driver->search_more_results)) {
+                    $this->rc->output->show_message('autocompletemore', 'notice');
+                }
 
-            $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
-            return;
+                $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
+                return;
         }
 
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
-        }
-        else {
+        } else {
             $this->rc->output->show_message('tasklist.errorsaving', 'error');
         }
 
@@ -1074,14 +1095,15 @@
     {
         if (isset($_REQUEST'lists')) {
             $lists = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
-        }
-        else {
+        } else {
+            $lists = ;
             foreach ($this->driver->get_lists() as $list) {
                 if (!empty($list'active')) {
                     $lists = $list'id';
                 }
             }
         }
+
         $counts = $this->driver->count_tasks($lists);
         $this->rc->output->command('plugin.update_counts', $counts);
     }
@@ -1105,17 +1127,17 @@
         $mask   = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
         $search = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
         $lists  = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
-        $filter = array('mask' => $mask, 'search' => $search);
+        $filter = 'mask' => $mask, 'search' => $search;
 
         $data = $this->tasks_data($this->driver->list_tasks($filter, $lists));
 
-        $this->rc->output->command('plugin.data_ready', array(
+        $this->rc->output->command('plugin.data_ready', 
                 'filter' => $mask,
                 'lists'  => $lists,
                 'search' => $search,
                 'data'   => $data,
                 'tags'   => $this->driver->get_tags(),
-        ));
+        );
     }
 
     /**
@@ -1129,9 +1151,9 @@
         $this->include_stylesheet($skin_path . '/print.css');
         $this->include_script('tasklist.js');
 
-        $this->rc->output->add_handlers(array(
-            'plugin.tasklist_print' => array($this, 'print_tasks_list'),
-        ));
+        $this->rc->output->add_handlers(
+            'plugin.tasklist_print' => $this, 'print_tasks_list',
+        );
 
         $this->rc->output->set_pagetitle($this->gettext('print'));
         $this->rc->output->send('tasklist.print');
@@ -1145,7 +1167,7 @@
         $mask   = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
         $search = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
         $lists  = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
-        $filter = array('mask' => $mask, 'search' => $search);
+        $filter = 'mask' => $mask, 'search' => $search;
 
         $data = $this->tasks_data($this->driver->list_tasks($filter, $lists));
 
@@ -1162,7 +1184,7 @@
      */
     private function tasks_data($records)
     {
-        $data = $this->task_tree = $this->task_titles = array();
+        $data = $this->task_tree = $this->task_titles = ;
 
         foreach ($records as $rec) {
             if (!empty($rec'parent_id')) {
@@ -1175,7 +1197,7 @@
         }
 
         // assign hierarchy level indicators for later sorting
-        array_walk($data, array($this, 'task_walk_tree'));
+        array_walk($data, $this, 'task_walk_tree');
 
         return $data;
     }
@@ -1196,8 +1218,7 @@
         if (!empty($rec'changed') && is_object($rec'changed')) {
             $rec'changed_' = $this->rc->format_date($rec'changed');
             $rec'changed' = $rec'changed'->format('U');
-        }
-        else {
+        } else {
             $rec'changed' = null;
         }
 
@@ -1207,12 +1228,10 @@
                 $rec'datetime' = intval($date->format('U'));
                 $rec'date' = $date->format($this->rc->config->get('date_format', 'Y-m-d'));
                 $rec'_hasdate' = 1;
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $rec'date' = $rec'datetime' = null;
             }
-        }
-        else {
+        } else {
             $rec'date' = $rec'datetime' = null;
             $rec'_hasdate' = 0;
         }
@@ -1222,8 +1241,7 @@
                 $date = new DateTime($rec'startdate' . ' ' . ($rec'starttime' ?? ''), $this->timezone);
                 $rec'startdatetime' = intval($date->format('U'));
                 $rec'startdate' = $date->format($this->rc->config->get('date_format', 'Y-m-d'));
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $rec'startdate' = $rec'startdatetime' = null;
             }
         }
@@ -1295,25 +1313,26 @@
     private function task_walk_tree(&$rec)
     {
         $rec'_depth' = 0;
-        $parent_titles = array();
-        $parent_id = isset($this->task_tree$rec'id') ? $this->task_tree$rec'id' : null;
+        $parent_titles = ;
+        $parent_id = $this->task_tree$rec'id' ?? null;
         while ($parent_id) {
             $rec'_depth'++;
             if (isset($this->task_titles$parent_id)) {
                 array_unshift($parent_titles, $this->task_titles$parent_id);
             }
-            $parent_id = isset($this->task_tree$parent_id) ? $this->task_tree$parent_id : null;
+            $parent_id = $this->task_tree$parent_id ?? null;
         }
 
         if (count($parent_titles)) {
-            $rec'parent_title' = join(' » ', array_filter($parent_titles));
+            $rec'parent_title' = implode(' » ', array_filter($parent_titles));
         }
     }
 
     /**
      * Compute the filter mask of the given task
      *
-     * @param array Hash array with Task record properties
+     * @param array $rec Hash array with Task record properties
+     *
      * @return int Filter mask
      */
     public function filter_mask($rec)
@@ -1330,8 +1349,7 @@
             // "Later" should catch tasks with date after tomorrow (#5353)
             if ($this->rc->output->get_env('tasklist_driver') == 'kolab') {
                 $weeklimit = $tomorrow;
-            }
-            else {
+            } else {
                 $week_date = new DateTime('now + 7 days', $this->timezone);
                 $weeklimit = $week_date->format('Y-m-d');
             }
@@ -1350,22 +1368,21 @@
 
         if (empty($rec'date')) {
             $mask |= self::FILTER_MASK_NODATE;
-        }
-        else if ($rec'date' < $today) {
+        } elseif ($rec'date' < $today) {
             $mask |= self::FILTER_MASK_OVERDUE;
         }
 
         if (empty($rec'recurrence') || $duedate < $today || $start > $weeklimit) {
-            if ($duedate <= $today || (!empty($rec'startdate') && $start <= $today))
+            if ($duedate <= $today || (!empty($rec'startdate') && $start <= $today)) {
                 $mask |= self::FILTER_MASK_TODAY;
-            else if (($start > $today && $start <= $tomorrow) || ($duedate > $today && $duedate <= $tomorrow))
+            } elseif (($start > $today && $start <= $tomorrow) || ($duedate > $today && $duedate <= $tomorrow)) {
                 $mask |= self::FILTER_MASK_TOMORROW;
-            else if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
+            } elseif (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit)) {
                 $mask |= self::FILTER_MASK_WEEK;
-            else if ($start > $weeklimit || $duedate > $weeklimit)
+            } elseif ($start > $weeklimit || $duedate > $weeklimit) {
                 $mask |= self::FILTER_MASK_LATER;
-        }
-        else if (!empty($rec'startdate') || !empty($rec'date')) {
+            }
+        } elseif (!empty($rec'startdate') || !empty($rec'date')) {
             $date = new libcalendaring_datetime(!empty($rec'startdate') ? $rec'startdate' : $rec'date', $this->timezone);
 
             // set safe recurrence start
@@ -1375,10 +1392,13 @@
                         $date = clone $today_date;
                         $date->sub(new DateInterval('P1D'));
                         break;
-                    case 'WEEKLY': $date->sub(new DateInterval('P7D')); break;
-                    case 'MONTHLY': $date->sub(new DateInterval('P1M')); break;
-                    case 'YEARLY': $date->sub(new DateInterval('P1Y')); break;
-                    default; break 2;
+                    case 'WEEKLY': $date->sub(new DateInterval('P7D'));
+                        break;
+                    case 'MONTHLY': $date->sub(new DateInterval('P1M'));
+                        break;
+                    case 'YEARLY': $date->sub(new DateInterval('P1Y'));
+                        break;
+                    default: break 2;
                 }
             }
 
@@ -1399,14 +1419,11 @@
 
                 if ($date == $today) {
                     $mask |= self::FILTER_MASK_TODAY;
-                }
-                else if ($date == $tomorrow) {
+                } elseif ($date == $tomorrow) {
                     $mask |= self::FILTER_MASK_TOMORROW;
-                }
-                else if ($date > $tomorrow && $date <= $weeklimit) {
+                } elseif ($date > $tomorrow && $date <= $weeklimit) {
                     $mask |= self::FILTER_MASK_WEEK;
-                }
-                else if ($date > $weeklimit) {
+                } elseif ($date > $weeklimit) {
                     $mask |= self::FILTER_MASK_LATER;
                     break;
                 }
@@ -1416,8 +1433,7 @@
         // add masks for assigned tasks
         if ($this->is_organizer($rec) && !empty($rec'attendees') && $this->is_attendee($rec) === false) {
             $mask |= self::FILTER_MASK_ASSIGNED;
-        }
-        else if (/*empty($rec'attendees') ||*/ $this->is_attendee($rec) !== false) {
+        } elseif (/*empty($rec'attendees') ||*/ $this->is_attendee($rec) !== false) {
             $mask |= self::FILTER_MASK_MYTASKS;
         }
 
@@ -1476,17 +1492,18 @@
     public function refresh($attr)
     {
         // refresh the entire list every 10th time to also sync deleted items
-        if (rand(0,10) == 10) {
+        if (rand(0, 10) == 10) {
             $this->rc->output->command('plugin.reload_data');
             return;
         }
 
-        $filter = array(
+        $filter = 
             'since'  => $attr'last',
             'search' => rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC),
             'mask'   => intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC)) & self::FILTER_MASK_COMPLETE,
-        );
-        $lists = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);;
+        ;
+        $lists = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
+        ;
 
         $updates = $this->driver->list_tasks($filter, $lists);
         if (!empty($updates)) {
@@ -1508,8 +1525,9 @@
         if ($alarms = $this->driver->pending_alarms($p'time' ?: time())) {
             foreach ($alarms as $alarm) {
                 // encode alarm object to suit the expectations of the calendaring code
-                if ($alarm'date')
-                    $alarm'start' = new DateTime($alarm'date'.' '.$alarm'time', $this->timezone);
+                if ($alarm'date') {
+                    $alarm'start' = new DateTime($alarm'date' . ' ' . $alarm'time', $this->timezone);
+                }
 
                 $alarm'id' = 'task:' . $alarm'id';  // prefix ID with task:
                 $alarm'allday' = empty($alarm'time') ? 1 : 0;
@@ -1527,8 +1545,9 @@
     {
         $this->load_driver();
         foreach ((array)$p'ids' as $id) {
-            if (strpos($id, 'task:') === 0)
+            if (strpos($id, 'task:') === 0) {
                 $p'success' |= $this->driver->dismiss_alarm(substr($id, 5), $p'snooze');
+            }
         }
 
         return $p;
@@ -1537,7 +1556,7 @@
     /**
      * Handler for importing .ics files
      */
-    function import_tasks()
+    public function import_tasks()
     {
         // Upload progress update
         if (!empty($_GET'_progress')) {
@@ -1554,6 +1573,7 @@
             $lists  = $this->driver->get_lists();
             $list   = $lists$source ?: $this->get_default_tasklist();
             $source = $list'id';
+            $errors = 0;
 
             // extract zip file
             if ($_FILES'_data''type' == 'application/zip') {
@@ -1566,11 +1586,11 @@
                         mkdir($tmpdir, 0700);
 
                         // extract each ical file from the archive and import it
-                        for ($i = 0; $i < $zip->numFiles; $i++) { 
+                        for ($i = 0; $i < $zip->numFiles; $i++) {
                             $filename = $zip->getNameIndex($i);
                             if (preg_match('/\.ics$/i', $filename)) {
                                 $tmpfile = $tmpdir . '/' . basename($filename);
-                                if (copy('zip://' . $_FILES'_data''tmp_name' . '#'.$filename, $tmpfile)) {
+                                if (copy('zip://' . $_FILES'_data''tmp_name' . '#' . $filename, $tmpfile)) {
                                     $count += $this->import_from_file($tmpfile, $source, $errors);
                                     unlink($tmpfile);
                                 }
@@ -1579,44 +1599,38 @@
 
                         rmdir($tmpdir);
                         $zip->close();
-                    }
-                    else {
+                    } else {
                         $errors = 1;
                         $msg = 'Failed to open zip file.';
                     }
-                }
-                else {
+                } else {
                     $errors = 1;
                     $msg = 'Zip files are not supported for import.';
                 }
-            }
-            else {
+            } else {
                 // attempt to import the uploaded file directly
                 $count = $this->import_from_file($_FILES'_data''tmp_name', $source, $errors);
             }
 
             if ($count) {
-                $this->rc->output->command('display_message', $this->gettext(array('name' => 'importsuccess', 'vars' => array('nr' => $count))), 'confirmation');
-                $this->rc->output->command('plugin.import_success', array('source' => $source, 'refetch' => true));
-            }
-            else if (!$errors) {
+                $this->rc->output->command('display_message', $this->gettext('name' => 'importsuccess', 'vars' => 'nr' => $count), 'confirmation');
+                $this->rc->output->command('plugin.import_success', 'source' => $source, 'refetch' => true);
+            } elseif (!$errors) {
                 $this->rc->output->command('display_message', $this->gettext('importnone'), 'notice');
-                $this->rc->output->command('plugin.import_success', array('source' => $source));
-            }
-            else {
-                $this->rc->output->command('plugin.import_error', array('message' => $this->gettext('importerror') . ($msg ? ': ' . $msg : '')));
+                $this->rc->output->command('plugin.import_success', 'source' => $source);
+            } else {
+                $this->rc->output->command('plugin.import_error', 'message' => $this->gettext('importerror')
+                    . (!empty($msg) ? ': ' . $msg : ''));
             }
-        }
-        else {
+        } else {
             if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-                $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
-                    'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
-            }
-            else {
+                $msg = $this->rc->gettext('name' => 'filesizeerror', 'vars' => 
+                    'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))));
+            } else {
                 $msg = $this->rc->gettext('fileuploaderror');
             }
 
-            $this->rc->output->command('plugin.import_error', array('message' => $msg));
+            $this->rc->output->command('plugin.import_error', 'message' => $msg);
         }
 
         $this->rc->output->send('iframe');
@@ -1644,8 +1658,7 @@
 
                 if ($this->driver->create_task($task)) {
                     $count++;
-                }
-                else {
+                } else {
                     $errors++;
                 }
             }
@@ -1657,7 +1670,7 @@
     /**
      * Construct the ics file for exporting tasks to iCalendar format
      */
-    function export_tasks()
+    public function export_tasks()
     {
         $source      = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
         $task_id     = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
@@ -1665,20 +1678,19 @@
 
         $this->load_driver();
 
-        $browser = new rcube_browser;
+        $browser = new rcube_browser();
         $lists   = $this->driver->get_lists();
-        $tasks   = array();
-        $filter  = array();
+        $tasks   = ;
+        $filter  = ;
 
         // get message UIDs for filter
         if ($source && ($list = $lists$source)) {
-            $filename = html_entity_decode($list'name') ?: $sorce;
-            $filter   = array($source => true);
-        }
-        else if ($task_id) {
+            $filename = html_entity_decode($list'name') ?: $source;
+            $filter   = $source => true;
+        } elseif ($task_id) {
             $filename = 'tasks';
             foreach (explode(',', $task_id) as $id) {
-                list($list_id, $task_id) = explode(':', $id, 2);
+                $list_id, $task_id = explode(':', $id, 2);
                 if ($list_id && $task_id) {
                     $filter$list_id = $task_id;
                 }
@@ -1687,7 +1699,7 @@
 
         // Get tasks
         foreach ($filter as $list_id => $uids) {
-            $_filter = is_array($uids) ? array('uid' => $uids) : null;
+            $_filter = is_array($uids) ? 'uid' => $uids : null;
             $_tasks  = $this->driver->list_tasks($_filter, $list_id);
             if (!empty($_tasks)) {
                 $tasks = array_merge($tasks, $_tasks);
@@ -1695,21 +1707,22 @@
         }
 
         // Set file name
+        $filename = 'tasks';
         if ($source && count($tasks) == 1) {
             $filename = $tasks0'title' ?: 'task';
         }
         $filename .= '.ics';
         $filename = $browser->ie ? rawurlencode($filename) : addcslashes($filename, '"');
 
-        $tasks = array_map(array($this, 'to_libcal'), $tasks);
+        $tasks = array_map($this, 'to_libcal', $tasks);
 
         // Give plugins a possibility to implement other output formats or modify the result
-        $plugin = $this->rc->plugins->exec_hook('tasks_export', array(
+        $plugin = $this->rc->plugins->exec_hook('tasks_export', 
                 'result'      => $tasks,
                 'attachments' => $attachments,
                 'filename'    => $filename,
                 'plugin'      => $this,
-        ));
+        );
 
         if ($plugin'abort') {
             exit;
@@ -1720,10 +1733,14 @@
         // don't kill the connection if download takes more than 30 sec.
         @set_time_limit(0);
         header("Content-Type: text/calendar");
-        header("Content-Disposition: inline; filename=\"". $plugin'filename' ."\"");
+        header("Content-Disposition: inline; filename=\"" . $plugin'filename' . "\"");
 
-        $this->get_ical()->export($plugin'result', '', true,
-            !empty($plugin'attachments') ? array($this->driver, 'get_attachment_body') : null);
+        $this->get_ical()->export(
+            $plugin'result',
+            '',
+            true,
+            !empty($plugin'attachments') ? $this->driver, 'get_attachment_body' : null
+        );
         exit;
     }
 
@@ -1764,7 +1781,7 @@
             $handler->attachment_page($attachment);
         }
         // deliver attachment content
-        else if ($attachment) {
+        elseif ($attachment) {
             if (empty($attachment'body')) {
                 $attachment'body' = $this->driver->get_attachment_body($id, $task);
             }
@@ -1786,9 +1803,9 @@
         $this->ui->init_templates();
         $this->ui->tasklists();
 
-        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+        $uid  = (int) rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
         $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
-        $task = array();
+        $task = ;
 
         $imap    = $this->rc->get_storage();
         $message = new rcube_message($uid, $mbox);
@@ -1802,17 +1819,16 @@
 
             // add a reference to the email message
             if ($msgref = $this->driver->get_message_reference($message->headers, $mbox)) {
-                $task'links' = array($msgref);
+                $task'links' = $msgref;
             }
             // copy mail attachments to task
-            else if (!empty($message->attachments) && $this->driver->attachments) {
+            elseif (!empty($message->attachments) && $this->driver->attachments) {
                 $handler = new kolab_attachments_handler();
                 $task'attachments' = $handler->copy_mail_attachments(self::SESSION_KEY, $task'id', $message);
             }
 
             $this->rc->output->set_env('task_prop', $task);
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
         }
 
@@ -1844,7 +1860,8 @@
 
             // get prepared inline UI for this event object
             if ($ical_objects->method) {
-                $html .= html::div('tasklist-invitebox invitebox boxinformation',
+                $html .= html::div(
+                    'tasklist-invitebox invitebox boxinformation',
                     $this->itip->mail_itip_inline_ui(
                         $task,
                         $ical_objects->method,
@@ -1862,31 +1879,33 @@
         }
 
         // list linked tasks
-        $links = array();
+        $links = ;
         foreach ($this->message_tasks as $task) {
-            $checkbox = new html_checkbox(array(
+            $checkbox = new html_checkbox(
                 'name' => 'completed',
                 'class' => 'complete pretty-checkbox',
                 'title' => $this->gettext('complete'),
                 'data-list' => $task'list',
-            ));
+            );
             $complete = $this->driver->is_complete($task);
-            $links = html::tag('li', 'messagetaskref' . ($complete ? ' complete' : ''),
-                $checkbox->show($complete ? $task'id' : null, array('value' => $task'id')) . ' ' .
-                html::a(array(
-                    'href' => $this->rc->url(array(
+            $links = html::tag(
+                'li',
+                'messagetaskref' . ($complete ? ' complete' : ''),
+                $checkbox->show($complete ? $task'id' : null, 'value' => $task'id') . ' ' .
+                html::a(
+                    'href' => $this->rc->url(
                         'task' => 'tasks',
                         'list' => $task'list',
                         'id' => $task'id',
-                    )),
+                    ),
                     'class' => 'messagetasklink',
                     'rel' => $task'id' . '@' . $task'list',
                     'target' => '_blank',
-                ), rcube::Q($task'title'))
+                , rcube::Q($task'title'))
             );
         }
         if (count($links)) {
-            $html .= html::div('messagetasklinks boxinformation', html::tag('ul', 'tasklist', join("\n", $links)));
+            $html .= html::div('messagetasklinks boxinformation', html::tag('ul', 'tasklist', implode("\n", $links)));
         }
 
         // prepend iTip/relation boxes to message body
@@ -1896,12 +1915,12 @@
 
             $p'content' = $html . $p'content';
 
-            $this->rc->output->add_label('tasklist.savingdata','tasklist.deletetaskconfirm','tasklist.declinedeleteconfirm');
+            $this->rc->output->add_label('tasklist.savingdata', 'tasklist.deletetaskconfirm', 'tasklist.declinedeleteconfirm');
         }
 
         // add "Save to tasks" button into attachment menu
         if ($has_tasks) {
-            $this->add_button(array(
+            $this->add_button(
                 'id'         => 'attachmentsavetask',
                 'name'       => 'attachmentsavetask',
                 'type'       => 'link',
@@ -1911,7 +1930,7 @@
                 'classact'   => 'icon tasklistlink active',
                 'innerclass' => 'icon taskadd',
                 'label'      => 'tasklist.savetotasklist',
-            ), 'attachmentmenu');
+            , 'attachmentmenu');
         }
 
         return $p;
@@ -1928,13 +1947,17 @@
 
             // sort message tasks by completeness and due date
             $driver = $this->driver;
-            array_walk($this->message_tasks, array($this, 'encode_task'));
-            usort($this->message_tasks, function($a, $b) use ($driver) {
+            array_walk($this->message_tasks, $this, 'encode_task');
+            usort($this->message_tasks, function ($a, $b) use ($driver) {
                 $a_complete = intval($driver->is_complete($a));
                 $b_complete = intval($driver->is_complete($b));
                 $d = $a_complete - $b_complete;
-                if (!$d) $d = $b'_hasdate' - $a'_hasdate';
-                if (!$d) $d = $a'datetime' - $b'datetime';
+                if (!$d) {
+                    $d = $b'_hasdate' - $a'_hasdate';
+                }
+                if (!$d) {
+                    $d = $a'datetime' - $b'datetime';
+                }
                 return $d;
             });
         }
@@ -1962,6 +1985,7 @@
         }
 
         $list = null;
+        $first = null;
 
         foreach ($lists as $l) {
             if ($l'default') {
@@ -1992,7 +2016,7 @@
 
         if ($uid && $mime_id) {
             $part    = $imap->get_message_part($uid, $mime_id);
-//            $headers = $imap->get_message_headers($uid);
+            //            $headers = $imap->get_message_headers($uid);
 
             if ($part->ctype_parameters'charset') {
                 $charset = $part->ctype_parameters'charset';
@@ -2019,8 +2043,7 @@
 
                     if (!$this->driver->get_task($task'uid')) {
                         $success += (bool) $this->driver->create_task($task);
-                    }
-                    else {
+                    } else {
                         $existing++;
                     }
                 }
@@ -2028,15 +2051,13 @@
         }
 
         if ($success) {
-            $this->rc->output->command('display_message', $this->gettext(array(
+            $this->rc->output->command('display_message', $this->gettext(
                 'name' => 'importsuccess',
-                'vars' => array('nr' => $success),
-            )), 'confirmation');
-        }
-        else if ($existing) {
+                'vars' => 'nr' => $success,
+            ), 'confirmation');
+        } elseif ($existing) {
             $this->rc->output->command('display_message', $this->gettext('importwarningexists'), 'warning');
-        }
-        else {
+        } else {
             $this->rc->output->command('display_message', $this->gettext('errorimportingtask'), 'error');
         }
     }
@@ -2055,7 +2076,14 @@
         $noreply = intval(rcube_utils::get_input_value('_noreply', rcube_utils::INPUT_POST)) || $status == 'needs-action';
 
         $error_msg = $this->gettext('errorimportingtask');
-        $success   = false;
+        $success = false;
+        $reply_sender = null;
+        $organizer = null;
+        $delegate = null;
+        $existing = null;
+        $deleted = null;
+        $dontsave = false;
+        $metadata = ;
 
         if ($status == 'delegated') {
             $delegates = rcube_mime::decode_address_list(rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST, true), 1, false);
@@ -2080,8 +2108,7 @@
 
                 if ($itip->delegate_to($task, $delegate, !empty($rsvpme))) {
                     $this->rc->output->show_message('tasklist.itipsendsuccess', 'confirmation');
-                }
-                else {
+                } else {
                     $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
                 }
 
@@ -2095,22 +2122,22 @@
             // find writeable list to store the task
             $list_id = !empty($_REQUEST'_folder') ? rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST) : null;
             $lists   = $this->driver->get_lists($mode);
-            $list    = $lists$list_id;
-            $dontsave = ($_REQUEST'_folder' === '' && $task'_method' == 'REQUEST');
+            $list    = $lists$list_id ?? null;
+            $dontsave = $_REQUEST'_folder' === '' && $task'_method' == 'REQUEST';
 
             // select default list except user explicitly selected 'none'
             if (!$list && !$dontsave) {
                 $list = $this->get_default_tasklist($lists);
             }
 
-            $metadata = array(
+            $metadata = 
                 'uid'      => $task'uid',
                 'changed'  => is_object($task'changed') ? $task'changed'->format('U') : 0,
                 'sequence' => intval($task'sequence'),
                 'fallback' => strtoupper($status),
                 'method'   => $task'_method',
                 'task'     => 'tasks',
-            );
+            ;
 
             // update my attendee status according to submitted method
             if (!empty($status)) {
@@ -2124,7 +2151,7 @@
                         $reply_sender         = $attendee'email';
 
                         $task'attendees'$i'status' = strtoupper($status);
-                        if (!in_array($task'attendees'$i'status', array('NEEDS-ACTION','DELEGATED'))) {
+                        if (!in_array($task'attendees'$i'status', 'NEEDS-ACTION','DELEGATED')) {
                             $task'attendees'$i'rsvp' = false;  // unset RSVP attribute
                         }
                     }
@@ -2133,12 +2160,12 @@
                 // add attendee with this user's default identity if not listed
                 if (!$reply_sender) {
                     $sender_identity = $this->rc->user->list_emails(true);
-                    $task'attendees' = array(
+                    $task'attendees' = 
                         'name'   => $sender_identity'name',
                         'email'  => $sender_identity'email',
                         'role'   => 'OPT-PARTICIPANT',
                         'status' => strtoupper($status),
-                    );
+                    ;
                     $metadata'attendee' = $sender_identity'email';
                 }
             }
@@ -2155,7 +2182,7 @@
                     if ($task'_method' == 'REPLY') {
                         // try to identify the attendee using the email sender address
                         $existing_attendee = -1;
-                        $existing_attendee_emails = array();
+                        $existing_attendee_emails = ;
                         foreach ($existing'attendees' as $i => $attendee) {
                             $existing_attendee_emails = $attendee'email';
                             if ($task'_sender' && ($attendee'email' == $task'_sender' || $attendee'email' == $task'_sender_utf')) {
@@ -2175,7 +2202,7 @@
                                 }
                             }
                             // also copy delegate attendee
-                            else if (!empty($attendee'delegated-from') &&
+                            elseif (!empty($attendee'delegated-from') &&
                                      (stripos($attendee'delegated-from', $task'_sender') !== false || stripos($attendee'delegated-from', $task'_sender_utf') !== false) &&
                                      (!in_array($attendee'email', $existing_attendee_emails))) {
                                 $existing'attendees' = $attendee;
@@ -2198,21 +2225,20 @@
                             $success = $this->driver->edit_task($existing);
                         }
                         // update the entire attendees block
-                        else if (($task'sequence' >= $existing'sequence' || $task'changed' >= $existing'changed') && $task_attendee) {
+                        elseif (($task'sequence' >= $existing'sequence' || $task'changed' >= $existing'changed') && $task_attendee) {
                             $existing'attendees' = $task_attendee;
                             $success = $this->driver->edit_task($existing);
-                        }
-                        else {
+                        } else {
                             $error_msg = $this->gettext('newerversionexists');
                         }
                     }
                     // delete the task when declined
-                    else if ($status == 'declined' && $delete) {
+                    elseif ($status == 'declined' && $delete) {
                         $deleted = $this->driver->delete_task($existing, true);
                         $success = true;
                     }
                     // import the (newer) task
-                    else if ($task'sequence' >= $existing'sequence' || $task'changed' >= $existing'changed') {
+                    elseif ($task'sequence' >= $existing'sequence' || $task'changed' >= $existing'changed') {
                         $task'id'   = $existing'id';
                         $task'list' = $existing'list';
 
@@ -2229,8 +2255,7 @@
                         // update attachments list, allow attachments update only on REQUEST (#5342)
                         if ($task'_method' == 'REQUEST') {
                             $task'deleted_attachments' = true;
-                        }
-                        else {
+                        } else {
                             unset($task'attachments');
                         }
 
@@ -2240,30 +2265,24 @@
                         }
 
                         $success = $this->driver->edit_task($task);
-                    }
-                    else if (!empty($status)) {
+                    } elseif (!empty($status)) {
                         $existing'attendees' = $task'attendees';
                         if ($status == 'declined') { // show me as free when declined (#1670)
                             $existing'free_busy' = 'free';
                         }
 
                         $success = $this->driver->edit_event($existing);
-                    }
-                    else {
+                    } else {
                         $error_msg = $this->gettext('newerversionexists');
                     }
-                }
-                else if (!$existing && ($status != 'declined' || $this->rc->config->get('kolab_invitation_tasklists'))) {
+                } elseif ($status != 'declined' || $this->rc->config->get('kolab_invitation_tasklists')) {
                     $success = $this->driver->create_task($task);
-                }
-                else if ($status == 'declined') {
+                } elseif ($status == 'declined') {
                     $error_msg = null;
                 }
-            }
-            else if ($status == 'declined' || $dontsave) {
+            } elseif ($status == 'declined' || $dontsave) {
                 $error_msg = null;
-            }
-            else {
+            } else {
                 $error_msg = $this->gettext('nowritetasklistfound');
             }
         }
@@ -2271,29 +2290,31 @@
         if ($success || $dontsave) {
             if ($success) {
                 $message = $task'_method' == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully'));
-                $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('list' => $list'name'))), 'confirmation');
+                $this->rc->output->command('display_message', $this->gettext('name' => $message, 'vars' => 'list' => $list'name' ?? ''), 'confirmation');
             }
 
-            $metadata'rsvp'         = intval($metadata'rsvp');
+            $metadata'rsvp'         = !empty($metadata'rsvp') ? 1 : 0;
             $metadata'after_action' = $this->rc->config->get('calendar_itip_after_action', 0);
 
             $this->rc->output->command('plugin.itip_message_processed', $metadata);
             $error_msg = null;
-        }
-        else if ($error_msg) {
+        } elseif ($error_msg) {
             $this->rc->output->command('display_message', $error_msg, 'error');
         }
 
         // send iTip reply
-        if ($task'_method' == 'REQUEST' && $organizer && !$noreply && !in_array(strtolower($organizer'email'), $emails) && !$error_msg) {
+        if ($task'_method' == 'REQUEST' && $organizer && !$noreply && !$error_msg
+            && (empty($emails) || !in_array(strtolower($organizer'email'), $emails))
+        ) {
             $task'comment' = $comment;
             $itip = $this->load_itip();
             $itip->set_sender_email($reply_sender);
 
-            if ($itip->send_itip_message($this->to_libcal($task), 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
-                $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer'name' ?: $organizer'email'))), 'confirmation');
-            else
+            if ($itip->send_itip_message($this->to_libcal($task), 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status)) {
+                $this->rc->output->command('display_message', $this->gettext('name' => 'sentresponseto', 'vars' => 'mailto' => $organizer'name' ?: $organizer'email'), 'confirmation');
+            } else {
                 $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+            }
         }
 
         $this->rc->output->send();
@@ -2305,7 +2326,7 @@
     /**
      * Handler for task/itip-delegate requests
      */
-    function mail_itip_delegate()
+    public function mail_itip_delegate()
     {
         // forward request to mail_import_itip() with the right status
         $_POST'_status' = $_REQUEST'_status' = 'delegated';
@@ -2350,7 +2371,7 @@
         // get a list of writeable lists to save new tasks to
         if ((!$existing || $is_shared) && $response'action' == 'rsvp' || $response'action' == 'import') {
             $lists  = $this->driver->get_lists($mode);
-            $select = new html_select(array('name' => 'tasklist', 'id' => 'itip-saveto', 'is_escaped' => true, 'class' => 'form-control'));
+            $select = new html_select('name' => 'tasklist', 'id' => 'itip-saveto', 'is_escaped' => true, 'class' => 'form-control');
             $select->add('--', '');
 
             foreach ($lists as $list) {
@@ -2358,9 +2379,7 @@
                     $select->add($list'name', $list'id');
                 }
             }
-        }
 
-        if ($select) {
             $default_list = $this->get_default_tasklist($lists);
             $response'select' = html::span('folder-select', $this->gettext('saveintasklist') . '&nbsp;' .
                 $select->show($is_shared ? $existing'list' : $default_list'id'));
@@ -2384,8 +2403,7 @@
 
         if ($success) {
             $this->rc->output->show_message('tasklist.successremoval', 'confirmation');
-        }
-        else {
+        } else {
             $this->rc->output->show_message('tasklist.errorsaving', 'error');
         }
     }
@@ -2398,7 +2416,7 @@
      */
     public function generate_uid()
     {
-      return strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($this->rc->user->get_username()), 0, 16));
+        return strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($this->rc->user->get_username()), 0, 16));
     }
 
     /**
@@ -2412,16 +2430,18 @@
 
         // convert to datetime objects
         if (!empty($task'date')) {
-            $object'due' = rcube_utils::anytodatetime($task'date'.' '.$task'time', $this->timezone);
-            if (empty($task'time'))
+            $object'due' = rcube_utils::anytodatetime($task'date' . ' ' . $task'time', $this->timezone);
+            if ($object'due' && empty($task'time')) {
                 $object'due'->_dateonly = true;
+            }
             unset($object'date');
         }
 
         if (!empty($task'startdate')) {
-            $object'start' = rcube_utils::anytodatetime($task'startdate'.' '.$task'starttime', $this->timezone);
-            if (empty($task'starttime'))
+            $object'start' = rcube_utils::anytodatetime($task'startdate' . ' ' . $task'starttime', $this->timezone);
+            if ($object'start' && empty($task'starttime')) {
                 $object'start'->_dateonly = true;
+            }
             unset($object'startdate');
         }
 
@@ -2432,8 +2452,7 @@
 
         if ($task'flagged') {
             $object'priority' = 1;
-        }
-        else if (empty($task'priority')) {
+        } elseif (empty($task'priority')) {
             $object'priority' = 0;
         }
 
@@ -2455,15 +2474,17 @@
         if (is_a($vtodo'due', 'DateTime')) {
             $due = $this->lib->adjust_timezone($vtodo'due');
             $task'date' = $due->format('Y-m-d');
-            if (!$vtodo'due'->_dateonly)
+            if (empty($vtodo'due'->_dateonly)) {
                 $task'time' = $due->format('H:i');
+            }
         }
         // convert from DateTime to internal date format
         if (is_a($vtodo'start', 'DateTime')) {
             $start = $this->lib->adjust_timezone($vtodo'start');
             $task'startdate' = $start->format('Y-m-d');
-            if (!$vtodo'start'->_dateonly)
+            if (empty($vtodo'start'->_dateonly)) {
                 $task'starttime' = $start->format('H:i');
+            }
         }
         if (is_a($vtodo'dtstamp', 'DateTime')) {
             $task'changed' = $vtodo'dtstamp';
@@ -2479,8 +2500,8 @@
      */
     public function user_delete($args)
     {
-       $this->load_driver();
-       return $this->driver->user_delete($args);
+        $this->load_driver();
+        return $this->driver->user_delete($args);
     }

roundcubemail-1.5.tar.gz/plugins/tasklist/tasklist_ui.php Changed

@@ -21,15 +21,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#AllowDynamicProperties
 class tasklist_ui
 {
     private $rc;
     private $plugin;
     private $ready = false;
+    private $action;
+    private $list;
     private $gui_objects = ;
 
-    function __construct($plugin)
+    public function __construct($plugin)
     {
         $this->plugin = $plugin;
         $this->rc     = $plugin->rc;
@@ -51,7 +52,7 @@
             'classsel'   => 'button-tasklist button-selected',
             'innerclass' => 'button-inner',
             'label'      => 'tasklist.navtitle',
-            'type'       => 'link'
+            'type'       => 'link',
         , 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tasklist.css');
@@ -72,7 +73,7 @@
     /**
      *
      */
-    function load_settings()
+    public function load_settings()
     {
         $settings = ;
 
@@ -95,7 +96,7 @@
         $settings'identity' = 
             'name'   => $identity'name',
             'email'  => strtolower($identity'email'),
-            'emails' => ';' . strtolower(join(';', $identity'emails'))
+            'emails' => ';' . strtolower(implode(';', $identity'emails')),
         ;
 
         if ($list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC)) {
@@ -105,12 +106,11 @@
             $settings'selected_id' = $id;
 
             // check if the referenced task is completed
-            $task = $this->plugin->driver->get_task(array('id' => $id, 'list' => $list));
+            $task = $this->plugin->driver->get_task('id' => $id, 'list' => $list);
             if ($task && $this->plugin->driver->is_complete($task)) {
                 $settings'selected_filter' = 'complete';
             }
-        }
-        else if ($filter = rcube_utils::get_input_value('_filter', rcube_utils::INPUT_GPC)) {
+        } elseif ($filter = rcube_utils::get_input_value('_filter', rcube_utils::INPUT_GPC)) {
             $settings'selected_filter' = $filter;
         }
 
@@ -120,7 +120,7 @@
     /**
      * Render a HTML select box for user identity selection
      */
-    function identity_select($attrib = )
+    public function identity_select($attrib = )
     {
         $attrib'name' = 'identity';
         $select         = new html_select($attrib);
@@ -138,23 +138,23 @@
     */
     public function init_templates()
     {
-        $this->plugin->register_handler('plugin.tasklists', array($this, 'tasklists'));
-        $this->plugin->register_handler('plugin.tasklist_select', array($this, 'tasklist_select'));
-        $this->plugin->register_handler('plugin.status_select', array($this, 'status_select'));
-        $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
-        $this->plugin->register_handler('plugin.quickaddform', array($this, 'quickadd_form'));
-        $this->plugin->register_handler('plugin.tasks', array($this, 'tasks_resultview'));
-        $this->plugin->register_handler('plugin.tags_editline', array($this, 'tags_editline'));
-        $this->plugin->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
-        $this->plugin->register_handler('plugin.recurrence_form', array($this->plugin->lib, 'recurrence_form'));
-        $this->plugin->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
-        $this->plugin->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
-        $this->plugin->register_handler('plugin.identity_select', array($this, 'identity_select'));
-        $this->plugin->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
-        $this->plugin->register_handler('plugin.task_rsvp_buttons', array($this->plugin->itip, 'itip_rsvp_buttons'));
-        $this->plugin->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
-        $this->plugin->register_handler('plugin.tasks_export_form', array($this, 'tasks_export_form'));
-        $this->plugin->register_handler('plugin.tasks_import_form', array($this, 'tasks_import_form'));
+        $this->plugin->register_handler('plugin.tasklists', $this, 'tasklists');
+        $this->plugin->register_handler('plugin.tasklist_select', $this, 'tasklist_select');
+        $this->plugin->register_handler('plugin.status_select', $this, 'status_select');
+        $this->plugin->register_handler('plugin.searchform', $this->rc->output, 'search_form');
+        $this->plugin->register_handler('plugin.quickaddform', $this, 'quickadd_form');
+        $this->plugin->register_handler('plugin.tasks', $this, 'tasks_resultview');
+        $this->plugin->register_handler('plugin.tags_editline', $this, 'tags_editline');
+        $this->plugin->register_handler('plugin.alarm_select', $this, 'alarm_select');
+        $this->plugin->register_handler('plugin.recurrence_form', $this->plugin->lib, 'recurrence_form');
+        $this->plugin->register_handler('plugin.attendees_list', $this, 'attendees_list');
+        $this->plugin->register_handler('plugin.attendees_form', $this, 'attendees_form');
+        $this->plugin->register_handler('plugin.identity_select', $this, 'identity_select');
+        $this->plugin->register_handler('plugin.edit_attendees_notify', $this, 'edit_attendees_notify');
+        $this->plugin->register_handler('plugin.task_rsvp_buttons', $this->plugin->itip, 'itip_rsvp_buttons');
+        $this->plugin->register_handler('plugin.object_changelog_table', 'libkolab', 'object_changelog_table');
+        $this->plugin->register_handler('plugin.tasks_export_form', $this, 'tasks_export_form');
+        $this->plugin->register_handler('plugin.tasks_import_form', $this, 'tasks_import_form');
 
         kolab_attachments_handler::ui();
 
@@ -176,10 +176,10 @@
         }
 
         // walk folder tree
+        // @phpstan-ignore-next-line FIXME: does it make sense?
         if (is_object($tree)) {
             $html = $this->list_tree_html($tree, $lists, $jsenv, $attrib);
-        }
-        else {
+        } else {
             // fall-back to flat folder listing
             $attrib'class' = ($attrib'class' ?? '') . ' flat';
             $html = '';
@@ -189,7 +189,9 @@
                     continue;
                 }
 
-                $html .= html::tag('li', 
+                $html .= html::tag(
+                    'li',
+                    
                         'id' => 'rcmlitasklist' . rcube_utils::html_identifier($id),
                         'class' => $prop'group' ?? null,
                     ,
@@ -221,16 +223,22 @@
             $content = $this->tasklist_list_item($id, $prop, $jsenv, !empty($attrib'activeonly'));
 
             if (!empty($folder->children)) {
-                $content .= html::tag('ul', 'style' => ($is_collapsed ? "display:none;" : null),
-                    $this->list_tree_html($folder, $data, $jsenv, $attrib));
+                $content .= html::tag(
+                    'ul',
+                    'style' => ($is_collapsed ? "display:none;" : null), // @phpstan-ignore-line
+                    $this->list_tree_html($folder, $data, $jsenv, $attrib)
+                );
             }
 
             if (strlen($content)) {
-                $out .= html::tag('li', 
+                $out .= html::tag(
+                    'li',
+                    
                       'id' => 'rcmlitasklist' . rcube_utils::html_identifier($id),
                       'class' => $prop'group' . ($prop'virtual' ? ' virtual' : ''),
                     ,
-                    $content);
+                    $content
+                );
             }
         }
 
@@ -254,20 +262,18 @@
             $jsenv$id = $prop;
         }
 
-        $classes = array('tasklist');
+        $classes = 'tasklist';
         $title   = '';
 
         if (!empty($prop'title')) {
             $title = $prop'title';
-        }
-        else if (empty($prop'listname') || $prop'name' != $prop'listname' || strlen($prop'name') > 25) {
-            html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET);
+        } elseif (empty($prop'listname') || $prop'name' != $prop'listname' || strlen($prop'name') > 25) {
+            $title = html_entity_decode($prop'name', ENT_COMPAT, RCUBE_CHARSET);
         }
 
         if (!empty($prop'virtual')) {
             $classes = 'virtual';
-        }
-        else if (empty($prop'editable')) {
+        } elseif (empty($prop'editable')) {
             $classes = 'readonly';
         }
         if (!empty($prop'subscribed')) {
@@ -279,14 +285,14 @@
 
         if (!$activeonly || !empty($prop'active')) {
             $label_id = 'tl:' . $id;
-            $chbox = html::tag('input', array(
+            $chbox = html::tag('input', 
                     'type'    => 'checkbox',
                     'name'    => '_list',
                     'value'   => $id,
                     'checked' => !empty($prop'active'),
                     'title'   => $this->plugin->gettext('activate'),
-                    'aria-labelledby' => $label_id
-            ));
+                    'aria-labelledby' => $label_id,
+            );
 
             $actions = '';
             if (!empty($prop'removable')) {
@@ -297,9 +303,12 @@
                 $actions .= html::a('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop'subscribed' ? 'true' : 'false', ' ');
             }
 
-            return html::div(join(' ', $classes),
-                html::a('class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id,
-                    !empty($prop'listname') ? $prop'listname' : $prop'name')
+            return html::div(
+                implode(' ', $classes),
+                html::a(
+                    'class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id,
+                    !empty($prop'listname') ? $prop'listname' : $prop'name'
+                )
                     . (!empty($prop'virtual') ? '' : $chbox . html::span('actions', $actions))
             );
         }
@@ -310,15 +319,15 @@
     /**
      * Render HTML form for task status selector
      */
-    function status_select($attrib = array())
+    public function status_select($attrib = )
     {
         $attrib'name' = 'status';
         $select = new html_select($attrib);
         $select->add('---', '');
         $select->add($this->plugin->gettext('status-needs-action'), 'NEEDS-ACTION');
-        $select->add($this->plugin->gettext('status-in-process'),   'IN-PROCESS');
-        $select->add($this->plugin->gettext('status-completed'),    'COMPLETED');
-        $select->add($this->plugin->gettext('status-cancelled'),    'CANCELLED');
+        $select->add($this->plugin->gettext('status-in-process'), 'IN-PROCESS');
+        $select->add($this->plugin->gettext('status-completed'), 'COMPLETED');
+        $select->add($this->plugin->gettext('status-cancelled'), 'CANCELLED');
 
         return $select->show(null);
     }
@@ -326,7 +335,7 @@
     /**
      * Render a HTML select box for list selection
      */
-    function tasklist_select($attrib = array())
+    public function tasklist_select($attrib = )
     {
         if (empty($attrib'name')) {
             $attrib'name' = 'list';
@@ -354,24 +363,24 @@
         return $select->show($default);
     }
 
-    function tasklist_editform($action, $list = array())
+    public function tasklist_editform($action, $list = )
     {
         $this->action = $action;
         $this->list   = $list;
 
         $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabeltasklistform'));
-        $this->rc->output->add_handler('folderform', array($this, 'tasklistform'));
+        $this->rc->output->add_handler('folderform', $this, 'tasklistform');
         $this->rc->output->send('libkolab.folderform');
     }
 
-    function tasklistform($attrib)
+    public function tasklistform($attrib)
     {
-        $fields = array(
-            'name' => array(
+        $fields = 
+            'name' => 
                 'id'    => 'taskedit-tasklistname',
                 'label' => $this->plugin->gettext('listname'),
-                'value' => html::tag('input', array('id' => 'taskedit-tasklistname', 'name' => 'name', 'type' => 'text', 'class' => 'text', 'size' => 40)),
-            ),
+                'value' => html::tag('input', 'id' => 'taskedit-tasklistname', 'name' => 'name', 'type' => 'text', 'class' => 'text', 'size' => 40),
+            ,
 /*
             'color' => array(
                 'id'    => 'taskedit-color',
@@ -379,14 +388,16 @@
                 'value' => html::tag('input', array('id' => 'taskedit-color', 'name' => 'color', 'type' => 'text', 'class' => 'text colorpicker', 'size' => 6)),
             ),
 */
-            'showalarms' => array(
+            'showalarms' => 
                 'id'    => 'taskedit-showalarms',
                 'label' => $this->plugin->gettext('showalarms'),
-                'value' => html::tag('input', array('id' => 'taskedit-showalarms', 'name' => 'showalarms', 'type' => 'checkbox', 'value' => 1)),
-            ),
-        );
+                'value' => html::tag('input', 'id' => 'taskedit-showalarms', 'name' => 'showalarms', 'type' => 'checkbox', 'value' => 1),
+            ,
+        ;
 
-        return html::tag('form', $attrib + array('action' => "#", 'method' => "post", 'id' => 'tasklisteditform'),
+        return html::tag(
+            'form',
+            $attrib + 'action' => "#", 'method' => "post", 'id' => 'tasklisteditform',
             $this->plugin->driver->tasklist_edit_form($this->action, $this->list, $fields)
         );
     }
@@ -394,7 +405,7 @@
     /**
      * Render HTML form for alarm configuration
      */
-    function alarm_select($attrib = array())
+    public function alarm_select($attrib = )
     {
         $attrib'_type' = 'task';
         return $this->plugin->lib->alarm_select($attrib, $this->plugin->driver->alarm_types, $this->plugin->driver->alarm_absolute);
@@ -403,18 +414,18 @@
     /**
      *
      */
-    function quickadd_form($attrib)
+    public function quickadd_form($attrib)
     {
-        $attrib += array('action' => $this->rc->url('add'), 'method' => 'post', 'id' => 'quickaddform');
+        $attrib += 'action' => $this->rc->url('add'), 'method' => 'post', 'id' => 'quickaddform';
 
-        $label = html::label(array('for' => 'quickaddinput', 'class' => 'voice'), $this->plugin->gettext('quickaddinput'));
-        $input = new html_inputfield(array('name' => 'text', 'id' => 'quickaddinput'));
-        $button = html::tag('input', array(
+        $label = html::label('for' => 'quickaddinput', 'class' => 'voice', $this->plugin->gettext('quickaddinput'));
+        $input = new html_inputfield('name' => 'text', 'id' => 'quickaddinput');
+        $button = html::tag('input', 
                 'type'  => 'submit',
                 'value' => '+',
                 'title' => $this->plugin->gettext('createtask'),
-                'class' => 'button mainaction'
-        ));
+                'class' => 'button mainaction',
+        );
 
         $this->register_gui_object('quickaddform', $attrib'id');
         return html::tag('form', $attrib, $label . $input->show() . $button);
@@ -423,9 +434,9 @@
     /**
      * The result view
      */
-    function tasks_resultview($attrib)
+    public function tasks_resultview($attrib)
     {
-        $attrib += array('id' => 'rcmtaskslist');
+        $attrib += 'id' => 'rcmtaskslist';
 
         $this->register_gui_object('resultlist', $attrib'id');
 
@@ -436,17 +447,17 @@
     /**
      * Interactive UI element to add/remove tags
      */
-    function tags_editline($attrib)
+    public function tags_editline($attrib)
     {
-        $attrib += array('id' => 'rcmtasktagsedit');
+        $attrib += 'id' => 'rcmtasktagsedit';
         $this->register_gui_object('edittagline', $attrib'id');
 
-        $input = new html_inputfield(array(
+        $input = new html_inputfield(
                 'name' => 'tags',
                 'class' => 'tag',
                 'size' => !empty($attrib'size') ? $attrib'size' : null,
-                'tabindex' => isset($attrib'tabindex') ? $attrib'tabindex' : null,
-        ));
+                'tabindex' => $attrib'tabindex' ?? null,
+        );
         unset($attrib'tabindex');
         return html::div($attrib, $input->show(''));
     }
@@ -454,20 +465,22 @@
     /**
      *
      */
-    function attendees_list($attrib = array())
+    public function attendees_list($attrib = )
     {
         // add "noreply" checkbox to attendees table only
         $invitations = strpos($attrib'id', 'attend') !== false;
 
-        $invite = new html_checkbox(array('value' => 1, 'id' => 'edit-attendees-invite'));
-        $table  = new html_table(array('cols' => 4 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
+        $invite = new html_checkbox('value' => 1, 'id' => 'edit-attendees-invite');
+        $table  = new html_table('cols' => 4 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable');
 
-//      $table->add_header('role', $this->plugin->gettext('role'));
+        //      $table->add_header('role', $this->plugin->gettext('role'));
         $table->add_header('name', $this->plugin->gettext($attrib'coltitle' ?: 'attendee'));
         $table->add_header('confirmstate', $this->plugin->gettext('confirmstate'));
         if ($invitations) {
-            $table->add_header(array('class' => 'invite', 'title' => $this->plugin->gettext('sendinvitations')),
-                $invite->show(1) . html::label('edit-attendees-invite', html::span('inner', $this->plugin->gettext('sendinvitations'))));
+            $table->add_header(
+                'class' => 'invite', 'title' => $this->plugin->gettext('sendinvitations'),
+                $invite->show(1) . html::label('edit-attendees-invite', html::span('inner', $this->plugin->gettext('sendinvitations')))
+            );
         }
         $table->add_header('options', '');
 
@@ -475,7 +488,7 @@
         $itip_notify = (int)$this->rc->config->get('calendar_itip_send_option', 3);
         if ($invitations && !($itip_notify & 2)) {
             $css = sprintf('#%s td.invite, #%s th.invite { display:none !important }', $attrib'id', $attrib'id');
-            $this->rc->output->add_footer(html::tag('style', array('type' => 'text/css'), $css));
+            $this->rc->output->add_footer(html::tag('style', 'type' => 'text/css', $css));
         }
 
         return $table->show($attrib);
@@ -484,29 +497,32 @@
     /**
      *
      */
-    function attendees_form($attrib = array())
+    public function attendees_form($attrib = )
     {
-        $input = new html_inputfield(array(
+        $input = new html_inputfield(
                 'name' => 'participant',
                 'id' => 'edit-attendee-name',
                 'size' => !empty($attrib'size') ? $attrib'size' : null,
-                'class' => 'form-control'
-        ));
+                'class' => 'form-control',
+        );
 
-        $textarea = new html_textarea(array(
+        $textarea = new html_textarea(
                 'name' => 'comment',
                 'id' => 'edit-attendees-comment',
                 'rows' => 4,
                 'cols' => 55,
                 'title' => $this->plugin->gettext('itipcommenttitle'),
-                'class' => 'form-control'
-        ));
-
-        return html::div($attrib,
-            html::div('form-searchbar', $input->show() . " " .
-                html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->plugin->gettext('addattendee')))
+                'class' => 'form-control',
+        );
+
+        return html::div(
+            $attrib,
+            html::div(
+                'form-searchbar',
+                $input->show() . " " .
+                html::tag('input', 'type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->plugin->gettext('addattendee'))
                 // . " " . html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->plugin->gettext('scheduletime').'...'))
-                ) .
+            ) .
             html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->plugin->gettext('itipcomment')) . $textarea->show())
         );
     }
@@ -514,7 +530,7 @@
     /**
      *
      */
-    function edit_attendees_notify($attrib = )
+    public function edit_attendees_notify($attrib = )
     {
         $checkbox = new html_checkbox('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox');
         return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->plugin->gettext('sendnotifications')));
@@ -523,7 +539,7 @@
     /**
      * Form for uploading and importing tasks
      */
-    function tasks_import_form($attrib = )
+    public function tasks_import_form($attrib = )
     {
         if (empty($attrib'id')) {
             $attrib'id' = 'rcmImportForm';
@@ -536,49 +552,54 @@
             $accept .= ', .zip, application/zip';
         }
 
-        $input = new html_inputfield(array(
+        $input = new html_inputfield(
                 'id'     => 'importfile',
                 'type'   => 'file',
                 'name'   => '_data',
                 'size'   => !empty($attrib'uploadfieldsize') ? $attrib'uploadfieldsize' : null,
-                'accept' => $accept
-        ));
+                'accept' => $accept,
+        );
 
-        $html = html::div('form-section form-group row',
-            html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
+        $html = html::div(
+            'form-section form-group row',
+            html::label('class' => 'col-sm-4 col-form-label', 'for' => 'importfile', rcube::Q($this->rc->gettext('importfromfile')))
             . html::div('col-sm-8', $input->show()
-                . html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
+                . html::div('hint', $this->rc->gettext('name' => 'maxuploadsize', 'vars' => 'size' => $max_filesize)))
         );
 
-        $html .= html::div('form-section form-group row',
-            html::label(array('for' => 'task-import-list', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('list'))
-            . html::div('col-sm-8', $this->tasklist_select(array('name' => 'source', 'id' => 'task-import-list', 'editable' => true)))
+        $html .= html::div(
+            'form-section form-group row',
+            html::label('for' => 'task-import-list', 'class' => 'col-sm-4 col-form-label', $this->plugin->gettext('list'))
+            . html::div('col-sm-8', $this->tasklist_select('name' => 'source', 'id' => 'task-import-list', 'editable' => true))
         );
 
         $this->rc->output->add_gui_object('importform', $attrib'id');
         $this->rc->output->add_label('import', 'importerror');
 
         return html::tag('p', null, $this->plugin->gettext('importtext'))
-            .html::tag('form', array(
-                'action'  => $this->rc->url(array('task' => 'tasklist', 'action' => 'import')),
+            . html::tag(
+                'form',
+                
+                'action'  => $this->rc->url('task' => 'tasklist', 'action' => 'import'),
                 'method'  => 'post',
                 'enctype' => 'multipart/form-data',
                 'id'      => $attrib'id',
-            ),
-            $html
-        );
+            ,
+                $html
+            );
     }
 
     /**
      * Form to select options for exporting tasks
      */
-    function tasks_export_form($attrib = )
+    public function tasks_export_form($attrib = )
     {
         if (empty($attrib'id')) {
             $attrib'id' = 'rcmTaskExportForm';
         }
 
-        $html = html::div('form-section form-group row',
+        $html = html::div(
+            'form-section form-group row',
             html::label('for' => 'task-export-list', 'class' => 'col-sm-4 col-form-label', $this->plugin->gettext('list'))
             . html::div('col-sm-8', $this->tasklist_select(
                         'name'  => 'source',
@@ -588,16 +609,19 @@
         );
 
         $checkbox = new html_checkbox('name' => 'attachments', 'id' => 'task-export-attachments', 'value' => 1, 'class' => 'form-check-input pretty-checkbox');
-        $html .= html::div('form-section row form-check',
+        $html .= html::div(
+            'form-section row form-check',
             html::label('for' => 'task-export-attachments', 'class' => 'col-sm-4 col-form-label', $this->plugin->gettext('exportattachments'))
             . html::div('col-sm-8', $checkbox->show(1))
         );
 
         $this->register_gui_object('exportform', $attrib'id');
 
-        return html::tag('form', 
+        return html::tag(
+            'form',
+            
                 'action' => $this->rc->url('task' => 'tasklist', 'action' => 'export'),
-                'method' => 'post', 'id' => $attrib'id'
+                'method' => 'post', 'id' => $attrib'id',
             ,
             $html
         );
@@ -606,7 +630,7 @@
     /**
      * Wrapper for rcube_output_html::add_gui_object()
      */
-    function register_gui_object($name, $id)
+    public function register_gui_object($name, $id)
     {
         $this->gui_objects$name = $id;
         $this->rc->output->add_gui_object($name, $id);
@@ -616,7 +640,7 @@
      * Getter for registered gui objects.
      * (for manual registration when loading the inline UI)
      */
-    function get_gui_objects()
+    public function get_gui_objects()
     {
         return $this->gui_objects;
     }

roundcubemail-1.5.tar.gz/plugins/tasklist/tests Deleted

roundcubemail-1.5.tar.gz/plugins/tasklist/tests/LocalizationTest.php Deleted

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/az.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('az',{
-"Redo": "\u0130r\u0259li",
-"Undo": "Geriy\u0259",
-"Cut": "K\u0259s",
-"Copy": "K\u00f6\u00e7\u00fcr",
-"Paste": "\u018flav\u0259 et",
-"Select all": "Ham\u0131s\u0131n\u0131 se\u00e7",
-"New document": "Yeni s\u0259n\u0259d",
-"Ok": "Oldu",
-"Cancel": "L\u0259\u011fv et",
-"Visual aids": "Konturlar\u0131 g\u00f6st\u0259r",
-"Bold": "Qal\u0131n",
-"Italic": "Maili",
-"Underline": "Alt x\u0259ttli",
-"Strikethrough": "Silinmi\u015f",
-"Superscript": "Yuxar\u0131 indeks",
-"Subscript": "A\u015fa\u011f\u0131 indeks",
-"Clear formatting": "Format\u0131 t\u0259mizl\u0259",
-"Align left": "Sol t\u0259r\u0259f \u00fczr\u0259",
-"Align center": "M\u0259rk\u0259z \u00fczr\u0259",
-"Align right": "Sa\u011f t\u0259r\u0259f \u00fczr\u0259",
-"Justify": "H\u0259r iki t\u0259r\u0259f \u00fczr\u0259",
-"Bullet list": "S\u0131ras\u0131z siyah\u0131",
-"Numbered list": "N\u00f6mr\u0259l\u0259nmi\u015f siyah\u0131",
-"Decrease indent": "Bo\u015flu\u011fu azalt",
-"Increase indent": "Bo\u015flu\u011fu art\u0131r",
-"Close": "Ba\u011fla",
-"Formats": "Formatlar",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Sizin brauzeriniz m\u00fcbadil\u0259 buferin\u0259 birba\u015fa yolu d\u0259st\u0259kl\u0259mir. Z\u0259hm\u0259t olmasa, bunun yerin\u0259 klaviaturan\u0131n Ctrl+X\/C\/V d\u00fcym\u0259l\u0259rind\u0259n istifad\u0259 edin.",
-"Headers": "Ba\u015fl\u0131qlar",
-"Header 1": "Ba\u015fl\u0131q 1",
-"Header 2": "Ba\u015fl\u0131q 2",
-"Header 3": "Ba\u015fl\u0131q 3",
-"Header 4": "Ba\u015fl\u0131q 4",
-"Header 5": "Ba\u015fl\u0131q 5",
-"Header 6": "Ba\u015fl\u0131q 6",
-"Headings": "Ba\u015fl\u0131qlar",
-"Heading 1": "Ba\u015fl\u0131q 1",
-"Heading 2": "Ba\u015fl\u0131q 2",
-"Heading 3": "Ba\u015fl\u0131q 3",
-"Heading 4": "Ba\u015fl\u0131q 4",
-"Heading 5": "Ba\u015fl\u0131q 5",
-"Heading 6": "Ba\u015fl\u0131q 6",
-"Preformatted": "\u018fvv\u0259lc\u0259d\u0259n formatland\u0131r\u0131lm\u0131\u015f",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kod",
-"Paragraph": "Paraqraf",
-"Blockquote": "Sitat",
-"Inline": "S\u0259tir i\u00e7i",
-"Blocks": "Bloklar",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Hal-haz\u0131rda adi m\u0259tn rejimind\u0259 yerl\u0259\u015fdirilir. M\u0259zmun sad\u0259 m\u0259tn \u015f\u0259klind\u0259 yerl\u0259\u015fdiril\u0259c\u0259k, h\u0259l\u0259 bu se\u00e7imi d\u0259yi\u015fdirm\u0259.",
-"Font Family": "Font stili",
-"Font Sizes": "Font \u00f6l\u00e7\u00fcl\u0259ri",
-"Class": "Sinif",
-"Browse for an image": "\u015e\u0259kil se\u00e7",
-"OR": "V\u018f YA",
-"Drop an image here": "\u015e\u0259kli buraya s\u00fcr\u00fckl\u0259yin",
-"Upload": "Y\u00fckl\u0259",
-"Block": "Blokla",
-"Align": "D\u00fczl\u0259ndir",
-"Default": "Susmaya g\u00f6r\u0259",
-"Circle": "Dair\u0259",
-"Disc": "Disk",
-"Square": "Sah\u0259",
-"Lower Alpha": "Ki\u00e7ik Alfa \u0259lifbas\u0131",
-"Lower Greek": "Ki\u00e7ik Yunan \u0259lifbas\u0131",
-"Lower Roman": "Ki\u00e7ik Roma \u0259lifbas\u0131",
-"Upper Alpha": "B\u00f6y\u00fck Alfa \u0259lifbas\u0131",
-"Upper Roman": "B\u00f6y\u00fck Roma \u0259lifbas\u0131",
-"Anchor": "L\u00f6vb\u0259r",
-"Name": "Ad",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0130D h\u0259rfl\u0259 ba\u015flamal\u0131d\u0131r. Daha sonra is\u0259 h\u0259rf, r\u0259q\u0259m, tire, n\u00f6qt\u0259, qo\u015fan\u00f6qt\u0259, v\u0259 altx\u0259tt kimi simvollardan istifad\u0259 oluna bil\u0259r.",
-"You have unsaved changes are you sure you want to navigate away?": "Sizd\u0259 yadda saxlan\u0131lmayan d\u0259yi\u015fiklikl\u0259r var \u0259minsiniz ki, getm\u0259k ist\u0259yirsiniz?",
-"Restore last draft": "Son layih\u0259nin b\u0259rpas\u0131",
-"Special character": "X\u00fcsusi simvollar",
-"Source code": "M\u0259nb\u0259 kodu",
-"Insert\/Edit code sample": "Kod n\u00fcmun\u0259sin\u0259 \u0259lav\u0259\/d\u00fcz\u0259li\u015f et",
-"Language": "Dil",
-"Code sample": "Kod n\u00fcmun\u0259si",
-"Color": "R\u0259ng",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Soldan sa\u011fa",
-"Right to left": "Sa\u011fdan sola",
-"Emoticons": "Emosiyalar",
-"Document properties": "S\u0259n\u0259din x\u00fcsusiyy\u0259tl\u0259ri",
-"Title": "Ba\u015fl\u0131q",
-"Keywords": "A\u00e7ar s\u00f6zl\u0259r",
-"Description": "T\u0259sviri",
-"Robots": "Robotlar",
-"Author": "M\u00fc\u0259llif",
-"Encoding": "Kodla\u015fd\u0131rma",
-"Fullscreen": "Tam ekran rejimi",
-"Action": "\u018fmr",
-"Shortcut": "Q\u0131sayol",
-"Help": "K\u00f6m\u0259k",
-"Address": "Adres",
-"Focus to menubar": "Menyu \u00e7ubu\u011funa diqq\u0259t et",
-"Focus to toolbar": "Al\u0259tl\u0259r \u00e7ubu\u011funa diqq\u0259t et",
-"Focus to element path": "Elementin m\u0259nb\u0259yin\u0259 diqq\u0259t et",
-"Focus to contextual toolbar": "Kontekst menyuya diqq\u0259t et",
-"Insert link (if link plugin activated)": "Link \u0259lav\u0259 et (\u0259g\u0259r link \u0259lav\u0259si aktivdirs\u0259)",
-"Save (if save plugin activated)": "Yadda\u015fa yaz (\u0259g\u0259r yadda\u015fa yaz \u0259lav\u0259si aktivdirs\u0259)",
-"Find (if searchreplace plugin activated)": "Tap (\u0259g\u0259r axtar\u0131\u015f \u0259lav\u0259si aktivdirs\u0259)",
-"Plugins installed ({0}):": "\u018flav\u0259l\u0259r y\u00fckl\u0259ndi ({0}):",
-"Premium plugins:": "Premium \u0259lav\u0259l\u0259r",
-"Learn more...": "Daha \u00e7ox \u00f6yr\u0259n...",
-"You are using {0}": "Siz {0} istifad\u0259 edirsiniz",
-"Plugins": "\u018flav\u0259l\u0259r",
-"Handy Shortcuts": "Laz\u0131ml\u0131 q\u0131sayollar",
-"Horizontal line": "Horizontal x\u0259tt",
-"Insert\/edit image": "\u015e\u0259kilin \u0259lav\u0259\/redakt\u0259 edilm\u0259si",
-"Image description": "\u015e\u0259kilin t\u0259sviri",
-"Source": "M\u0259nb\u0259",
-"Dimensions": "\u00d6l\u00e7\u00fcl\u0259r",
-"Constrain proportions": "Nisb\u0259tl\u0259rin saxlan\u0131lmas\u0131",
-"General": "\u00dcmumi",
-"Advanced": "Geni\u015fl\u0259nmi\u015f",
-"Style": "Stil",
-"Vertical space": "Vertikal sah\u0259",
-"Horizontal space": "Horizontal sah\u0259",
-"Border": "\u00c7\u0259r\u00e7iv\u0259",
-"Insert image": "\u015e\u0259kil yerl\u0259\u015fdir",
-"Image": "\u015e\u0259kil",
-"Image list": "\u015e\u0259kil listi",
-"Rotate counterclockwise": "Saat \u0259qr\u0259binin \u0259ksin\u0259 f\u0131rlat",
-"Rotate clockwise": "Saat \u0259qr\u0259bi istiqam\u0259tind\u0259 f\u0131rlat",
-"Flip vertically": "\u015eaquli \u00e7evir",
-"Flip horizontally": "\u00dcfiqi \u00e7evir",
-"Edit image": "\u015e\u0259kili redakt\u0259 et",
-"Image options": "\u015e\u0259kil parametrl\u0259ri",
-"Zoom in": "Yax\u0131nla\u015fd\u0131r",
-"Zoom out": "Uzaqla\u015fd\u0131r",
-"Crop": "K\u0259s",
-"Resize": "\u00d6l\u00e7\u00fcl\u0259ri d\u0259yi\u015f",
-"Orientation": "Oriyentasiya",
-"Brightness": "Parlaql\u0131q",
-"Sharpen": "K\u0259skinl\u0259\u015fdir",
-"Contrast": "Ziddiyy\u0259t",
-"Color levels": "R\u0259ng s\u0259viyy\u0259l\u0259ri",
-"Gamma": "Qamma",
-"Invert": "T\u0259rsin\u0259 \u00e7evir",
-"Apply": "T\u0259tbiq et",
-"Back": "Geri",
-"Insert date\/time": "G\u00fcn\/tarix \u0259lav\u0259 et",
-"Date\/time": "Tarix\/saat",
-"Insert link": "Linkin \u0259lav\u0259 edilm\u0259si",
-"Insert\/edit link": "Linkin \u0259lav\u0259\/redakt\u0259 edilm\u0259si",
-"Text to display": "G\u00f6r\u00fcn\u0259n yaz\u0131n\u0131n t\u0259sviri",
-"Url": "Linkin \u00fcnvan\u0131",
-"Target": "H\u0259d\u0259f",
-"None": "Yoxdur",
-"New window": "Yeni p\u0259nc\u0259r\u0259d\u0259 a\u00e7\u0131ls\u0131n",
-"Remove link": "Linki sil",
-"Anchors": "L\u00f6vb\u0259rl\u0259r",
-"Link": "Ke\u00e7id",
-"Paste or type a link": "Ke\u00e7idi yerl\u0259\u015fdirin v\u0259 ya yaz\u0131n",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Daxil etdiyiniz URL bir e-mail kimi g\u00f6r\u00fcn\u00fcr. \u018fg\u0259r t\u0259l\u0259b olunan mailto: prefix \u0259lav\u0259 etm\u0259k ist\u0259yirsiniz?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Daxil etdiyiniz URL bir e-mail kimi g\u00f6r\u00fcn\u00fcr. \u018fg\u0259r t\u0259l\u0259b olunan mailto: prefix \u0259lav\u0259 etm\u0259k ist\u0259yirsiniz?",
-"Link list": "Ke\u00e7id listi",
-"Insert video": "Videonun \u0259lav\u0259 edilm\u0259si",
-"Insert\/edit video": "Videonun \u0259lav\u0259\/redakt\u0259 edilm\u0259si",
-"Insert\/edit media": "Media \u0259lav\u0259\/d\u00fcz\u0259li\u015f et",
-"Alternative source": "Alternativ m\u0259nb\u0259",
-"Poster": "Poster",
-"Paste your embed code below:": "\u00d6z kodunuzu a\u015fa\u011f\u0131 \u0259lav\u0259 edin:",
-"Embed": "\u018flav\u0259 etm\u0259k \u00fc\u00e7\u00fcn kod",
-"Media": "Media",
-"Nonbreaking space": "Q\u0131r\u0131lmaz sah\u0259",
-"Page break": "S\u0259hif\u0259nin q\u0131r\u0131lmas\u0131",
-"Paste as text": "M\u0259tn kimi \u0259lav\u0259 et",
-"Preview": "\u0130lkinbax\u0131\u015f",
-"Print": "\u00c7ap et",
-"Save": "Yadda saxla",
-"Find": "Tap",
-"Replace with": "Bununla d\u0259yi\u015fdir",
-"Replace": "D\u0259yi\u015fdir",
-"Replace all": "Ham\u0131s\u0131n\u0131 d\u0259yi\u015fdir",
-"Prev": "\u018fvv\u0259lki",
-"Next": "N\u00f6vb\u0259ti",
-"Find and replace": "Tap v\u0259 d\u0259yi\u015fdir",
-"Could not find the specified string.": "G\u00f6st\u0259ril\u0259n s\u0259tiri tapmaq olmur",
-"Match case": "Registri n\u0259z\u0259r\u0259 al",
-"Whole words": "Tam s\u00f6zl\u0259r",
-"Spellcheck": "Orfoqrafiyan\u0131 yoxla",
-"Ignore": "\u0130qnorla",
-"Ignore all": "Ham\u0131s\u0131n\u0131 iqnorla",
-"Finish": "Bitir",
-"Add to Dictionary": "L\u00fc\u011f\u0259t\u0259 \u0259lav\u0259 edilsin",
-"Insert table": "S\u0259tir \u0259lav\u0259 et",
-"Table properties": "C\u0259dv\u0259lin x\u00fcsusiyy\u0259tl\u0259ri",
-"Delete table": "C\u0259dv\u0259li sil",
-"Cell": "H\u00fccr\u0259",
-"Row": "S\u0259tir",
-"Column": "S\u00fctun",
-"Cell properties": "H\u00fccr\u0259nin x\u00fcsusiyy\u0259tl\u0259ri",
-"Merge cells": "H\u00fccr\u0259l\u0259ri birl\u0259\u015ftir",
-"Split cell": "H\u00fccr\u0259l\u0259rin say\u0131",
-"Insert row before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
-"Insert row after": "Sonras\u0131na s\u0259tir \u0259lav\u0259 et",
-"Delete row": "S\u0259tri sil",
-"Row properties": "S\u0259trin x\u00fcsusiyy\u0259tl\u0259ri",
-"Cut row": "S\u0259tiri k\u0259s",
-"Copy row": "S\u0259tiri k\u00f6\u00e7\u00fcr",
-"Paste row before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
-"Paste row after": "Sonras\u0131na s\u0259tir \u0259lav\u0259 et",
-"Insert column before": "\u018fvv\u0259lin\u0259 s\u0259tir \u0259lav\u0259 et",
-"Insert column after": "\u018fvv\u0259lin\u0259 s\u00fctun \u0259lav\u0259 et",
-"Delete column": "S\u00fctunu sil",
-"Cols": "S\u00fctunlar",
-"Rows": "S\u0259tirl\u0259r",
-"Width": "Eni",
-"Height": "H\u00fcnd\u00fcrl\u00fcy\u00fc",
-"Cell spacing": "H\u00fccr\u0259l\u0259rin aras\u0131nda m\u0259saf\u0259",
-"Cell padding": "H\u00fccr\u0259l\u0259rin sah\u0259l\u0259ri",
-"Caption": "Ba\u015flan\u011f\u0131c",
-"Left": "Sol t\u0259r\u0259f \u00fczr\u0259",
-"Center": "M\u0259rk\u0259z \u00fczr\u0259",
-"Right": "Sa\u011f t\u0259r\u0259f \u00fczr\u0259",
-"Cell type": "H\u00fccr\u0259nin tipi",
-"Scope": "Sfera",
-"Alignment": "D\u00fczl\u0259ndirm\u0259",
-"H Align": "H D\u00fczl\u0259ndir",
-"V Align": "V D\u00fczl\u0259ndir",
-"Top": "Yuxar\u0131",
-"Middle": "Orta",
-"Bottom": "A\u015fa\u011f\u0131",
-"Header cell": "H\u00fccr\u0259nin ba\u015fl\u0131\u011f\u0131",
-"Row group": "S\u0259tirin qrupu",
-"Column group": "S\u00fctunun qrupu",
-"Row type": "S\u0259tirin tipi",
-"Header": "Ba\u015fl\u0131q",
-"Body": "K\u00fctl\u0259",
-"Footer": "\u018fn a\u015fa\u011f\u0131",
-"Border color": "\u00c7\u0259r\u00e7iv\u0259 r\u0259ngi",
-"Insert template": "\u015eablon \u0259lav\u0259 et",
-"Templates": "\u015eablonlar",
-"Template": "\u015eablon",
-"Text color": "M\u0259tnin r\u0259ngi",
-"Background color": "Arxafon r\u0259ngi",
-"Custom...": "\u00c7\u0259kilm\u0259...",
-"Custom color": "\u00c7\u0259kilm\u0259 r\u0259ng",
-"No color": "R\u0259ngsiz",
-"Table of Contents": "M\u00fcnd\u0259ricat",
-"Show blocks": "Bloklar\u0131 g\u00f6st\u0259r",
-"Show invisible characters": "G\u00f6r\u00fcnm\u0259y\u0259n simvollar\u0131 g\u00f6st\u0259r",
-"Words: {0}": "S\u00f6zl\u0259r: {0}",
-"{0} words": "{0} s\u00f6z",
-"File": "Fayl",
-"Edit": "Redakt\u0259 et",
-"Insert": "\u018flav\u0259 et",
-"View": "G\u00f6r\u00fcn\u00fc\u015f",
-"Format": "Format",
-"Table": "C\u0259dv\u0259l",
-"Tools": "Al\u0259tl\u0259r",
-"Powered by {0}": "{0} t\u0259r\u0259find\u0259n t\u0259chiz edilib",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "B\u00f6y\u00fck m\u0259tn sah\u0259si \u0259lav\u0259 edilib. Menyu \u00fc\u00e7\u00fcn ALT-F9 d\u00fcym\u0259sini bas\u0131n. Al\u0259tl\u0259r paneli \u00fc\u00e7\u00fcn ALT-F10 d\u00fcym\u0259sini bas\u0131n. K\u00f6m\u0259k \u00fc\u00e7\u00fcn ALT-0 d\u00fcym\u0259l\u0259rin bas\u0131n."
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/be.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('be',{
-"Redo": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
-"Undo": "\u0412\u044f\u0440\u043d\u0443\u0446\u044c",
-"Cut": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c",
-"Copy": "\u041a\u0430\u043f\u0456\u0440\u0430\u0432\u0430\u0446\u044c",
-"Paste": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
-"Select all": "\u0412\u044b\u043b\u0443\u0447\u044b\u0446\u044c \u0443\u0441\u0451",
-"New document": "\u041d\u043e\u0432\u044b \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "Ok",
-"Cancel": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
-"Visual aids": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
-"Bold": "\u0422\u043b\u0443\u0441\u0442\u044b",
-"Italic": "\u041a\u0443\u0440\u0441\u0456\u045e",
-"Underline": "\u041f\u0430\u0434\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
-"Strikethrough": "\u0417\u0430\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
-"Subscript": "\u041d\u0456\u0436\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
-"Clear formatting": "\u0410\u0447\u044b\u0441\u0446\u0456\u0446\u044c \u0444\u0430\u0440\u043c\u0430\u0442",
-"Align left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Align center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
-"Align right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Justify": "\u041f\u0430 \u0448\u044b\u0440\u044b\u043d\u0456",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0456\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
-"Numbered list": "\u041d\u0443\u043c\u0430\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
-"Decrease indent": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Increase indent": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Close": "\u0417\u0430\u0447\u044b\u043d\u0456\u0446\u044c",
-"Formats": "\u0424\u0430\u0440\u043c\u0430\u0442",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u045e\u0437\u044d\u0440 \u043d\u0435 \u043f\u0430\u0434\u0442\u0440\u044b\u043c\u043b\u0456\u0432\u0430\u0435 \u043f\u0440\u0430\u043c\u044b \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0430\u0431\u043c\u0435\u043d\u0443. \u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u043a\u0430\u0440\u044b\u0441\u0442\u043e\u045e\u0432\u0430\u0439\u0446\u0435 \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u044b\u044f \u0441\u043f\u0430\u043b\u0443\u0447\u044d\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448: Ctrl + X\/C\/V.",
-"Headers": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
-"Header 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
-"Header 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
-"Header 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
-"Header 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
-"Header 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
-"Header 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
-"Headings": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
-"Heading 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
-"Heading 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
-"Heading 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
-"Heading 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
-"Heading 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
-"Preformatted": "\u0412\u044b\u0440\u0430\u045e\u043d\u0430\u0432\u0430\u043d\u044b",
-"Div": "\u0411\u043b\u043e\u043a",
-"Pre": "\u041f\u0440\u0430\u0434\u0444\u0430\u0440\u043c\u0430\u0442\u0430\u0432\u0430\u043d\u043d\u0435",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Blockquote": "\u0426\u044b\u0442\u0430\u0442\u0430",
-"Inline": "\u0420\u0430\u0434\u043a\u043e\u0432\u044b",
-"Blocks": "\u0411\u043b\u043e\u043a\u0456",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0423\u0441\u0442\u0430\u045e\u043a\u0430 \u0437\u0434\u0437\u044f\u0439\u0441\u043d\u044f\u0435\u0446\u0446\u0430 \u045e \u0432\u044b\u0433\u043b\u044f\u0434\u0437\u0435 \u043f\u0440\u043e\u0441\u0442\u0430\u0433\u0430 \u0442\u044d\u043a\u0441\u0442\u0443, \u043f\u0430\u043a\u0443\u043b\u044c \u043d\u0435 \u0430\u0434\u043a\u043b\u044e\u0447\u044b\u0446\u044c \u0434\u0430\u0434\u0437\u0435\u043d\u0443\u044e \u043e\u043f\u0446\u044b\u044e.",
-"Font Family": "\u0428\u0440\u044b\u0444\u0442",
-"Font Sizes": "\u041f\u0430\u043c\u0435\u0440 \u0448\u0440\u044b\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u041f\u043e\u0448\u0443\u043a \u0432\u044b\u044f\u0432\u044b",
-"OR": "\u0410\u0411\u041e",
-"Drop an image here": "\u0410\u0434\u043a\u0456\u043d\u044c\u0446\u0435 \u0432\u044b\u044f\u0432\u0443 \u0442\u0443\u0442",
-"Upload": "\u0417\u0430\u043f\u0430\u043c\u043f\u0430\u0432\u0430\u0446\u044c",
-"Block": "\u0417\u0430\u0431\u043b\u0430\u043a\u0430\u0432\u0430\u0446\u044c",
-"Align": "\u0412\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b",
-"Circle": "\u0410\u043a\u0440\u0443\u0436\u043d\u0430\u0441\u0446\u0456",
-"Disc": "\u041a\u0440\u0443\u0433\u0456",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
-"Lower Alpha": "\u041c\u0430\u043b\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Lower Greek": "\u041c\u0430\u043b\u044b\u044f \u0433\u0440\u044d\u0447\u0430\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Lower Roman": "\u041c\u0430\u043b\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
-"Upper Alpha": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Upper Roman": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
-"Anchor": "\u042f\u043a\u0430\u0440",
-"Name": "\u0406\u043c\u044f",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u043f\u0430\u0432\u0456\u043d\u0435\u043d \u043f\u0430\u0447\u044b\u043d\u0430\u0446\u0446\u0430 \u0437 \u043b\u0456\u0442\u0430\u0440\u044b, \u0430 \u043f\u043e\u0442\u044b\u043c \u0443\u0442\u0440\u044b\u043c\u043b\u0456\u0432\u0430\u0446\u044c \u0442\u043e\u043b\u044c\u043a\u0456 \u043b\u0456\u0442\u0430\u0440\u044b, \u043b\u0456\u0447\u0431\u044b, \u043f\u0440\u0430\u0446\u044f\u0436\u043d\u0456\u043a, \u043a\u0440\u043e\u043f\u043a\u0456, \u0434\u0432\u0443\u043a\u0440\u043e\u043f'\u044f \u0446\u0456 \u043f\u0430\u0434\u043a\u0440\u044d\u0441\u043b\u0456\u0432\u0430\u043d\u043d\u0456.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0451\u0441\u0446\u044c \u043d\u0435\u0437\u0430\u0445\u0430\u0432\u0430\u043d\u044b\u044f \u0437\u043c\u0435\u043d\u044b. \u0412\u044b \u045e\u043f\u044d\u045e\u043d\u0435\u043d\u044b\u044f, \u0448\u0442\u043e \u0445\u043e\u0447\u0430\u0446\u0435 \u0432\u044b\u0439\u0441\u0446\u0456?",
-"Restore last draft": "\u0410\u0434\u043d\u0430\u045e\u043b\u0435\u043d\u043d\u0435 \u0430\u043f\u043e\u0448\u043d\u044f\u0433\u0430 \u043f\u0440\u0430\u0435\u043a\u0442\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u044b\u044f\u043b\u044c\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
-"Source code": "\u0417\u044b\u0445\u043e\u0434\u043d\u044b \u043a\u043e\u0434",
-"Insert\/Edit code sample": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u043a\u043e\u0434",
-"Language": "\u041c\u043e\u0432\u0430",
-"Code sample": "\u041f\u0440\u044b\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0430",
-"Color": "\u041a\u043e\u043b\u0435\u0440",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0417\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u0430",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u0430",
-"Emoticons": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043c\u0430\u0439\u043b",
-"Document properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u0430\u0432\u044b\u044f \u0441\u043b\u043e\u0432\u044b",
-"Description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435",
-"Robots": "\u0420\u043e\u0431\u0430\u0442\u044b",
-"Author": "\u0410\u045e\u0442\u0430\u0440",
-"Encoding": "\u041a\u0430\u0434\u044b\u0440\u043e\u045e\u043a\u0430",
-"Fullscreen": "\u041f\u043e\u045e\u043d\u0430\u044d\u043a\u0440\u0430\u043d\u043d\u044b \u0440\u044d\u0436\u044b\u043c",
-"Action": "\u0414\u0437\u0435\u044f\u043d\u043d\u0435",
-"Shortcut": "\u0428\u043e\u0440\u0442\u043a\u0430\u0442",
-"Help": "\u0414\u0430\u043f\u0430\u043c\u043e\u0433\u0430",
-"Address": "\u0410\u0434\u0440\u0430\u0441",
-"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0440\u0430\u0434\u043e\u043a \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043f\u0430\u043d\u044d\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u045e",
-"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0448\u043b\u044f\u0445 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430",
-"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u0430\u043d\u0442\u044d\u043a\u0441\u0442\u043d\u0443\u044e \u043f\u0430\u043d\u044d\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u045e",
-"Insert link (if link plugin activated)": "\u040e\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443 (\u043a\u0430\u043b\u0456 \u043f\u043b\u0430\u0433\u0456\u043d \u0441\u043f\u0430\u0441\u044b\u043b\u0430\u043a \u0430\u043a\u0442\u044b\u0432\u0430\u0432\u0430\u043d\u044b)",
-"Save (if save plugin activated)": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c (\u043a\u0430\u043b\u0456 \u043f\u043b\u0430\u0433\u0456\u043d \u0437\u0430\u0445\u0430\u0432\u0430\u043d\u043d\u044f \u0430\u043a\u0442\u044b\u0432\u0430\u0432\u0430\u043d\u044b)",
-"Find (if searchreplace plugin activated)": "\u0428\u0443\u043a\u0430\u0446\u044c (\u043a\u0430\u043b\u0456 \u043f\u043b\u0430\u0433\u0456\u043d \u043f\u043e\u0448\u0443\u043a\u0443 \u0430\u043a\u0442\u044b\u0432\u0430\u0432\u0430\u043d\u044b)",
-"Plugins installed ({0}):": "\u0423\u0441\u0442\u0430\u043b\u044f\u0432\u0430\u043d\u0430 \u043f\u043b\u0430\u0433\u0456\u043d\u0430\u045e ({0}):",
-"Premium plugins:": "\u041f\u0440\u044d\u043c\u0456\u044f\u043b\u044c\u043d\u044b\u044f \u043f\u043b\u0430\u0433\u0456\u043d\u044b:",
-"Learn more...": "\u041f\u0430\u0434\u0440\u0430\u0431\u044f\u0437\u043d\u0435\u0439 ...",
-"You are using {0}": "\u0412\u044b \u043a\u0430\u0440\u044b\u0441\u0442\u0430\u0435\u0446\u0435\u0441\u044f  {0}",
-"Plugins": "\u041f\u043b\u0430\u0433\u0456\u043d\u044b",
-"Handy Shortcuts": "\u0417\u0440\u0443\u0447\u043d\u044b\u044f \u0448\u043e\u0440\u0442\u043a\u0430\u0442\u044b",
-"Horizontal line": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0456\u043d\u0456\u044f",
-"Insert\/edit image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"Image description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435 \u0432\u044b\u044f\u0432\u044b",
-"Source": "\u041a\u0440\u044b\u043d\u0456\u0446\u0430",
-"Dimensions": "\u041f\u0430\u043c\u0435\u0440",
-"Constrain proportions": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c \u043f\u0440\u0430\u043f\u043e\u0440\u0446\u044b\u0456",
-"General": "\u0410\u0433\u0443\u043b\u044c\u043d\u0430\u0435",
-"Advanced": "\u041f\u0430\u0448\u044b\u0440\u0430\u043d\u0430\u0435",
-"Style": "\u0421\u0442\u044b\u043b\u044c",
-"Vertical space": "\u0412\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
-"Horizontal space": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
-"Border": "\u041c\u044f\u0436\u0430",
-"Insert image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"Image": "\u0412\u044b\u044f\u0432\u0430",
-"Image list": "\u0421\u043f\u0456\u0441 \u0432\u044b\u044f\u045e",
-"Rotate counterclockwise": "\u041f\u0430\u0432\u044f\u0440\u043d\u0443\u0446\u044c counterclockwise",
-"Rotate clockwise": "\u041f\u0430\u0432\u044f\u0440\u043d\u0443\u0446\u044c clockwise",
-"Flip vertically": "\u0410\u0434\u043b\u044e\u0441\u0442\u0440\u0430\u0432\u0430\u0446\u044c \u0432\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u0430",
-"Flip horizontally": "\u0410\u0434\u043b\u044e\u0441\u0442\u0440\u0430\u0432\u0430\u0446\u044c \u0433\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430",
-"Edit image": "\u0420\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"Image options": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0432\u044b\u044f\u0432\u044b",
-"Zoom in": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c",
-"Zoom out": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c",
-"Crop": "\u0410\u0431\u0440\u044d\u0437\u0430\u0446\u044c",
-"Resize": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043f\u0430\u043c\u0435\u0440",
-"Orientation": "\u0410\u0440\u044b\u0435\u043d\u0442\u0430\u0446\u044b\u044f",
-"Brightness": "\u042f\u0440\u043a\u0430\u0441\u0446\u044c",
-"Sharpen": "\u0412\u044b\u0440\u0430\u0437\u043d\u0430\u0441\u0446\u044c",
-"Contrast": "\u041a\u0430\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0423\u0437\u0440\u043e\u045e\u043d\u0456 \u043a\u043e\u043b\u0435\u0440\u0430\u045e",
-"Gamma": "\u0413\u0430\u043c\u0430",
-"Invert": "\u0406\u043d\u0432\u0435\u0440\u0442\u0430\u0432\u0430\u0446\u044c",
-"Apply": "\u0423\u0436\u044b\u0446\u044c",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Insert date\/time": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Insert\/edit link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Text to display": "\u0422\u044d\u043a\u0441\u0442 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
-"Url": "\u0410\u0434\u0440\u0430\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
-"Target": "\u0410\u0434\u043a\u0440\u044b\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"None": "\u041d\u044f\u043c\u0430",
-"New window": "\u0423 \u043d\u043e\u0432\u044b\u043c \u0430\u043a\u043d\u0435",
-"Remove link": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Anchors": "\u042f\u043a\u0430\u0440\u044b",
-"Link": "\u0421\u043f\u0430\u0441\u044b\u043b\u043a\u0430",
-"Paste or type a link": "\u0423\u0441\u0442\u0430\u045e\u0446\u0435 \u0430\u0431\u043e \u045e\u0432\u044f\u0434\u0437\u0456\u0446\u0435 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0430\u0434\u0440\u0430\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u0439 \u043f\u043e\u0448\u0442\u044b. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b mailto: \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0437\u043d\u0435\u0448\u043d\u044e\u044e \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b http:\/\/ \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
-"Link list": "\u0421\u043f\u0456\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u0430\u043a",
-"Insert video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
-"Insert\/edit video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
-"Insert\/edit media": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u043c\u0435\u0434\u044b\u044f",
-"Alternative source": "\u0410\u043b\u044c\u0442\u044d\u0440\u043d\u0430\u0442\u044b\u045e\u043d\u0430\u044f \u043a\u0440\u044b\u043d\u0456\u0446\u0430",
-"Poster": "\u0412\u044b\u044f\u0432\u0430",
-"Paste your embed code below:": "\u0423\u0441\u0442\u0430\u045e\u0446\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0456\u0436\u044d\u0439:",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u045e\u0441\u0442\u0430\u045e\u043a\u0456",
-"Media": "\u041c\u0435\u0434\u044b\u044f",
-"Nonbreaking space": "\u041d\u0435\u043f\u0430\u0440\u044b\u045e\u043d\u044b \u043f\u0440\u0430\u0431\u0435\u043b",
-"Page break": "\u0420\u0430\u0437\u0440\u044b\u045e \u0441\u0442\u0430\u0440\u043e\u043d\u043a\u0456",
-"Paste as text": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u044f\u043a \u0442\u044d\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0430\u0434\u043f\u0440\u0430\u0433\u043b\u044f\u0434",
-"Print": "\u0414\u0440\u0443\u043a",
-"Save": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c",
-"Find": "\u0417\u043d\u0430\u0439\u0441\u0446\u0456",
-"Replace with": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043d\u0430",
-"Replace": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
-"Replace all": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u0443\u0441\u0435",
-"Prev": "\u0423\u0432\u0435\u0440\u0445",
-"Next": "\u0423\u043d\u0456\u0437",
-"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0435\u043d\u0430",
-"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u0434\u0437\u0435\u043d\u044b \u0440\u0430\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u043e\u0439\u0434\u0437\u0435\u043d\u044b",
-"Match case": "\u0423\u043b\u0456\u0447\u0432\u0430\u0446\u044c \u0440\u044d\u0433\u0456\u0441\u0442\u0440",
-"Whole words": "\u0421\u043b\u043e\u0432\u044b \u0446\u0430\u043b\u043a\u0430\u043c",
-"Spellcheck": "\u041f\u0440\u0430\u0432\u0435\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u0430\u043f\u0456\u0441\u0443",
-"Ignore": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c",
-"Ignore all": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c \u0443\u0441\u0435",
-"Finish": "\u0421\u043a\u043e\u043d\u0447\u044b\u0446\u044c",
-"Add to Dictionary": "\u0414\u0430\u0434\u0430\u0446\u044c \u0443 \u0441\u043b\u043e\u045e\u043d\u0456\u043a",
-"Insert table": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
-"Table properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0442\u0430\u0431\u043b\u0456\u0446\u044b",
-"Delete table": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
-"Cell": "\u042f\u0447\u044d\u0439\u043a\u0430",
-"Row": "\u0420\u0430\u0434\u043e\u043a",
-"Column": "\u0421\u043b\u0443\u043f\u043e\u043a",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u044d\u0439\u043a\u0456",
-"Merge cells": "\u0410\u0431'\u044f\u0434\u043d\u0430\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0456",
-"Split cell": "\u0420\u0430\u0437\u0431\u0456\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0443",
-"Insert row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Insert row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
-"Delete row": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0440\u0430\u0434\u043a\u0430",
-"Cut row": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Copy row": "\u041a\u0430\u043f\u0456\u044f\u0432\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Paste row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Paste row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
-"Insert column before": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0437\u043b\u0435\u0432\u0430",
-"Insert column after": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0441\u043f\u0440\u0430\u0432\u0430",
-"Delete column": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a",
-"Cols": "\u0421\u043b\u0443\u043f\u043a\u0456",
-"Rows": "\u0420\u0430\u0434\u043a\u0456",
-"Width": "\u0428\u044b\u0440\u044b\u043d\u044f",
-"Height": "\u0412\u044b\u0448\u044b\u043d\u044f",
-"Cell spacing": "\u0417\u043d\u0435\u0448\u043d\u0456 \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Cell padding": "\u0423\u043d\u0443\u0442\u0440\u0430\u043d\u044b \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Caption": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
-"Right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Cell type": "\u0422\u044b\u043f \u044f\u0447\u044d\u0439\u043a\u0456",
-"Scope": "\u0421\u0444\u0435\u0440\u0430",
-"Alignment": "\u0412\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"H Align": "\u0413\u0430\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"V Align": "\u0412\u0435\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"Top": "\u0412\u0435\u0440\u0445",
-"Middle": "\u0421\u044f\u0440\u044d\u0434\u0437\u0456\u043d\u0430",
-"Bottom": "\u041d\u0456\u0437",
-"Header cell": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u0430\u0434\u043a\u043e\u045e",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u043b\u0443\u043f\u043a\u043e\u045e",
-"Row type": "\u0422\u044b\u043f \u0440\u0430\u0434\u043a\u0430",
-"Header": "\u0428\u0430\u043f\u043a\u0430",
-"Body": "\u0426\u0435\u043b\u0430",
-"Footer": "\u041d\u0456\u0437",
-"Border color": "\u041a\u043e\u043b\u0435\u0440 \u043c\u044f\u0436\u044b",
-"Insert template": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u041a\u043e\u043b\u0435\u0440 \u0442\u044d\u043a\u0441\u0442\u0443",
-"Background color": "\u041a\u043e\u043b\u0435\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456...",
-"Custom color": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456 \u043a\u043e\u043b\u0435\u0440",
-"No color": "\u0411\u0435\u0437 \u043a\u043e\u043b\u0435\u0440\u0443",
-"Table of Contents": "\u0422\u0430\u0431\u043b\u0456\u0446\u0443 \u0437\u043c\u0435\u0441\u0442\u0443",
-"Show blocks": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u0431\u043b\u043e\u043a\u0456",
-"Show invisible characters": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043d\u044f\u0431\u0430\u0447\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
-"Words: {0}": "\u041a\u043e\u043b\u044c\u043a\u0430\u0441\u0446\u044c \u0441\u043b\u043e\u045e: {0}",
-"{0} words": "{0} \u0441\u043b\u043e\u045e",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
-"Insert": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
-"View": "\u0412\u044b\u0433\u043b\u044f\u0434",
-"Format": "\u0424\u0430\u0440\u043c\u0430\u0442",
-"Table": "\u0422\u0430\u0431\u043b\u0456\u0446\u0430",
-"Tools": "\u041f\u0440\u044b\u043b\u0430\u0434\u044b",
-"Powered by {0}": "\u041f\u0440\u0430\u0446\u0443\u0435 \u043d\u0430 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u044d\u043a\u0441\u0442\u0430\u0432\u0430\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0446\u0456\u0441\u043d\u0456\u0446\u0435 ALT-F9, \u043a\u0430\u0431 \u0432\u044b\u043a\u043b\u0456\u043a\u0430\u0446\u044c \u043c\u0435\u043d\u044e, ALT-F10 - \u043f\u0430\u043d\u044d\u043b\u044c \u043f\u0440\u044b\u043b\u0430\u0434\u0430\u045e, ALT-0 - \u0434\u043b\u044f \u0432\u044b\u043a\u043b\u0456\u043a\u0443 \u0434\u0430\u043f\u0430\u043c\u043e\u0433\u0456."
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/bg_BG.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('bg_BG',{
-"Redo": "\u041e\u0442\u043c\u0435\u043d\u044f\u043d\u0435",
-"Undo": "\u0412\u0440\u044a\u0449\u0430\u043d\u0435",
-"Cut": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435",
-"Paste": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435",
-"Select all": "\u041c\u0430\u0440\u043a\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0446\u044f\u043b\u043e\u0442\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "\u0414\u043e\u0431\u0440\u0435",
-"Cancel": "\u041e\u0442\u043a\u0430\u0437",
-"Visual aids": "\u0412\u0438\u0437\u0443\u0430\u043b\u043d\u043e \u043e\u0442\u043a\u0440\u043e\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0438 \u0431\u0435\u0437 \u043a\u0430\u043d\u0442\u043e\u0432\u0435 (\u0440\u0430\u043c\u043a\u0438)",
-"Bold": "\u0423\u0434\u0435\u0431\u0435\u043b\u0435\u043d (\u043f\u043e\u043b\u0443\u0447\u0435\u0440)",
-"Italic": "\u041d\u0430\u043a\u043b\u043e\u043d\u0435\u043d (\u043a\u0443\u0440\u0441\u0438\u0432)",
-"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u0442\u0430\u0432\u0430\u043d\u0435",
-"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u0442\u0430\u0432\u0430\u043d\u0435",
-"Superscript": "\u0413\u043e\u0440\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Subscript": "\u0414\u043e\u043b\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043d\u0435 \u043d\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435\u0442\u043e",
-"Align left": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u043b\u044f\u0432\u043e",
-"Align center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u0435",
-"Align right": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u0434\u044f\u0441\u043d\u043e",
-"Justify": "\u0414\u0432\u0443\u0441\u0442\u0440\u0430\u043d\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Bullet list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u043e\u0434\u0430\u0447\u0438",
-"Numbered list": "\u041d\u043e\u043c\u0435\u0440\u0438\u0440\u0430\u043d \u0441\u043f\u0438\u0441\u044a\u043a",
-"Decrease indent": "\u041d\u0430\u043c\u0430\u043b\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Close": "\u0417\u0430\u0442\u0432\u0430\u0440\u044f\u043d\u0435",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u044f\u0442 \u0431\u0440\u0430\u0443\u0437\u044a\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u0434\u043e\u0441\u0442\u044a\u043f \u0434\u043e \u043a\u043b\u0438\u043f\u0431\u043e\u0440\u0434\u0430. \u0412\u043c\u0435\u0441\u0442\u043e \u0442\u043e\u0432\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u043d\u0438\u0442\u0435 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 Ctrl+X (\u0437\u0430 \u0438\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435), Ctrl+C (\u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435) \u0438 Ctrl+V (\u0437\u0430 \u043f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435).",
-"Headers": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
-"Header 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
-"Header 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
-"Header 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
-"Header 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
-"Header 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
-"Header 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
-"Headings": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
-"Heading 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
-"Heading 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
-"Heading 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
-"Heading 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
-"Heading 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
-"Heading 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
-"Preformatted": "\u041f\u0440\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d",
-"Div": "\u0411\u043b\u043e\u043a",
-"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u043d\u043e \u043e\u0444\u043e\u0440\u043c\u0435\u043d \u0442\u0435\u043a\u0441\u0442",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442",
-"Inline": "\u041d\u0430 \u0435\u0434\u0438\u043d \u0440\u0435\u0434",
-"Blocks": "\u0411\u043b\u043e\u043a\u043e\u0432\u0435",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435\u0442\u043e \u0432 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0435 \u0432 \u043e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d \u0440\u0435\u0436\u0438\u043c. \u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e \u0449\u0435 \u0431\u044a\u0434\u0435 \u043f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e \u043a\u0430\u0442\u043e \u043d\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442, \u0434\u043e\u043a\u0430\u0442\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0442\u0430\u0437\u0438 \u043e\u043f\u0446\u0438\u044f.",
-"Fonts": "\u0428\u0440\u0438\u0444\u0442\u043e\u0432\u0435",
-"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u041f\u043e\u0442\u044a\u0440\u0441\u0435\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"OR": "\u0418\u041b\u0418",
-"Drop an image here": "\u041f\u0443\u0441\u043d\u0435\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e \u0442\u0443\u043a",
-"Upload": "\u041a\u0430\u0447\u0432\u0430\u043d\u0435",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Default": "\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
-"Circle": "\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u0438",
-"Disc": "\u041a\u0440\u044a\u0433\u0447\u0435\u0442\u0430",
-"Square": "\u0417\u0430\u043f\u044a\u043b\u043d\u0435\u043d\u0438 \u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
-"Lower Alpha": "\u041c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Lower Greek": "\u041c\u0430\u043b\u043a\u0438 \u0433\u0440\u044a\u0446\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Lower Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u043c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Upper Alpha": "\u0413\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Anchor...": "\u041a\u043e\u0442\u0432\u0430...",
-"Name": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Id": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 (id)",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u0430 (id) \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0437\u0430\u043f\u043e\u0447\u0432\u0430 \u0441 \u0431\u0443\u043a\u0432\u0430, \u043f\u043e\u0441\u043b\u0435\u0434\u0432\u0430\u043d \u043e\u0442 \u0431\u0443\u043a\u0432\u0438, \u0447\u0438\u0444\u0440\u0438, \u0442\u0438\u0440\u0435\u0442\u0430, \u0442\u043e\u0447\u043a\u0438, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u0435 \u0438 \u0434\u043e\u043b\u043d\u043e \u0442\u0438\u0440\u0435.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0412 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0438\u043c\u0430 \u043d\u0435\u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438. \u0429\u0435 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435 \u043b\u0438?",
-"Restore last draft": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430\u0442\u0430 \u0447\u0435\u0440\u043d\u043e\u0432\u0430",
-"Special character...": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u0435\u043d \u0441\u0438\u043c\u0432\u043e\u043b...",
-"Source code": "\u0418\u0437\u0445\u043e\u0434\u0435\u043d \u043a\u043e\u0434 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0432 HTML",
-"Insert\/Edit code sample": "\u0412\u043c\u044a\u043a\u043d\u0438\/ \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u0439 \u043f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434",
-"Language": "\u0415\u0437\u0438\u043a",
-"Code sample...": "\u041f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434...",
-"Color Picker": "\u0418\u0437\u0431\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0446\u0432\u044f\u0442",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u041e\u0442\u043b\u044f\u0432\u043e \u043d\u0430\u0434\u044f\u0441\u043d\u043e",
-"Right to left": "\u041e\u0442\u0434\u044f\u0441\u043d\u043e \u043d\u0430\u043b\u044f\u0432\u043e",
-"Emoticons...": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438...",
-"Metadata and Document Properties": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u0438 \u0438 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0438 \u0434\u0443\u043c\u0438",
-"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438 \u043d\u0430 \u0443\u0435\u0431 \u0442\u044a\u0440\u0441\u0430\u0447\u043a\u0438",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0437\u043d\u0430\u0446\u0438\u0442\u0435",
-"Fullscreen": "\u041d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d",
-"Action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435",
-"Shortcut": "\u0411\u044a\u0440\u0437 \u043a\u043b\u0430\u0432\u0438\u0448",
-"Help": "\u041f\u043e\u043c\u043e\u0449",
-"Address": "\u0410\u0434\u0440\u0435\u0441",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u0432\u0440\u044a\u0437\u043a\u0430 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0432\u0440\u044a\u0437\u043a\u0438 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Save (if save plugin activated)": "\u0417\u0430\u043f\u0438\u0448\u0438 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0437\u0430\u043f\u0438\u0441 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Find (if searchreplace plugin activated)": "\u041d\u0430\u043c\u0435\u0440\u0438 (\u0430\u043a\u043e \u043f\u043b\u044a\u0433\u0438\u043d\u0430 \u0437\u0430 \u0442\u044a\u0440\u0441\u0435\u043d\u0435\/\u0437\u0430\u043c\u044f\u043d\u0430 \u0435 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u0430\u043d)",
-"Plugins installed ({0}):": "\u0418\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438 \u043f\u043b\u044a\u0433\u0438\u043d\u0438 ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0438\u0439\u043d\u0438 \u043f\u043b\u044a\u0433\u0438\u043d\u0438:",
-"Learn more...": "\u041d\u0430\u0443\u0447\u0435\u0442\u0435 \u043f\u043e\u0432\u0435\u0447\u0435...",
-"You are using {0}": "\u0418\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442\u0435 {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u0447\u0435\u0440\u0442\u0430",
-"Insert\/edit image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Source": "\u0410\u0434\u0440\u0435\u0441",
-"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"Constrain proportions": "\u0417\u0430\u0432\u0430\u0437\u043d\u0430\u0432\u0435 \u043d\u0430 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438\u0442\u0435",
-"General": "\u041e\u0431\u0449\u043e",
-"Advanced": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e",
-"Style": "\u0421\u0442\u0438\u043b",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Border": "\u041a\u0430\u043d\u0442 (\u0440\u0430\u043c\u043a\u0430)",
-"Insert image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Image...": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435...",
-"Image list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438",
-"Rotate counterclockwise": "\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435 \u043e\u0431\u0440\u0430\u0442\u043d\u043e \u043d\u0430 \u0447\u0430\u0441\u043e\u0432\u043d\u0438\u043a\u0430",
-"Rotate clockwise": "\u0417\u0430\u0432\u044a\u0440\u0442\u0430\u043d\u0435 \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043d\u0438\u043a\u0430",
-"Flip vertically": "\u041e\u0431\u044a\u0440\u043d\u0438 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e",
-"Flip horizontally": "\u041e\u0431\u044a\u0440\u043d\u0438 \u0445\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e",
-"Edit image": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Image options": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Zoom in": "\u041f\u0440\u0438\u0431\u043b\u0438\u0436\u0438",
-"Zoom out": "\u041e\u0442\u0434\u0430\u043b\u0435\u0447\u0438",
-"Crop": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
-"Resize": "\u041f\u0440\u0435\u043e\u0440\u0430\u0437\u043c\u0435\u0440\u044f\u0432\u0430\u043d\u0435",
-"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
-"Brightness": "\u042f\u0440\u043a\u043e\u0441\u0442",
-"Sharpen": "\u0418\u0437\u043e\u0441\u0442\u0440\u044f\u043d\u0435",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0426\u0432\u0435\u0442\u043d\u0438 \u043d\u0438\u0432\u0430",
-"Gamma": "\u0413\u0430\u043c\u0430",
-"Invert": "\u0418\u043d\u0432\u0435\u0440\u0441\u0438\u044f",
-"Apply": "\u041f\u0440\u0438\u043b\u043e\u0436\u0438",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Insert date\/time": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0434\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert\/Edit Link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Insert\/edit link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442",
-"Url": "\u0410\u0434\u0440\u0435\u0441 (URL)",
-"Open link in...": "\u041e\u0442\u0432\u0430\u0440\u044f\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 \u0432...",
-"Current window": "\u0422\u0435\u043a\u0443\u0449 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446",
-"None": "\u0411\u0435\u0437",
-"New window": "\u0412 \u043d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 (\u043f\u043e\u0434\u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446)",
-"Remove link": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430",
-"Anchors": "\u041a\u043e\u0442\u0432\u0438",
-"Link...": "\u0425\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430...",
-"Paste or type a link": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u0438\u043b\u0438 \u043d\u0430\u043f\u0438\u0448\u0435\u0442\u0435 \u0432\u0440\u044a\u0437\u043a\u0430(\u043b\u0438\u043d\u043a)",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u044a\u0442, \u043a\u043e\u0439\u0442\u043e \u0432\u044a\u0432\u0434\u043e\u0445\u0442\u0435 \u043f\u0440\u0438\u043b\u0438\u0447\u0430 \u043d\u0430 \u0435-\u043c\u0435\u0439\u043b \u0430\u0434\u0440\u0435\u0441. \u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0438\u044f mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u044a\u0442, \u043a\u043e\u0439\u0442\u043e \u0432\u044a\u0432\u0434\u043e\u0445\u0442\u0435 \u043f\u0440\u0438\u043b\u0438\u0447\u0430 \u0432\u044a\u043d\u0448\u0435\u043d \u0430\u0434\u0440\u0435\u0441. \u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0438\u044f http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"Link list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u0440\u044a\u0437\u043a\u0438",
-"Insert video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit media": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043c\u0435\u0434\u0438\u044f",
-"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0430\u0434\u0440\u0435\u0441",
-"Alternative source URL": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0430\u0434\u0440\u0435\u0441 URL",
-"Media poster (Image URL)": "\u041c\u0435\u0434\u0438\u0435\u043d \u043f\u043b\u0430\u043a\u0430\u0442 (\u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 URL)",
-"Paste your embed code below:": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u043a\u043e\u0434\u0430 \u0437\u0430 \u0432\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u0432 \u043f\u043e\u043b\u0435\u0442\u043e \u043f\u043e-\u0434\u043e\u043b\u0443:",
-"Embed": "\u0412\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435",
-"Media...": "\u041c\u0435\u0434\u0438\u044f...",
-"Nonbreaking space": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Page break": "\u041d\u043e\u0432\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430",
-"Paste as text": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u043a\u0430\u0442\u043e \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u0435\u043d \u0438\u0437\u0433\u043b\u0435\u0434",
-"Print...": "\u041e\u0442\u043f\u0435\u0447\u0430\u0442\u0432\u0430\u043d\u0435...",
-"Save": "\u0421\u044a\u0445\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435",
-"Find": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0437\u0430",
-"Replace with": "\u0417\u0430\u043c\u044f\u043d\u0430 \u0441",
-"Replace": "\u0417\u0430\u043c\u044f\u043d\u0430",
-"Replace all": "\u0417\u0430\u043c\u044f\u043d\u0430 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u0438 \u0441\u0440\u0435\u0449\u0430\u043d\u0438\u044f",
-"Previous": "\u041f\u0440\u0435\u0434\u0438\u0448\u0435\u043d",
-"Next": "\u0421\u043b\u0435\u0434\u0432\u0430\u0449",
-"Find and replace...": "\u041d\u0430\u043c\u0438\u0440\u0430\u043d\u0435 \u0438 \u0437\u0430\u043c\u044f\u043d\u0430...",
-"Could not find the specified string.": "\u0422\u044a\u0440\u0441\u0435\u043d\u0438\u044f\u0442 \u0442\u0435\u043a\u0441\u0442 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d.",
-"Match case": "\u0421\u044a\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u044a\u0440\u0430 (\u043c\u0430\u043b\u043a\u0438\/\u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438)",
-"Find whole words only": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0441\u0430\u043c\u043e \u043d\u0430 \u0446\u0435\u043b\u0438 \u0434\u0443\u043c\u0438",
-"Spell check": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u043e",
-"Finish": "\u041a\u0440\u0430\u0439",
-"Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438 \u0432 \u0440\u0435\u0447\u043d\u0438\u043a\u0430",
-"Insert table": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430",
-"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Delete table": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Cell": "\u041a\u043b\u0435\u0442\u043a\u0430",
-"Row": "\u0420\u0435\u0434",
-"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
-"Cell properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Merge cells": "\u0421\u043b\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Split cell": "\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430",
-"Insert row before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Insert row after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Delete row": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Row properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Cut row": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Paste row before": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Paste row after": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Insert column before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u0440\u0435\u0434\u0438",
-"Insert column after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u0441\u043b\u0435\u0434",
-"Delete column": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430",
-"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
-"Rows": "\u0420\u0435\u0434\u043e\u0432\u0435",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430",
-"Cell spacing": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043c\u0435\u0436\u0434\u0443 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Cell padding": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0434\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e",
-"Show caption": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0430\u0434\u043f\u0438\u0441",
-"Left": "\u041b\u044f\u0432\u043e",
-"Center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
-"Right": "\u0414\u044f\u0441\u043d\u043e",
-"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Scope": "\u041e\u0431\u0445\u0432\u0430\u0442",
-"Alignment": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"H Align": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Top": "\u0413\u043e\u0440\u0435",
-"Middle": "\u041f\u043e \u0441\u0440\u0435\u0434\u0430\u0442\u0430",
-"Bottom": "\u0414\u043e\u043b\u0443",
-"Header cell": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430 (\u0430\u043d\u0442\u0435\u0442\u043a\u0430)",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Header": "\u0413\u043e\u0440\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (header)",
-"Body": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 (body)",
-"Footer": "\u0414\u043e\u043b\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (footer)",
-"Border color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430\u0442\u0430",
-"Insert template...": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0448\u0430\u0431\u043b\u043e\u043d...",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Background color": "\u0424\u043e\u043d\u043e\u0432 \u0446\u0432\u044f\u0442",
-"Custom...": "\u0418\u0437\u0431\u0440\u0430\u043d...",
-"Custom color": "\u0426\u0432\u044f\u0442 \u043f\u043e \u0438\u0437\u0431\u043e\u0440",
-"No color": "\u0411\u0435\u0437 \u0446\u0432\u044f\u0442",
-"Remove color": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0446\u0432\u0435\u0442\u0430",
-"Table of Contents": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0431\u043b\u043e\u043a\u043e\u0432\u0435\u0442\u0435",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0435\u043f\u0435\u0447\u0430\u0442\u0430\u0435\u043c\u0438 \u0437\u043d\u0430\u0446\u0438",
-"Word count": "\u0411\u0440\u043e\u0435\u043d\u0435 \u043d\u0430 \u0434\u0443\u043c\u0438",
-"Count": "\u0411\u0440\u043e\u0439",
-"Document": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Selection": "\u0418\u0437\u0431\u0440\u0430\u043d\u043e",
-"Words": "\u0414\u0443\u043c\u0438",
-"Words: {0}": "\u0411\u0440\u043e\u0439 \u0434\u0443\u043c\u0438: {0}",
-"{0} words": "{0} \u0431\u0440\u043e\u0439 \u0434\u0443\u043c\u0438",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435",
-"Insert": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435",
-"View": "\u0418\u0437\u0433\u043b\u0435\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"Powered by {0}": "\u0421\u044a\u0437\u0434\u0430\u0434\u0435\u043d\u043e \u0441 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041f\u043e\u043b\u0435 \u0437\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 Alt+F9 \u0437\u0430 \u043c\u0435\u043d\u044e; Alt+F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438; Alt+0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449.",
-"Image title": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435\u0442\u043e",
-"Border width": "\u0428\u0438\u0440\u0438\u043d\u0430 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430\u0442\u0430",
-"Border style": "\u0421\u0442\u0438\u043b \u043d\u0430 \u0440\u0430\u043c\u043a\u0430\u0442\u0430",
-"Error": "\u0413\u0440\u0435\u0448\u043a\u0430",
-"Warn": "\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435",
-"Valid": "\u0412\u0430\u043b\u0438\u0434\u043d\u043e",
-"To open the popup, press Shift+Enter": "\u0417\u0430 \u0434\u0430 \u043e\u0442\u0432\u043e\u0440\u0438\u0442\u0435 \u0438\u0437\u0441\u043a\u0430\u0447\u0430\u0449\u0438\u044f \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446, \u043d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u041f\u043e\u043b\u0435 \u0437\u0430 \u043e\u0431\u043e\u0433\u0430\u0442\u0435\u043d \u0442\u0435\u043a\u0441\u0442. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT+0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449.",
-"System Font": "\u0421\u0438\u0441\u0442\u0435\u043c\u0435\u043d \u0448\u0440\u0438\u0444\u0442",
-"Failed to upload image: {0}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043a\u0430\u0447\u0432\u0430\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435: {0}",
-"Failed to load plugin: {0} from url {1}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u043f\u043b\u044a\u0433\u0438\u043d {0} \u043e\u0442 URL {1}",
-"Failed to load plugin url: {0}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 URL \u043d\u0430 \u043f\u043b\u044a\u0433\u0438\u043d: {0}",
-"Failed to initialize plugin: {0}": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u043f\u043b\u044a\u0433\u0438\u043d: {0}",
-"example": "\u043f\u0440\u0438\u043c\u0435\u0440",
-"Search": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435",
-"All": "\u0412\u0441\u0438\u0447\u043a\u0438",
-"Currency": "\u0412\u0430\u043b\u0443\u0442\u0430",
-"Text": "\u0422\u0435\u043a\u0441\u0442",
-"Quotations": "\u0426\u0438\u0442\u0430\u0442\u0438",
-"Mathematical": "\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438",
-"Extended Latin": "\u0420\u0430\u0437\u0448\u0438\u0440\u0435\u043d\u0438 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Symbols": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438",
-"Arrows": "\u0421\u0442\u0440\u0435\u043b\u043a\u0438",
-"User Defined": "\u0417\u0430\u0434\u0430\u0434\u0435\u043d\u0438 \u043e\u0442 \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u044f",
-"dollar sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0434\u043e\u043b\u0430\u0440",
-"currency sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0432\u0430\u043b\u0443\u0442\u0430",
-"euro-currency sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0435\u0432\u0440\u043e \u0432\u0430\u043b\u0443\u0442\u0430",
-"colon sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043a\u043e\u043b\u043e\u043d",
-"cruzeiro sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043a\u0440\u0443\u0437\u0435\u0439\u0440\u043e",
-"french franc sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0444\u0440\u0435\u043d\u0441\u043a\u0438 \u0444\u0440\u0430\u043d\u043a",
-"lira sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043b\u0438\u0440\u0430",
-"mill sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043c\u0438\u043b",
-"naira sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043d\u0430\u0439\u0440\u0430",
-"peseta sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043f\u0435\u0441\u0435\u0442\u0430",
-"rupee sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0440\u0443\u043f\u0438\u044f",
-"won sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043a\u043e\u0440\u0435\u0439\u0441\u043a\u0438 \u0432\u043e\u043d",
-"new sheqel sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043d\u043e\u0432 \u0448\u0435\u043a\u0435\u043b",
-"dong sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0432\u0438\u0435\u0442\u043d\u0430\u043c\u0441\u043a\u0438 \u0434\u043e\u043d\u0433",
-"kip sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043b\u0430\u043e\u0441\u043a\u0438 \u043a\u0438\u043f",
-"tugrik sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043c\u043e\u043d\u0433\u043e\u043b\u0441\u043a\u0438 \u0442\u0443\u0433\u0440\u0438\u043a",
-"drachma sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0434\u0440\u0430\u0445\u043c\u0430",
-"german penny symbol": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u0433\u0435\u0440\u043c\u0430\u043d\u0441\u043a\u043e \u043f\u0435\u043d\u0438",
-"peso sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043f\u0435\u0441\u043e",
-"guarani sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0433\u0443\u0430\u0440\u0430\u043d\u0438",
-"austral sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0430\u0443\u0441\u0442\u0440\u0430\u043b",
-"hryvnia sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0433\u0440\u0438\u0432\u043d\u044f",
-"cedi sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0441\u0435\u0434\u0438",
-"livre tournois sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043b\u0438\u0432\u0440 \u0442\u0443\u0440\u043d\u0443\u0430",
-"spesmilo sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0441\u043f\u0435\u0441\u043c\u0438\u043b\u043e",
-"tenge sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0442\u0435\u043d\u0433\u0435",
-"indian rupee sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0438\u043d\u0434\u0438\u0439\u0441\u043a\u0430 \u0440\u0443\u043f\u0438\u044f",
-"turkish lira sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0442\u0443\u0440\u0441\u043a\u0430 \u043b\u0438\u0440\u0430",
-"nordic mark sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043d\u043e\u0440\u0434\u0441\u043a\u0430 \u043c\u0430\u0440\u043a\u0430",
-"manat sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u043c\u0430\u043d\u0430\u0442",
-"ruble sign": "\u0437\u043d\u0430\u043a \u0437\u0430 \u0440\u0443\u0431\u043b\u0430",
-"yen character": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u0439\u0435\u043d\u0430",
-"yuan character": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u044e\u0430\u043d",
-"yuan character, in hong kong and taiwan": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u044e\u0430\u043d \u0432 \u0425\u043e\u043d\u043a\u043e\u043d\u0433 \u0438 \u0422\u0430\u0439\u0432\u0430\u043d",
-"yen\/yuan character variant one": "\u0441\u0438\u043c\u0432\u043e\u043b \u0437\u0430 \u0439\u0435\u043d\u0430\/\u044e\u0430\u043d \u0432\u0430\u0440\u0438\u0430\u043d\u0442 \u0435\u0434\u043d\u043e",
-"Loading emoticons...": "\u0417\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u0435\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438...",
-"Could not load emoticons": "\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0437\u0430\u0440\u0435\u0436\u0434\u0430\u043d\u0435 \u043d\u0430 \u0435\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
-"People": "\u0425\u043e\u0440\u0430",
-"Animals and Nature": "\u0416\u0438\u0432\u043e\u0442\u043d\u0438 \u0438 \u043f\u0440\u0438\u0440\u043e\u0434\u0430",
-"Food and Drink": "\u0425\u0440\u0430\u043d\u0430 \u0438 \u043d\u0430\u043f\u0438\u0442\u043a\u0438",
-"Activity": "\u0414\u0435\u0439\u043d\u043e\u0441\u0442\u0438",
-"Travel and Places": "\u041f\u044a\u0442\u0443\u0432\u0430\u043d\u0435 \u0438 \u043c\u0435\u0441\u0442\u0430",
-"Objects": "\u041f\u0440\u0435\u0434\u043c\u0435\u0442\u0438",
-"Flags": "\u0417\u043d\u0430\u043c\u0435\u043d\u0430",
-"Characters": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438",
-"Characters (no spaces)": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438 (\u0431\u0435\u0437 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b\u0438)",
-"{0} characters": "{0} \u0441\u0438\u043c\u0432\u043e\u043b\u0430",
-"Error: Form submit field collision.": "\u0413\u0440\u0435\u0448\u043a\u0430: \u041d\u0435\u0441\u044a\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043d\u0430 \u043f\u043e\u043b\u0435 \u043f\u0440\u0438 \u0438\u0437\u043f\u0440\u0430\u0449\u0430\u043d\u0435 \u043d\u0430 \u0444\u043e\u0440\u043c\u0443\u043b\u044f\u0440.",
-"Error: No form element found.": "\u0413\u0440\u0435\u0448\u043a\u0430: \u041d\u0435 \u0435 \u043e\u0442\u043a\u0440\u0438\u0442 \u0435\u043b\u0435\u043c\u0435\u043d\u0442 \u043d\u0430 \u0444\u043e\u0440\u043c\u0443\u043b\u044f\u0440\u0430.",
-"Update": "\u0410\u043a\u0442\u0443\u0430\u043b\u0438\u0437\u0438\u0440\u0430\u043d\u0435",
-"Color swatch": "\u0426\u0432\u0435\u0442\u043d\u0430 \u043c\u043e\u0441\u0442\u0440\u0430",
-"Turquoise": "\u0422\u044e\u0440\u043a\u043e\u0430\u0437\u0435\u043d\u043e",
-"Green": "\u0417\u0435\u043b\u0435\u043d\u043e",
-"Blue": "\u0421\u0438\u043d\u044c\u043e",
-"Purple": "\u041b\u0438\u043b\u0430\u0432\u043e",
-"Navy Blue": "\u041c\u043e\u0440\u0441\u043a\u043e\u0441\u0438\u043d\u044c\u043e",
-"Dark Turquoise": "\u0422\u044a\u043c\u043d\u043e\u0442\u044e\u0440\u043a\u043e\u0430\u0437\u0435\u043d\u043e",
-"Dark Green": "\u0422\u044a\u043c\u043d\u043e\u0437\u0435\u043b\u0435\u043d\u043e",
-"Medium Blue": "\u0421\u0440\u0435\u0434\u043d\u043e\u0441\u0438\u043d\u044c\u043e",
-"Medium Purple": "\u0421\u0440\u0435\u0434\u043d\u043e\u043b\u0438\u043b\u0430\u0432\u043e",
-"Midnight Blue": "\u0421\u0440\u0435\u0434\u043d\u043e\u0449\u043d\u043e \u0441\u0438\u043d\u044c\u043e",
-"Yellow": "\u0416\u044a\u043b\u0442\u043e",
-"Orange": "\u041e\u0440\u0430\u043d\u0436\u0435\u0432\u043e",
-"Red": "\u0427\u0435\u0440\u0432\u0435\u043d\u043e",
-"Light Gray": "\u0421\u0432\u0435\u0442\u043b\u043e\u0441\u0438\u0432\u043e",
-"Gray": "\u0421\u0438\u0432\u043e",
-"Dark Yellow": "\u0422\u044a\u043c\u043d\u043e\u0436\u044a\u043b\u0442\u043e",
-"Dark Orange": "\u0422\u044a\u043c\u043d\u043e\u043e\u0440\u0430\u043d\u0436\u0435\u0432\u043e",
-"Dark Red": "\u0422\u044a\u043c\u043d\u043e\u0447\u0435\u0440\u0432\u0435\u043d\u043e",
-"Medium Gray": "\u0421\u0440\u0435\u0434\u043d\u043e\u0441\u0438\u0432\u043e",
-"Dark Gray": "\u0422\u044a\u043c\u043d\u043e\u0441\u0438\u0432\u043e",
-"Light Green": "\u0421\u0432\u0435\u0442\u043b\u043e\u0437\u0435\u043b\u0435\u043d",
-"Light Yellow": "\u0421\u0432\u0435\u0442\u043b\u043e\u0436\u044a\u043b\u0442",
-"Light Red": "\u0421\u0432\u0435\u0442\u043b\u043e\u0447\u0435\u0440\u0432\u0435\u043d",
-"Light Purple": "\u0421\u0432\u0435\u0442\u043b\u043e\u043b\u0438\u043b\u0430\u0432",
-"Light Blue": "\u0421\u0432\u0435\u0442\u043b\u043e\u0441\u0438\u043d",
-"Dark Purple": "\u0422\u044a\u043c\u043d\u043e\u043b\u0438\u043b\u0430\u0432",
-"Dark Blue": "\u0422\u044a\u043c\u043d\u043e\u0441\u0438\u043d",
-"Black": "\u0427\u0435\u0440\u043d\u043e",
-"White": "\u0411\u044f\u043b\u043e",
-"Switch to or from fullscreen mode": "\u041f\u0440\u0435\u0432\u043a\u043b\u044e\u0447\u0432\u0430\u043d\u0435 \u043a\u044a\u043c \u0438\u043b\u0438 \u043e\u0442 \u0440\u0435\u0436\u0438\u043c \u043d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d",
-"Open help dialog": "\u041e\u0442\u0432\u0430\u0440\u044f\u043d\u0435 \u043d\u0430 \u0434\u0438\u0430\u043b\u043e\u0433\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449",
-"history": "\u0438\u0441\u0442\u043e\u0440\u0438\u044f",
-"styles": "\u0441\u0442\u0438\u043b\u043e\u0432\u0435",
-"formatting": "\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"alignment": "\u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"indentation": "\u043e\u0442\u0441\u0442\u044a\u043f",
-"permanent pen": "\u043f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u0430 \u0445\u0438\u043c\u0438\u043a\u0430\u043b\u043a\u0430",
-"comments": "\u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440\u0438",
-"Format Painter": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435\u0442\u043e",
-"Insert\/edit iframe": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043d\u0435 \u043d\u0430 iframe",
-"Capitalization": "\u0413\u043b\u0430\u0432\u043d\u0430 \u0431\u0443\u043a\u0432\u0430",
-"lowercase": "\u043c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"UPPERCASE": "\u0413\u041e\u041b\u0415\u041c\u0418 \u0411\u0423\u041a\u0412\u0418",
-"Title Case": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u0438 \u0411\u0443\u043a\u0432\u0438",
-"Permanent Pen Properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u041f\u0435\u0440\u043c\u0430\u043d\u0435\u043d\u0442\u043d\u0438\u044f \u041c\u0430\u0440\u043a\u0435\u0440",
-"Permanent pen properties...": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u043f\u0435\u0440\u043c\u0430\u043d\u0435\u043d\u0442\u043d\u0438\u044f \u043c\u0430\u0440\u043a\u0435\u0440...",
-"Font": "\u0428\u0440\u0438\u0444\u0442",
-"Size": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"More...": "\u041e\u0449\u0435...",
-"Spellcheck Language": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438 \u041f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Select...": "\u0418\u0437\u0431\u0435\u0440\u0438...",
-"Preferences": "\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0438\u0442\u0430\u043d\u0438\u044f",
-"Yes": "\u0414\u0430",
-"No": "\u041d\u0435",
-"Keyboard Navigation": "\u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f \u0441 \u043a\u043b\u0430\u0432\u0438\u0430\u0442\u0443\u0440\u0430",
-"Version": "\u0412\u0435\u0440\u0441\u0438\u044f",
-"Anchor": "\u041a\u043e\u0442\u0432\u0430 (\u0432\u0440\u044a\u0437\u043a\u0430 \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430)",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u0435\u043d \u0437\u043d\u0430\u043a",
-"Code sample": "\u041f\u0440\u0438\u043c\u0435\u0440\u0435\u043d \u043a\u043e\u0434",
-"Color": "\u0426\u0432\u044f\u0442",
-"Emoticons": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
-"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Image": "\u041a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"Insert link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Target": "\u0426\u0435\u043b \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Link": "\u0412\u0440\u044a\u0437\u043a\u0430(\u043b\u0438\u043d\u043a)",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
-"Media": "\u041c\u0435\u0434\u0438\u044f",
-"Print": "\u041f\u0435\u0447\u0430\u0442",
-"Prev": "\u041f\u0440\u0435\u0434\u0438\u0448\u0435\u043d",
-"Find and replace": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0438 \u0437\u0430\u043c\u044f\u043d\u0430",
-"Whole words": "\u0421\u0430\u043c\u043e \u0446\u0435\u043b\u0438 \u0434\u0443\u043c\u0438",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Caption": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043f\u0440\u0435\u0434\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Insert template": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0448\u0430\u0431\u043b\u043e\u043d"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/bs.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('bs',{
-"Cut": "Izre\u017ei",
-"Heading 5": "Naslov 5",
-"Header 2": "Zaglavlje 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 browser ne podr\u017eava direktan pristup me\u0111umemoriji. Molimo vas da koristite pre\u010dice Ctrl+X\/C\/V na tastaturi.",
-"Heading 4": "Naslov 4",
-"Div": "Div",
-"Heading 2": "Naslov 2",
-"Paste": "Zalijepi",
-"Close": "Zatvori",
-"Font Family": "Familija fonta",
-"Pre": "Pre",
-"Align right": "Poravnaj desno",
-"New document": "Novi dokument",
-"Blockquote": "Blok citat",
-"Numbered list": "Numerisana lista",
-"Heading 1": "Naslov 1",
-"Headings": "Naslovi",
-"Increase indent": "Pove\u0107aj uvlaku",
-"Formats": "Formati",
-"Headers": "Zaglavlja",
-"Select all": "Ozna\u010di sve",
-"Header 3": "Zaglavlje 3",
-"Blocks": "Blokovi",
-"Undo": "Nazad",
-"Strikethrough": "Precrtano",
-"Bullet list": "Bullet lista",
-"Header 1": "Zaglavlje 1",
-"Superscript": "Eksponent",
-"Clear formatting": "Poni\u0161ti formatiranje",
-"Font Sizes": "Veli\u010dine fonta",
-"Subscript": "Indeks",
-"Header 6": "Zaglavlje 6",
-"Redo": "Naprijed",
-"Paragraph": "Paragraf",
-"Ok": "U redu",
-"Bold": "Podebljano",
-"Code": "Kod",
-"Italic": "Nakrivljen",
-"Align center": "Centriraj",
-"Header 5": "Zaglavlje 5",
-"Heading 6": "Naslov 6",
-"Heading 3": "Naslov 3",
-"Decrease indent": "Smanji uvlaku",
-"Header 4": "Zaglavlje 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Lijepljenje je sada u modu obi\u010dnog teksta. Sadr\u017eaj \u0107e sada biti zalijepljen kao obi\u010dni tekst sve dok ovu opciju ne ugasite.",
-"Underline": "Podvu\u010deno",
-"Cancel": "Otka\u017ei",
-"Justify": "Obostrano poravnanje",
-"Inline": "U liniji",
-"Copy": "Kopiraj",
-"Align left": "Poravnaj lijevo",
-"Visual aids": "Vizualna pomo\u0107",
-"Lower Greek": "Mala gr\u010dka slova",
-"Square": "Kvadrat",
-"Default": "Po\u010detno",
-"Lower Alpha": "Mala slova",
-"Circle": "Krug",
-"Disc": "Disk",
-"Upper Alpha": "Velika slova",
-"Upper Roman": "Velika rimska slova",
-"Lower Roman": "Mala rimska slova",
-"Name": "Ime",
-"Anchor": "Anchor",
-"You have unsaved changes are you sure you want to navigate away?": "Niste sa\u010duvali izmjene. Jeste li sigurni da \u017eelite napustiti stranicu?",
-"Restore last draft": "Vrati posljednju skicu",
-"Special character": "Specijalni znak",
-"Source code": "Izvorni kod",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Boja",
-"Right to left": "S desna na lijevo",
-"Left to right": "S lijeva na desno",
-"Emoticons": "Smajliji",
-"Robots": "Roboti",
-"Document properties": "Svojstva dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne rije\u010di",
-"Encoding": "Kodiranje",
-"Description": "Opis",
-"Author": "Autor",
-"Fullscreen": "Cijeli ekran",
-"Horizontal line": "Vodoravna linija",
-"Horizontal space": "Horizontalni razmak",
-"Insert\/edit image": "Umetni\/uredi sliku",
-"General": "Op\u0107enito",
-"Advanced": "Napredno",
-"Source": "Izvor",
-"Border": "Okvir",
-"Constrain proportions": "Ograni\u010di proporcije",
-"Vertical space": "Vertikalni razmak",
-"Image description": "Opis slike",
-"Style": "Stil",
-"Dimensions": "Dimenzije",
-"Insert image": "Umetni sliku",
-"Zoom in": "Zoom in",
-"Contrast": "Contrast",
-"Back": "Back",
-"Gamma": "Gamma",
-"Flip horizontally": "Flip horizontally",
-"Resize": "Resize",
-"Sharpen": "Sharpen",
-"Zoom out": "Zoom out",
-"Image options": "Image options",
-"Apply": "Apply",
-"Brightness": "Brightness",
-"Rotate clockwise": "Rotate clockwise",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Edit image": "Edit image",
-"Color levels": "Color levels",
-"Crop": "Crop",
-"Orientation": "Orientation",
-"Flip vertically": "Flip vertically",
-"Invert": "Invert",
-"Insert date\/time": "Umetni datum\/vrijeme",
-"Remove link": "Ukloni link",
-"Url": "URL",
-"Text to display": "Tekst za prikaz",
-"Anchors": "Anchori",
-"Insert link": "Umetni link",
-"New window": "Novi prozor",
-"None": "Ni\u0161ta",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Izgleda je URL koji ste upisali vanjski link. \u017delite li da dodate obavezni http:\/\/ prefiks?",
-"Target": "Odredi\u0161te",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Izgleda da je URL koji ste upisali ustvari email adresa. \u017delite li da dodate obavezni mailto: prefiks?",
-"Insert\/edit link": "Umetni\/uredi link",
-"Insert\/edit video": "Umetni\/uredi video",
-"Poster": "Objavio",
-"Alternative source": "Alternativni izvor",
-"Paste your embed code below:": "Zalijepite va\u0161 ugradbeni kod ispod:",
-"Insert video": "Umetni video",
-"Embed": "Ugradi",
-"Nonbreaking space": "Neprijelomni razmak",
-"Page break": "Prijelom stranice",
-"Paste as text": "Zalijepi kao tekst",
-"Preview": "Pregled",
-"Print": "\u0160tampaj",
-"Save": "Sa\u010duvaj",
-"Could not find the specified string.": "Tra\u017eeni string nije prona\u0111en.",
-"Replace": "Zamijeni",
-"Next": "Sljede\u0107e",
-"Whole words": "Cijele rije\u010di",
-"Find and replace": "Prona\u0111i i zamijeni",
-"Replace with": "Zamijena sa",
-"Find": "Prona\u0111i",
-"Replace all": "Zamijeni sve",
-"Match case": "Razlikuj mala i velika slova",
-"Prev": "Prethodno",
-"Spellcheck": "Provjera pravopisa",
-"Finish": "Zavr\u0161i",
-"Ignore all": "Zanemari sve",
-"Ignore": "Zanemari",
-"Add to Dictionary": "Dodaj u rje\u010dnik",
-"Insert row before": "Umetni red iznad",
-"Rows": "Redovi",
-"Height": "Visina",
-"Paste row after": "Zalijepi red iznad",
-"Alignment": "Poravnanje",
-"Border color": "Boja okvira",
-"Column group": "Grupa kolone",
-"Row": "Red",
-"Insert column before": "Umetni kolonu iznad",
-"Split cell": "Podijeli \u0107eliju",
-"Cell padding": "Ispunjenje \u0107elije",
-"Cell spacing": "Razmak \u0107elija",
-"Row type": "Vrsta reda",
-"Insert table": "Umetni tabelu",
-"Body": "Tijelo",
-"Caption": "Natpis",
-"Footer": "Podno\u017eje",
-"Delete row": "Obri\u0161i red",
-"Paste row before": "Zalijepi red ispod",
-"Scope": "Opseg",
-"Delete table": "Obri\u0161i tabelu",
-"H Align": "H poravnanje",
-"Top": "Vrh",
-"Header cell": "\u0106elija zaglavlja",
-"Column": "Kolona",
-"Row group": "Grupa reda",
-"Cell": "\u0106elija",
-"Middle": "Sredina",
-"Cell type": "Vrsta \u0107elije",
-"Copy row": "Kopiraj red",
-"Row properties": "Svojstva reda",
-"Table properties": "Svojstva tabele",
-"Bottom": "Dno",
-"V Align": "V poravnanje",
-"Header": "Zaglavlje",
-"Right": "Desno",
-"Insert column after": "Umetni kolonu ispod",
-"Cols": "Kolone",
-"Insert row after": "Umetni red ispod",
-"Width": "\u0160irina",
-"Cell properties": "Svojstva \u0107elije",
-"Left": "Lijevo",
-"Cut row": "Izre\u017ei red",
-"Delete column": "Obri\u0161i kolonu",
-"Center": "Centrirano",
-"Merge cells": "Spoji \u0107elije",
-"Insert template": "Umetni predlo\u017eak",
-"Templates": "Predlo\u0161ci",
-"Background color": "Boja pozadine",
-"Custom...": "Prilago\u0111eno...",
-"Custom color": "Korisni\u010dka boja",
-"No color": "Bez boje",
-"Text color": "Boja tekst",
-"Show blocks": "Prika\u017ei blokove",
-"Show invisible characters": "Prika\u017ei nevidljive znakove",
-"Words: {0}": "Rije\u010di: {0}",
-"Insert": "Umetni",
-"File": "Datoteka",
-"Edit": "Uredi",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Oblast za ure\u0111ivanje teksta. Pritisnite ALT-F9 za meni. Pritisnite ALT-F10 za prikaz alatne trake. Pritisnite ALT-0 za pomo\u0107.",
-"Tools": "Alati",
-"View": "Pregled",
-"Table": "Tabela",
-"Format": "Formatiranje"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/de_AT.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('de_AT',{
-"Redo": "Wiederholen",
-"Undo": "R\u00fcckg\u00e4ngig",
-"Cut": "Ausschneiden",
-"Copy": "Kopieren",
-"Paste": "Einf\u00fcgen",
-"Select all": "Alles ausw\u00e4hlen",
-"New document": "Neues Dokument",
-"Ok": "Ok",
-"Cancel": "Abbrechen",
-"Visual aids": "Hilfslinien und unsichtbare Elemente einblenden",
-"Bold": "Fett",
-"Italic": "Kursiv",
-"Underline": "Unterstrichen",
-"Strikethrough": "Durchgestrichen",
-"Superscript": "Hochgestellt",
-"Subscript": "Tiefgestellt",
-"Clear formatting": "Formatierungen zur\u00fccksetzen",
-"Align left": "Linksb\u00fcndig",
-"Align center": "Zentriert",
-"Align right": "Rechtsb\u00fcndig",
-"Justify": "Blocksatz",
-"Bullet list": "Unsortierte Liste",
-"Numbered list": "Sortierte Liste",
-"Decrease indent": "Ausr\u00fccken",
-"Increase indent": "Einr\u00fccken",
-"Close": "Schlie\u00dfen",
-"Formats": "Formate",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Ihr Browser unterst\u00fctzt keinen direkten Zugriff auf die Zwischenablage. Bitte nutzen Sie die Tastaturk\u00fcrzel Strg+X\/C\/V stattdessen.",
-"Headers": "\u00dcberschriften",
-"Header 1": "\u00dcberschrift 1",
-"Header 2": "\u00dcberschrift 2",
-"Header 3": "\u00dcberschrift 3",
-"Header 4": "\u00dcberschrift 4",
-"Header 5": "\u00dcberschrift 5",
-"Header 6": "\u00dcberschrift 6",
-"Headings": "\u00dcberschriften",
-"Heading 1": "\u00dcberschrift 1",
-"Heading 2": "\u00dcberschrift 2",
-"Heading 3": "\u00dcberschrift 3",
-"Heading 4": "\u00dcberschrift 4",
-"Heading 5": "\u00dcberschrift 5",
-"Heading 6": "\u00dcberschrift 6",
-"Preformatted": "Vorformatiert",
-"Div": "Block (div)",
-"Pre": "Vorformatierter Text (pre)",
-"Code": "Code (code)",
-"Paragraph": "Absatz (p)",
-"Blockquote": "Zitat (blockquote)",
-"Inline": "Inline",
-"Blocks": "Bl\u00f6cke",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Alle Texte werden nun ohne Formatierung eingef\u00fcgt, bis diese Einstellung wieder ge\u00e4ndert wird.",
-"Font Family": "Schriftart",
-"Font Sizes": "Schriftgr\u00f6\u00dfen",
-"Class": "Klasse",
-"Browse for an image": "Bild...",
-"OR": "oder",
-"Drop an image here": "Bild hierher ziehen",
-"Upload": "Hochladen",
-"Block": "Block",
-"Align": "Ausrichtung",
-"Default": "Standard",
-"Circle": "Kreis",
-"Disc": "Gef\u00fcllter Kreis",
-"Square": "Quadrat",
-"Lower Alpha": "Kleinbuchstaben",
-"Lower Greek": "Griechische Kleinbuchstaben",
-"Lower Roman": "R\u00f6mische Zahlen (Kleinbuchstaben)",
-"Upper Alpha": "Gro\u00dfbuchstaben",
-"Upper Roman": "R\u00f6mische Zahlen (Gro\u00dfbuchstaben)",
-"Anchor": "Anker",
-"Name": "Name",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Eine ID f\u00e4ngt mit einem Buchstaben an, gefolgt von Buchstaben, Ziffern, Bindestrichen, Punkten, Doppelpunkten oder Unterstrichen.",
-"You have unsaved changes are you sure you want to navigate away?": "Sie haben ungespeicherte \u00c4nderungen. Sind Sie sicher, dass Sie die Seite verlassen wollen?",
-"Restore last draft": "Letzten Entwurf wiederherstellen.",
-"Special character": "Sonderzeichen",
-"Source code": "Quelltext",
-"Insert\/Edit code sample": "Beispielcode einf\u00fcgen\/bearbeiten",
-"Language": "Sprache",
-"Code sample": "Code Beispiel",
-"Color": "Farbe",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Links nach rechts",
-"Right to left": "Rechts nach links",
-"Emoticons": "Emoticons",
-"Document properties": "Dokumenteigenschaften",
-"Title": "Titel",
-"Keywords": "Schl\u00fcsselw\u00f6rter",
-"Description": "Beschreibung",
-"Robots": "Suchmaschinen",
-"Author": "Autor",
-"Encoding": "Enkodierung",
-"Fullscreen": "Vollbild",
-"Action": "Aktion",
-"Shortcut": "Tastenkombination",
-"Help": "Hilfe",
-"Address": "Adresse",
-"Focus to menubar": "Fokus auf Men\u00fcleiste",
-"Focus to toolbar": "Fokus auf Werkzeugleiste",
-"Focus to element path": "Fokus auf Elementpfad",
-"Focus to contextual toolbar": "Fokus auf kontextbezogene Werkzeugleiste",
-"Insert link (if link plugin activated)": "Link einf\u00fcgen (wenn Plugin aktiv ist)",
-"Save (if save plugin activated)": "Speichern (wenn Plugin aktiv ist)",
-"Find (if searchreplace plugin activated)": "Suchen (wenn Plugin aktiv ist)",
-"Plugins installed ({0}):": "Installierte Plugins ({0}):",
-"Premium plugins:": "Premium Plugins:",
-"Learn more...": "Mehr Informationen...",
-"You are using {0}": "Sie verwenden {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Praktische Abk\u00fcrzungen",
-"Horizontal line": "Horizontale Trennlinie",
-"Insert\/edit image": "Bild einf\u00fcgen\/bearbeiten",
-"Image description": "Bildbeschreibung",
-"Source": "Adresse",
-"Dimensions": "Ausma\u00dfe",
-"Constrain proportions": "Seitenverh\u00e4ltnis beibehalten",
-"General": "Allgemein",
-"Advanced": "Erweitert",
-"Style": "Format",
-"Vertical space": "Vertikaler Abstand",
-"Horizontal space": "Horizontaler Abstand",
-"Border": "Rahmen",
-"Insert image": "Bild einf\u00fcgen",
-"Image": "Bild",
-"Image list": "Bilderliste",
-"Rotate counterclockwise": "Gegen den Uhrzeigersinn drehen",
-"Rotate clockwise": "Im Uhrzeigersinn drehen",
-"Flip vertically": "Vertikal kippen",
-"Flip horizontally": "Horizontal kippen",
-"Edit image": "Bild bearbeiten",
-"Image options": "Bildeinstellungen",
-"Zoom in": "Einzoomen",
-"Zoom out": "Auszoomen",
-"Crop": "Zuschneiden",
-"Resize": "Gr\u00f6\u00dfe \u00e4ndern",
-"Orientation": "Orientierung",
-"Brightness": "Helligkeit",
-"Sharpen": "Sch\u00e4rfen",
-"Contrast": "Kontrast",
-"Color levels": "Farbwerte",
-"Gamma": "Gamma",
-"Invert": "Invertieren",
-"Apply": "Anwenden",
-"Back": "Zur\u00fcck",
-"Insert date\/time": "Zeit\/Datum einf\u00fcgen",
-"Date\/time": "Zeit\/Datum",
-"Insert link": "Link einf\u00fcgen",
-"Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
-"Text to display": "Angezeigter Text",
-"Url": "Url",
-"Target": "Ziel",
-"None": "Keine",
-"New window": "Neues Fenster",
-"Remove link": "Link entfernen",
-"Anchors": "Anker",
-"Link": "Link",
-"Paste or type a link": "Link einf\u00fcgen oder eintippen",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Die eingegebene URL scheint eine E-Mail-Adresse zu sein. Soll das notwendige \"mailto:\"-Pr\u00e4fix hinzugef\u00fcgt werden?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Die eingegebene URL scheint eine externe Web-Adresse zu sein. Soll das notwendige \"http:\/\/\"-Pr\u00e4fix hinzugef\u00fcgt werden?",
-"Link list": "Linkliste",
-"Insert video": "Video einf\u00fcgen",
-"Insert\/edit video": "Video einf\u00fcgen\/bearbeiten",
-"Insert\/edit media": "Medien einf\u00fcgen\/bearbeiten",
-"Alternative source": "Alternative Quelle",
-"Poster": "Poster",
-"Paste your embed code below:": "F\u00fcgen unten Sie Ihren Quellcode zum einbetten ein",
-"Embed": "Einbetten",
-"Media": "Medien",
-"Nonbreaking space": "gesch\u00fctztes Leerzeichen",
-"Page break": "Seitenumbruch",
-"Paste as text": "Als Text einf\u00fcgen",
-"Preview": "Vorschau",
-"Print": "Drucken",
-"Save": "Speichern",
-"Find": "Suchen",
-"Replace with": "Ersetzen durch",
-"Replace": "Ersetzen",
-"Replace all": "Alle ersetzen",
-"Prev": "Vorheriges",
-"Next": "N\u00e4chstes",
-"Find and replace": "Suchen und ersetzen",
-"Could not find the specified string.": "Keine \u00dcbereinstimmung gefunden",
-"Match case": "Gro\u00df-\/Kleinschreibung beachten",
-"Whole words": "Vollst\u00e4ndige W\u00f6rter",
-"Spellcheck": "Rechtschreibung \u00fcberpr\u00fcfen",
-"Ignore": "Ignorieren",
-"Ignore all": "Alle ignorieren",
-"Finish": "Fertig",
-"Add to Dictionary": "Zum W\u00f6rterbuch hinzuf\u00fcgen",
-"Insert table": "Tabelle einf\u00fcgen",
-"Table properties": "Tabelleneigenschaften",
-"Delete table": "Tabelle l\u00f6schen",
-"Cell": "Zelle",
-"Row": "Zeile",
-"Column": "Spalte",
-"Cell properties": "Zelleneigenschaften",
-"Merge cells": "Zellen vereinen",
-"Split cell": "Verbundene Zellen trennen",
-"Insert row before": "Neue Zeile oberhalb einf\u00fcgen",
-"Insert row after": "Neue Zeile unterhalb einf\u00fcgen",
-"Delete row": "Zeile l\u00f6schen",
-"Row properties": "Zeileneigenschaften",
-"Cut row": "Zeile ausschneiden",
-"Copy row": "Zeile kopieren",
-"Paste row before": "Zeile oberhalb einf\u00fcgen",
-"Paste row after": "Zeile unterhalb einf\u00fcgen",
-"Insert column before": "Neue Spalte links einf\u00fcgen",
-"Insert column after": "Neue Spalte rechts einf\u00fcgen",
-"Delete column": "Spalte l\u00f6schen",
-"Cols": "Spalten",
-"Rows": "Zeilen",
-"Width": "Breite",
-"Height": "H\u00f6he",
-"Cell spacing": "Zellenabstand",
-"Cell padding": "Abstand innerhalb der Zellen",
-"Caption": "Beschriftung der Tabelle",
-"Left": "Links",
-"Center": "Zentriert",
-"Right": "Rechts",
-"Cell type": "Zellentyp",
-"Scope": "Geltungsbereich",
-"Alignment": "Ausrichtung",
-"H Align": "Ausrichtung H",
-"V Align": "Ausrichtung V",
-"Top": "Oben",
-"Middle": "Mitte",
-"Bottom": "Unten",
-"Header cell": "\u00dcberschrift",
-"Row group": "Zeilengruppe",
-"Column group": "Spaltengruppe",
-"Row type": "Zeilentyp",
-"Header": "Tabellen\u00fcberschrift",
-"Body": "Tabellenk\u00f6rper",
-"Footer": "Tabellenfu\u00df",
-"Border color": "Rahmenfarbe",
-"Insert template": "Vorlage einf\u00fcgen",
-"Templates": "Vorlagen",
-"Template": "Vorlage",
-"Text color": "Textfarbe",
-"Background color": "Hintergrundfarbe",
-"Custom...": "Benutzerdefiniert...",
-"Custom color": "Benutzerdefinierte Farbe",
-"No color": "Keine Farbe",
-"Table of Contents": "Inhaltsverzeichnis",
-"Show blocks": "Blockelemente einblenden",
-"Show invisible characters": "Unsichtbare Zeichen einblenden",
-"Words: {0}": "W\u00f6rter: {0}",
-"{0} words": "{0} W\u00f6rter",
-"File": "Datei",
-"Edit": "Bearbeiten",
-"Insert": "Einf\u00fcgen",
-"View": "Ansicht",
-"Format": "Format",
-"Table": "Tabelle",
-"Tools": "Extras",
-"Powered by {0}": "Betrieben von {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Dr\u00fccken Sie ALT-F9 f\u00fcr das Men\u00fc. Dr\u00fccken Sie ALT-F10 f\u00fcr die Werkzeugleiste. Dr\u00fccken Sie ALT-0 f\u00fcr Hilfe"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/el.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('el',{
-"Redo": "\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7",
-"Undo": "\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7",
-"Cut": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae",
-"Copy": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Paste": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7",
-"Select all": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03cc\u03bb\u03c9\u03bd",
-"New document": "\u039d\u03ad\u03bf \u03ad\u03b3\u03b3\u03c1\u03b1\u03c6\u03bf",
-"Ok": "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9",
-"Cancel": "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
-"Visual aids": "O\u03c0\u03c4\u03b9\u03ba\u03ac \u03b2\u03bf\u03b7\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 ",
-"Bold": "\u0388\u03bd\u03c4\u03bf\u03bd\u03b7",
-"Italic": "\u03a0\u03bb\u03ac\u03b3\u03b9\u03b1",
-"Underline": "\u03a5\u03c0\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b9\u03c3\u03b7",
-"Strikethrough": "\u0394\u03b9\u03b1\u03ba\u03c1\u03b9\u03c4\u03ae \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Superscript": "\u0395\u03ba\u03b8\u03ad\u03c4\u03b7\u03c2",
-"Subscript": "\u0394\u03b5\u03af\u03ba\u03c4\u03b7\u03c2",
-"Clear formatting": "\u0391\u03c0\u03b1\u03bb\u03bf\u03b9\u03c6\u03ae \u03bc\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
-"Align left": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Align center": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03c3\u03c4\u03bf \u03ba\u03ad\u03bd\u03c4\u03c1\u03bf",
-"Align right": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Justify": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03c3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Bullet list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03bc\u03b5 \u03ba\u03bf\u03c5\u03ba\u03ba\u03af\u03b4\u03b5\u03c2",
-"Numbered list": "\u0391\u03c1\u03b9\u03b8\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1",
-"Decrease indent": "\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
-"Increase indent": "\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
-"Close": "\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf",
-"Formats": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u039f \u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03b9 \u03ac\u03bc\u03b5\u03c3\u03b7 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c7\u03b5\u03b9\u03c1\u03bf. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03af\u03bf\u03c5 Ctrl+X\/C\/V.",
-"Headers": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
-"Header 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
-"Header 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
-"Header 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
-"Header 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
-"Header 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
-"Header 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
-"Headings": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
-"Heading 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
-"Heading 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
-"Heading 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
-"Heading 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
-"Heading 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
-"Heading 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
-"Preformatted": "\u03a0\u03c1\u03bf\u03b4\u03b9\u03b1\u03bc\u03bf\u03c1\u03c6\u03c9\u03bc\u03ad\u03bd\u03bf",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
-"Paragraph": "\u03a0\u03b1\u03c1\u03ac\u03b3\u03c1\u03b1\u03c6\u03bf\u03c2",
-"Blockquote": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u03c0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2",
-"Inline": "\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03b7",
-"Blocks": "\u03a4\u03bc\u03ae\u03bc\u03b1\u03c4\u03b1",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0397 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c4\u03ce\u03c1\u03b1 \u03c3\u03b5 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c0\u03bb\u03bf\u03cd \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a4\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03b1 \u03bc\u03b9\u03b1\u03c2 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7\u03c2 \u03b8\u03b1 \u03b5\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03bf\u03cd\u03bd\u03c4\u03b1\u03b9 \u03c9\u03c2 \u03b1\u03c0\u03bb\u03cc \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03cc\u03c3\u03bf \u03b7 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c5\u03c4\u03ae \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03bd\u03b5\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03ae.",
-"Font Family": "\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac",
-"Font Sizes": "\u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2",
-"Class": "\u039a\u03bb\u03ac\u03c3\u03b7",
-"Browse for an image": "\u0391\u03bd\u03b1\u03b6\u03b7\u03c4\u03ae\u03c3\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1",
-"OR": "\u0389",
-"Drop an image here": "\u03a1\u03af\u03be\u03c4\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1 \u03b5\u03b4\u03ce",
-"Upload": "\u039c\u03b5\u03c4\u03b1\u03c6\u03cc\u03c1\u03c4\u03c9\u03c3\u03b7",
-"Block": "\u03a4\u03bc\u03ae\u03bc\u03b1",
-"Align": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Default": "\u03a0\u03c1\u03bf\u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf",
-"Circle": "\u039a\u03cd\u03ba\u03bb\u03bf\u03c2",
-"Disc": "\u0394\u03af\u03c3\u03ba\u03bf\u03c2",
-"Square": "\u03a4\u03b5\u03c4\u03c1\u03ac\u03b3\u03c9\u03bd\u03bf",
-"Lower Alpha": "\u03a0\u03b5\u03b6\u03ac \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
-"Lower Greek": "\u03a0\u03b5\u03b6\u03ac \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac",
-"Lower Roman": "\u03a0\u03b5\u03b6\u03ac \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
-"Upper Alpha": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
-"Upper Roman": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
-"Anchor": "\u0391\u03b3\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
-"Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
-"Id": "\u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u039f \u039a\u03c9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03b1\u03c1\u03c7\u03af\u03b6\u03b5\u03b9 \u03bc\u03b5 \u03ad\u03bd\u03b1 \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1, \u03b1\u03ba\u03bf\u03bb\u03bf\u03c5\u03b8\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03bc\u03cc\u03bd\u03bf \u03b1\u03c0\u03cc \u03b3\u03c1\u03ac\u03bc\u03bc\u03b1\u03c4\u03b1, \u03b1\u03c1\u03b9\u03b8\u03bc\u03bf\u03cd\u03c2, \u03c0\u03b1\u03cd\u03bb\u03b5\u03c2, \u03c4\u03b5\u03bb\u03b5\u03af\u03b5\u03c2, \u03ac\u03bd\u03c9 \u03c4\u03b5\u03bb\u03b5\u03af\u03b1 \u03ae \u03c5\u03c0\u03bf\u03b3\u03c1\u03b1\u03bc\u03bc\u03af\u03c3\u03b5\u03b9\u03c2.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0388\u03c7\u03b5\u03c4\u03b5 \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2. \u0395\u03af\u03c3\u03c4\u03b5 \u03b2\u03ad\u03b2\u03b1\u03b9\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c6\u03cd\u03b3\u03b5\u03c4\u03b5 \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03c3\u03b5\u03bb\u03af\u03b4\u03b1;",
-"Restore last draft": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf\u03c5 \u03c3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5",
-"Special character": "\u0395\u03b9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03b1\u03c2",
-"Source code": "\u03a0\u03b7\u03b3\u03b1\u03af\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
-"Insert\/Edit code sample": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b4\u03b5\u03af\u03b3\u03bc\u03b1\u03c4\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1",
-"Language": "\u0393\u03bb\u03ce\u03c3\u03c3\u03b1",
-"Code sample": "\u0394\u03b5\u03af\u03b3\u03bc\u03b1 \u039a\u03ce\u03b4\u03b9\u03ba\u03b1",
-"Color": "\u03a7\u03c1\u03ce\u03bc\u03b1",
-"R": "\u03ba",
-"G": "\u03a0",
-"B": "\u039c",
-"Left to right": "\u0391\u03c0\u03cc \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Right to left": "\u0391\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Emoticons": "\u03a6\u03b1\u03c4\u03c3\u03bf\u03cd\u03bb\u03b5\u03c2",
-"Document properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b5\u03b3\u03b3\u03c1\u03ac\u03c6\u03bf\u03c5",
-"Title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
-"Keywords": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03ac",
-"Description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Robots": "\u03a1\u03bf\u03bc\u03c0\u03cc\u03c4",
-"Author": "\u03a3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7\u03c2",
-"Encoding": "\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Fullscreen": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7",
-"Action": "\u0395\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b1",
-"Shortcut": "\u03a3\u03c5\u03bd\u03c4\u03cc\u03bc\u03b5\u03c5\u03c3\u03b7",
-"Help": "\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
-"Address": "\u0394\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7",
-"Focus to menubar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd",
-"Focus to toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
-"Focus to element path": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03b4\u03b9\u03b1\u03b4\u03c1\u03bf\u03bc\u03ae \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03bf\u03c5",
-"Focus to contextual toolbar": "\u0395\u03c3\u03c4\u03af\u03b1\u03c3\u03b7 \u03c3\u03c4\u03b7 \u03c3\u03c5\u03bd\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd",
-"Insert link (if link plugin activated)": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03bf\u03c5 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5)",
-"Save (if save plugin activated)": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7\u03c2)",
-"Find (if searchreplace plugin activated)": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 (\u03b5\u03ac\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf \u03c4\u03bf \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03bf \u03c4\u03b7\u03c2 \u03b1\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7\u03c2)",
-"Plugins installed ({0}):": "\u0395\u03b3\u03ba\u03b1\u03c4\u03b5\u03c3\u03c4\u03b7\u03bc\u03ad\u03bd\u03b1 \u03c0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 ({0}):",
-"Premium plugins:": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1 \u03c5\u03c8\u03b7\u03bb\u03ae\u03c2 \u03c0\u03bf\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2:",
-"Learn more...": "\u039c\u03ac\u03b8\u03b5\u03c4\u03b5 \u03c0\u03b5\u03c1\u03b9\u03c3\u03c3\u03cc\u03c4\u03b5\u03c1\u03b1...",
-"You are using {0}": "\u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b5 {0}",
-"Plugins": "\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c4\u03b1",
-"Handy Shortcuts": "\u03a7\u03c1\u03ae\u03c3\u03b9\u03bc\u03b5\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2",
-"Horizontal line": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae",
-"Insert\/edit image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Image description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Source": "\u03a0\u03b7\u03b3\u03ae",
-"Dimensions": "\u0394\u03b9\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2",
-"Constrain proportions": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b1\u03bd\u03b1\u03bb\u03bf\u03b3\u03b9\u03ce\u03bd",
-"General": "\u0393\u03b5\u03bd\u03b9\u03ba\u03ac",
-"Advanced": "\u0393\u03b9\u03b1 \u03a0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2",
-"Style": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
-"Vertical space": "\u039a\u03ac\u03b8\u03b5\u03c4\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
-"Horizontal space": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
-"Border": "\u03a0\u03bb\u03b1\u03af\u03c3\u03b9\u03bf",
-"Insert image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Image": "\u0395\u03b9\u03ba\u03cc\u03bd\u03b1",
-"Image list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd",
-"Rotate counterclockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
-"Rotate clockwise": "\u03a0\u03b5\u03c1\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03b4\u03b5\u03be\u03b9\u03cc\u03c3\u03c4\u03c1\u03bf\u03c6\u03b1",
-"Flip vertically": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03ba\u03b1\u03b8\u03ad\u03c4\u03c9\u03c2",
-"Flip horizontally": "\u0391\u03bd\u03b1\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03bf\u03c1\u03b9\u03b6\u03bf\u03bd\u03c4\u03af\u03c9\u03c2",
-"Edit image": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Image options": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Zoom in": "\u039c\u03b5\u03b3\u03ad\u03b8\u03c5\u03bd\u03c3\u03b7",
-"Zoom out": "\u03a3\u03bc\u03af\u03ba\u03c1\u03c5\u03bd\u03c3\u03b7",
-"Crop": "\u03a0\u03b5\u03c1\u03b9\u03ba\u03bf\u03c0\u03ae",
-"Resize": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03bc\u03b5\u03b3\u03ad\u03b8\u03bf\u03c5\u03c2",
-"Orientation": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03bd\u03b1\u03c4\u03bf\u03bb\u03b9\u03c3\u03bc\u03cc\u03c2",
-"Brightness": "\u03a6\u03c9\u03c4\u03b5\u03b9\u03bd\u03cc\u03c4\u03b7\u03c4\u03b1",
-"Sharpen": "\u038c\u03be\u03c5\u03bd\u03c3\u03b7",
-"Contrast": "\u0391\u03bd\u03c4\u03af\u03b8\u03b5\u03c3\u03b7",
-"Color levels": "\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03b1 \u03c7\u03c1\u03ce\u03bc\u03b1\u03c4\u03bf\u03c2",
-"Gamma": "\u0393\u03ac\u03bc\u03bc\u03b1",
-"Invert": "\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae",
-"Apply": "\u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae",
-"Back": "\u03a0\u03af\u03c3\u03c9",
-"Insert date\/time": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\u03c2\/\u03ce\u03c1\u03b1\u03c2",
-"Date\/time": "\u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\/\u03ce\u03c1\u03b1",
-"Insert link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Insert\/edit link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Text to display": "\u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03b3\u03b9\u03b1 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
-"Url": "URL",
-"Target": "\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
-"None": "\u039a\u03b1\u03bc\u03af\u03b1",
-"New window": "\u039d\u03ad\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf",
-"Remove link": "\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Anchors": "\u0386\u03b3\u03ba\u03c5\u03c1\u03b5\u03c2",
-"Link": "\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2",
-"Paste or type a link": "\u0395\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03ae\u03c3\u03c4\u03b5 \u03ae \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03ae\u03c3\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 email. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 mailto:;",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 http:\/\/;",
-"Link list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03c9\u03bd",
-"Insert video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
-"Insert\/edit video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
-"Insert\/edit media": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 media",
-"Alternative source": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7",
-"Poster": "\u0391\u03c6\u03af\u03c3\u03b1",
-"Paste your embed code below:": "\u0395\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9:",
-"Embed": "\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7",
-"Media": "\u039c\u03ad\u03c3\u03b1 (\u03bc\u03af\u03bd\u03c4\u03b9\u03b1)",
-"Nonbreaking space": "\u039a\u03b5\u03bd\u03cc \u03c7\u03c9\u03c1\u03af\u03c2 \u03b4\u03b9\u03b1\u03ba\u03bf\u03c0\u03ae",
-"Page break": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2",
-"Paste as text": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03c9\u03c2 \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf",
-"Preview": "\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7",
-"Print": "\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7",
-"Save": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7",
-"Find": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7",
-"Replace with": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03bc\u03b5",
-"Replace": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
-"Replace all": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03cc\u03bb\u03c9\u03bd",
-"Prev": "\u03a0\u03c1\u03bf\u03b7\u03b3.",
-"Next": "\u0395\u03c0\u03cc\u03bc.",
-"Find and replace": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
-"Could not find the specified string.": "\u0394\u03b5\u03bd \u03ae\u03c4\u03b1\u03bd \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03bb\u03c6\u03b1\u03c1\u03b9\u03b8\u03bc\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd.",
-"Match case": "\u03a4\u03b1\u03af\u03c1\u03b9\u03b1\u03c3\u03bc\u03b1 \u03c0\u03b5\u03b6\u03ce\u03bd\/\u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03c9\u03bd",
-"Whole words": "\u039f\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03b5\u03c2 \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
-"Spellcheck": "\u039f\u03c1\u03b8\u03bf\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 ",
-"Ignore": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7",
-"Ignore all": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7 \u03cc\u03bb\u03c9\u03bd",
-"Finish": "\u03a4\u03ad\u03bb\u03bf\u03c2",
-"Add to Dictionary": "\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03c3\u03c4\u03bf \u039b\u03b5\u03be\u03b9\u03ba\u03cc",
-"Insert table": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Table properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Delete table": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Cell": "\u039a\u03b5\u03bb\u03af",
-"Row": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ae",
-"Column": "\u03a3\u03c4\u03ae\u03bb\u03b7",
-"Cell properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Merge cells": "\u03a3\u03c5\u03b3\u03c7\u03ce\u03bd\u03b5\u03c5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Split cell": "\u0394\u03b9\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Insert row before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
-"Insert row after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
-"Delete row": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Row properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Cut row": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Copy row": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Paste row before": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
-"Paste row after": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
-"Insert column before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Insert column after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Delete column": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2",
-"Cols": "\u03a3\u03c4\u03ae\u03bb\u03b5\u03c2",
-"Rows": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2",
-"Width": "\u03a0\u03bb\u03ac\u03c4\u03bf\u03c2",
-"Height": "\u038e\u03c8\u03bf\u03c2",
-"Cell spacing": "\u0391\u03c0\u03cc\u03c3\u03c4\u03b1\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Cell padding": "\u0391\u03bd\u03b1\u03c0\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Caption": "\u039b\u03b5\u03b6\u03ac\u03bd\u03c4\u03b1",
-"Left": "\u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Center": "\u039a\u03b5\u03bd\u03c4\u03c1\u03b1\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7",
-"Right": "\u0394\u03b5\u03be\u03b9\u03ac",
-"Cell type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Scope": "\u0388\u03ba\u03c4\u03b1\u03c3\u03b7",
-"Alignment": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"H Align": "\u039f\u03c1. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"V Align": "\u039a. \u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Top": "\u039a\u03bf\u03c1\u03c5\u03c6\u03ae",
-"Middle": "\u039c\u03ad\u03c3\u03b7",
-"Bottom": "\u039a\u03ac\u03c4\u03c9",
-"Header cell": "\u039a\u03b5\u03bb\u03af-\u03ba\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
-"Row group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ce\u03bd",
-"Column group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03c3\u03c4\u03b7\u03bb\u03ce\u03bd",
-"Row type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Header": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
-"Body": "\u03a3\u03ce\u03bc\u03b1",
-"Footer": "\u03a5\u03c0\u03bf\u03c3\u03ad\u03bb\u03b9\u03b4\u03bf",
-"Border color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c0\u03bb\u03b1\u03b9\u03c3\u03af\u03bf\u03c5",
-"Insert template": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03c1\u03bf\u03c4\u03cd\u03c0\u03bf\u03c5 ",
-"Templates": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03b1",
-"Template": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03bf",
-"Text color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 ",
-"Background color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c6\u03cc\u03bd\u03c4\u03bf\u03c5",
-"Custom...": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae...",
-"Custom color": "\u03a0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03c3\u03bc\u03ad\u03bd\u03bf \u03c7\u03c1\u03ce\u03bc\u03b1",
-"No color": "\u03a7\u03c9\u03c1\u03af\u03c2 \u03c7\u03c1\u03ce\u03bc\u03b1",
-"Table of Contents": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 \u03a0\u03b5\u03c1\u03b9\u03b5\u03c7\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd",
-"Show blocks": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03bc\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd",
-"Show invisible characters": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03ba\u03c1\u03c5\u03c6\u03ce\u03bd \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd",
-"Words: {0}": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2: {0}",
-"{0} words": "{0} \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
-"File": "\u0391\u03c1\u03c7\u03b5\u03af\u03bf",
-"Edit": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1",
-"Insert": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae",
-"View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
-"Format": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Table": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2",
-"Tools": "\u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03b1",
-"Powered by {0}": "\u03a4\u03c1\u03bf\u03c6\u03bf\u03b4\u03bf\u03c4\u03b5\u03af\u03c4\u03b1\u03b9 \u03b1\u03c0\u03cc {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u0395\u03bc\u03c0\u03bb\u03bf\u03c5\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F9 \u03b3\u03b9\u03b1 \u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F10 \u03b3\u03b9\u03b1  \u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-0 \u03b3\u03b9\u03b1 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/en_CA.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('en_CA',{
-"Redo": "Redo",
-"Undo": "Undo",
-"Cut": "Cut",
-"Copy": "Copy",
-"Paste": "Paste",
-"Select all": "Select all",
-"New document": "New document",
-"Ok": "Ok",
-"Cancel": "Cancel",
-"Visual aids": "Visual aids",
-"Bold": "Bold",
-"Italic": "Italic",
-"Underline": "Underline",
-"Strikethrough": "Strikethrough",
-"Superscript": "Superscript",
-"Subscript": "Subscript",
-"Clear formatting": "Clear formatting",
-"Align left": "Align left",
-"Align center": "Align center",
-"Align right": "Align right",
-"Justify": "Justify",
-"Bullet list": "Bullet list",
-"Numbered list": "Numbered list",
-"Decrease indent": "Decrease indent",
-"Increase indent": "Increase indent",
-"Close": "Close",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.",
-"Headers": "Headers",
-"Header 1": "Header 1",
-"Header 2": "Header 2",
-"Header 3": "Header 3",
-"Header 4": "Header 4",
-"Header 5": "Header 5",
-"Header 6": "Header 6",
-"Headings": "Headings",
-"Heading 1": "Heading 1",
-"Heading 2": "Heading 2",
-"Heading 3": "Heading 3",
-"Heading 4": "Heading 4",
-"Heading 5": "Heading 5",
-"Heading 6": "Heading 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraph",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Blocks",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Font Family": "Font Family",
-"Font Sizes": "Font Sizes",
-"Class": "Class",
-"Browse for an image": "Browse for an image",
-"OR": "OR",
-"Drop an image here": "Drop an image here",
-"Upload": "Upload",
-"Block": "Blocks",
-"Align": "Align",
-"Default": "Default",
-"Circle": "Circle",
-"Disc": "Disc",
-"Square": "Square",
-"Lower Alpha": "Lower Alpha",
-"Lower Greek": "Lower Greek",
-"Lower Roman": "Lower Roman",
-"Upper Alpha": "Upper Alpha",
-"Upper Roman": "Upper Roman",
-"Anchor": "Anchor",
-"Name": "Name",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID should start with a letter, followed only by letters, numbers, dashes, dots, colons, or underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
-"Restore last draft": "Restore last draft",
-"Special character": "Special character",
-"Source code": "Source code",
-"Insert\/Edit code sample": "Insert\/Edit code sample",
-"Language": "Language",
-"Code sample": "Code sample",
-"Color": "Colour",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Left to right",
-"Right to left": "Right to left",
-"Emoticons": "Emoticons",
-"Document properties": "Document properties",
-"Title": "Title",
-"Keywords": "Keywords",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Author",
-"Encoding": "Encoding",
-"Fullscreen": "Fullscreen",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "Horizontal line",
-"Insert\/edit image": "Insert\/edit image",
-"Image description": "Image description",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Constrain proportions",
-"General": "General",
-"Advanced": "Advanced",
-"Style": "Style",
-"Vertical space": "Vertical space",
-"Horizontal space": "Horizontal space",
-"Border": "Border",
-"Insert image": "Insert image",
-"Image": "Image",
-"Image list": "Image list",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Colour levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "Insert date\/time",
-"Date\/time": "Date\/time",
-"Insert link": "Insert link",
-"Insert\/edit link": "Insert\/edit link",
-"Text to display": "Text to display",
-"Url": "Url",
-"Target": "Target",
-"None": "None",
-"New window": "New window",
-"Remove link": "Remove link",
-"Anchors": "Anchors",
-"Link": "Link",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Link list": "Link list",
-"Insert video": "Insert video",
-"Insert\/edit video": "Insert\/edit video",
-"Insert\/edit media": "Insert\/edit media",
-"Alternative source": "Alternative source",
-"Poster": "Poster",
-"Paste your embed code below:": "Paste your embed code below:",
-"Embed": "Embed",
-"Media": "Media",
-"Nonbreaking space": "Nonbreaking space",
-"Page break": "Page break",
-"Paste as text": "Paste as text",
-"Preview": "Preview",
-"Print": "Print",
-"Save": "Save",
-"Find": "Find",
-"Replace with": "Replace with",
-"Replace": "Replace",
-"Replace all": "Replace all",
-"Prev": "Prev",
-"Next": "Next",
-"Find and replace": "Find and replace",
-"Could not find the specified string.": "Could not find the specified string.",
-"Match case": "Match case",
-"Whole words": "Whole words",
-"Spellcheck": "Spellcheck",
-"Ignore": "Ignore",
-"Ignore all": "Ignore all",
-"Finish": "Finish",
-"Add to Dictionary": "Add to Dictionary",
-"Insert table": "Insert table",
-"Table properties": "Table properties",
-"Delete table": "Delete table",
-"Cell": "Cell",
-"Row": "Row",
-"Column": "Column",
-"Cell properties": "Cell properties",
-"Merge cells": "Merge cells",
-"Split cell": "Split cell",
-"Insert row before": "Insert row before",
-"Insert row after": "Insert row after",
-"Delete row": "Delete row",
-"Row properties": "Row properties",
-"Cut row": "Cut row",
-"Copy row": "Copy row",
-"Paste row before": "Paste row before",
-"Paste row after": "Paste row after",
-"Insert column before": "Insert column before",
-"Insert column after": "Insert column after",
-"Delete column": "Delete column",
-"Cols": "Cols",
-"Rows": "Rows",
-"Width": "Width",
-"Height": "Height",
-"Cell spacing": "Cell spacing",
-"Cell padding": "Cell padding",
-"Caption": "Caption",
-"Left": "Left",
-"Center": "Center",
-"Right": "Right",
-"Cell type": "Cell type",
-"Scope": "Scope",
-"Alignment": "Alignment",
-"H Align": "H Align",
-"V Align": "V Align",
-"Top": "Top",
-"Middle": "Middle",
-"Bottom": "Bottom",
-"Header cell": "Header cell",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "Row type",
-"Header": "Header",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Border colour",
-"Insert template": "Insert template",
-"Templates": "Templates",
-"Template": "Template",
-"Text color": "Text colour",
-"Background color": "Background colour",
-"Custom...": "Custom...",
-"Custom color": "Custom colour",
-"No color": "No colour",
-"Table of Contents": "Table of Contents",
-"Show blocks": "Show blocks",
-"Show invisible characters": "Show invisible characters",
-"Words: {0}": "Words: {0}",
-"{0} words": "{0} words",
-"File": "File",
-"Edit": "Edit",
-"Insert": "Insert",
-"View": "View",
-"Format": "Format",
-"Table": "Table",
-"Tools": "Tools",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/en_GB.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('en_GB',{
-"Redo": "Redo",
-"Undo": "Undo",
-"Cut": "Cut",
-"Copy": "Copy",
-"Paste": "Paste",
-"Select all": "Select all",
-"New document": "New document",
-"Ok": "Ok",
-"Cancel": "Cancel",
-"Visual aids": "Visual aids",
-"Bold": "Bold",
-"Italic": "Italic",
-"Underline": "Underline",
-"Strikethrough": "Strike-through",
-"Superscript": "Superscript",
-"Subscript": "Subscript",
-"Clear formatting": "Clear formatting",
-"Align left": "Align left",
-"Align center": "Align centre",
-"Align right": "Align right",
-"Justify": "Justify",
-"Bullet list": "Bullet list",
-"Numbered list": "Numbered list",
-"Decrease indent": "Decrease indent",
-"Increase indent": "Increase indent",
-"Close": "Close",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.",
-"Headers": "Headers",
-"Header 1": "Header 1",
-"Header 2": "Header 2",
-"Header 3": "Header 3",
-"Header 4": "Header 4",
-"Header 5": "Header 5",
-"Header 6": "Header 6",
-"Headings": "Headings",
-"Heading 1": "Heading 1",
-"Heading 2": "Heading 2",
-"Heading 3": "Heading 3",
-"Heading 4": "Heading 4",
-"Heading 5": "Heading 5",
-"Heading 6": "Heading 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraph",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Blocks",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Font Family": "Font Family",
-"Font Sizes": "Font Sizes",
-"Class": "Class",
-"Browse for an image": "Browse for an image",
-"OR": "OR",
-"Drop an image here": "Drop an image here",
-"Upload": "Upload",
-"Block": "Block",
-"Align": "Align",
-"Default": "Default",
-"Circle": "Circle",
-"Disc": "Disc",
-"Square": "Square",
-"Lower Alpha": "Lower Alpha",
-"Lower Greek": "Lower Greek",
-"Lower Roman": "Lower Roman",
-"Upper Alpha": "Upper Alpha",
-"Upper Roman": "Upper Roman",
-"Anchor": "Anchor",
-"Name": "Name",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
-"Restore last draft": "Restore last draft",
-"Special character": "Special character",
-"Source code": "Source code",
-"Insert\/Edit code sample": "Insert\/Edit code sample",
-"Language": "Language",
-"Code sample": "Code sample",
-"Color": "Colour",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Left to right",
-"Right to left": "Right to left",
-"Emoticons": "Emoticons",
-"Document properties": "Document properties",
-"Title": "Title",
-"Keywords": "Keywords",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Author",
-"Encoding": "Encoding",
-"Fullscreen": "Full-screen",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "Horizontal line",
-"Insert\/edit image": "Insert\/edit image",
-"Image description": "Image description",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Constrain proportions",
-"General": "General",
-"Advanced": "Advanced",
-"Style": "Style",
-"Vertical space": "Vertical space",
-"Horizontal space": "Horizontal space",
-"Border": "Border",
-"Insert image": "Insert image",
-"Image": "Image",
-"Image list": "Image list",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Colour levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "Insert date\/time",
-"Date\/time": "Date\/time",
-"Insert link": "Insert link",
-"Insert\/edit link": "Insert\/edit link",
-"Text to display": "Text to display",
-"Url": "URL",
-"Target": "Target",
-"None": "None",
-"New window": "New window",
-"Remove link": "Remove link",
-"Anchors": "Anchors",
-"Link": "Link",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Link list": "Link list",
-"Insert video": "Insert video",
-"Insert\/edit video": "Insert\/edit video",
-"Insert\/edit media": "Insert\/edit media",
-"Alternative source": "Alternative source",
-"Poster": "Poster",
-"Paste your embed code below:": "Paste your embed code below:",
-"Embed": "Embed",
-"Media": "Media",
-"Nonbreaking space": "Non-breaking space",
-"Page break": "Page break",
-"Paste as text": "Paste as text",
-"Preview": "Preview",
-"Print": "Print",
-"Save": "Save",
-"Find": "Find",
-"Replace with": "Replace with",
-"Replace": "Replace",
-"Replace all": "Replace all",
-"Prev": "Prev",
-"Next": "Next",
-"Find and replace": "Find and replace",
-"Could not find the specified string.": "Could not find the specified string.",
-"Match case": "Match case",
-"Whole words": "Whole words",
-"Spellcheck": "Spell-check",
-"Ignore": "Ignore",
-"Ignore all": "Ignore all",
-"Finish": "Finish",
-"Add to Dictionary": "Add to Dictionary",
-"Insert table": "Insert table",
-"Table properties": "Table properties",
-"Delete table": "Delete table",
-"Cell": "Cell",
-"Row": "Row",
-"Column": "Column",
-"Cell properties": "Cell properties",
-"Merge cells": "Merge cells",
-"Split cell": "Split cell",
-"Insert row before": "Insert row before",
-"Insert row after": "Insert row after",
-"Delete row": "Delete row",
-"Row properties": "Row properties",
-"Cut row": "Cut row",
-"Copy row": "Copy row",
-"Paste row before": "Paste row before",
-"Paste row after": "Paste row after",
-"Insert column before": "Insert column before",
-"Insert column after": "Insert column after",
-"Delete column": "Delete column",
-"Cols": "Cols",
-"Rows": "Rows",
-"Width": "Width",
-"Height": "Height",
-"Cell spacing": "Cell spacing",
-"Cell padding": "Cell padding",
-"Caption": "Caption",
-"Left": "Left",
-"Center": "Centre",
-"Right": "Right",
-"Cell type": "Cell type",
-"Scope": "Scope",
-"Alignment": "Alignment",
-"H Align": "H Align",
-"V Align": "V Align",
-"Top": "Top",
-"Middle": "Middle",
-"Bottom": "Bottom",
-"Header cell": "Header cell",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "Row type",
-"Header": "Header",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Border colour",
-"Insert template": "Insert template",
-"Templates": "Templates",
-"Template": "Template",
-"Text color": "Text colour",
-"Background color": "Background colour",
-"Custom...": "Custom...",
-"Custom color": "Custom colour",
-"No color": "No colour",
-"Table of Contents": "Table of Contents",
-"Show blocks": "Show blocks",
-"Show invisible characters": "Show invisible characters",
-"Words: {0}": "Words: {0}",
-"{0} words": "{0} words",
-"File": "File",
-"Edit": "Edit",
-"Insert": "Insert",
-"View": "View",
-"Format": "Format",
-"Table": "Table",
-"Tools": "Tools",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/eo.js Deleted

@@ -1,415 +0,0 @@
-tinymce.addI18n('eo',{
-"Redo": "Refari",
-"Undo": "Malfari",
-"Cut": "Eltran\u0109i",
-"Copy": "Kopii",
-"Paste": "Englui",
-"Select all": "Elekti \u0109ion",
-"New document": "Nova dokumento",
-"Ok": "Bone",
-"Cancel": "Nuligi",
-"Visual aids": "Videblaj helpiloj",
-"Bold": "Dika",
-"Italic": "Oblikva",
-"Underline": "Substreki",
-"Strikethrough": "Trastreki",
-"Superscript": "Superskribi",
-"Subscript": "Malsuperskribi",
-"Clear formatting": "Forigi formatigon",
-"Align left": "Ordigu maldekstren",
-"Align center": "Ordigu centren",
-"Align right": "Ordigu dekstren",
-"Justify": "Ordigu la\u016dflanke",
-"Bullet list": "Punkta listo",
-"Numbered list": "Numera listo",
-"Decrease indent": "Malpliigu alineon",
-"Increase indent": "Pliigu alineon",
-"Close": "Fermi",
-"Formats": "Formatoj",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Via retumilo ne subtenas rektan aliron al bufro. Bonvolu antata\u016de uzi klavarajn kombinojn Ctrl+X\/C\/V.",
-"Headers": "\u0108apoj",
-"Header 1": "\u0108apo 1",
-"Header 2": "\u0108apo 2",
-"Header 3": "\u0108apo 3",
-"Header 4": "\u0108apo 4",
-"Header 5": "\u0108apo 5",
-"Header 6": "\u0108apo 6",
-"Headings": "Titoloj",
-"Heading 1": "Titolo 1",
-"Heading 2": "Titolo 2",
-"Heading 3": "Titolo 3",
-"Heading 4": "Titolo 4",
-"Heading 5": "Titolo 5",
-"Heading 6": "Titolo 6",
-"Preformatted": "Anta\u016dformatigita",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kodo",
-"Paragraph": "Alineo",
-"Blockquote": "Mar\u011denigo",
-"Inline": "Enlinie",
-"Blocks": "Blokoj",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "La engluado nun okazas en simpla teksta re\u011dimo. La enhavo estos engluata kiel simpla teksto \u011dis anta\u016d vi for\u015daltos tiun \u0109i opcion.",
-"Fonts": "Tiparoj",
-"Font Sizes": "Tiparaj grandoj",
-"Class": "Klaso",
-"Browse for an image": "Rigardi por iu bildo",
-"OR": "A\u016c",
-"Drop an image here": "\u0134etu iun bildon \u0109i tien",
-"Upload": "Al\u015duti",
-"Block": "Bloko",
-"Align": "\u011cisrandigi ",
-"Default": "Implicite",
-"Circle": "Cirklo",
-"Disc": "Disko",
-"Square": "Kvadrato",
-"Lower Alpha": "Minuskla alfabeta",
-"Lower Greek": "Minuskla greka",
-"Lower Roman": "Minuskla latina",
-"Upper Alpha": "Majuskla alfabeta",
-"Upper Roman": "Majuskla latina",
-"Anchor...": "Ankro...",
-"Name": "Nomo",
-"Id": "Identigilo",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Identigilo devas komenci\u011di per litero sekvata nur per literoj, ciferoj, streketoj, punktoj, dupunktoj a\u016d substrekoj.",
-"You have unsaved changes are you sure you want to navigate away?": "Vi havas nekonservitajn \u015dan\u011dojn, \u0109u vi certe deziras eliri?",
-"Restore last draft": "Restarigu lastan malneton",
-"Special character...": "Speciala signo...",
-"Source code": "Fonta kodo",
-"Insert\/Edit code sample": "Enmeti\/Redakti kodospecimenon",
-"Language": "Lingvo",
-"Code sample...": "Kodospecimeno...",
-"Color Picker": "Kolorelektilo",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Maldekstro dekstren",
-"Right to left": "Dekstro maldekstren",
-"Emoticons...": "Miensimboloj...",
-"Metadata and Document Properties": "Metadatumoj kaj ecoj de dokumento",
-"Title": "Titolo",
-"Keywords": "\u015closilvortoj",
-"Description": "Priskribo",
-"Robots": "Robotoj",
-"Author": "A\u016dtoro",
-"Encoding": "Enkodigo",
-"Fullscreen": "Tutekrane",
-"Action": "Ago",
-"Shortcut": "\u015cparvojo",
-"Help": "Helpo",
-"Address": "Adreso",
-"Focus to menubar": "Enfokusigi al menubreto",
-"Focus to toolbar": "Enfokusigi al ilobreto",
-"Focus to element path": "Enfokusigi al elementvojo",
-"Focus to contextual toolbar": "Enfokusigi al kunteksta ilobreto",
-"Insert link (if link plugin activated)": "Enmeti ligilon (se ligila komprogramo estas aktivigita)",
-"Save (if save plugin activated)": "Konservi (se konserva komprogramo estas aktivigita)",
-"Find (if searchreplace plugin activated)": "Ser\u0109i (se ser\u0109a komprogramo estas aktivigita)",
-"Plugins installed ({0}):": "Kromprogramoj instalitaj ({0}): ",
-"Premium plugins:": "Premiaj kromprogramoj:",
-"Learn more...": "Legu aldone...",
-"You are using {0}": "Vi uzas {0}",
-"Plugins": "Kromprogramoj",
-"Handy Shortcuts": "Komfortaj \u015dparvojoj",
-"Horizontal line": "Horizontala linio",
-"Insert\/edit image": "Enmetu\/redaktu bildon",
-"Image description": "Bilda priskribo",
-"Source": "Fonto",
-"Dimensions": "Dimensioj",
-"Constrain proportions": "Relativigu proporciojn",
-"General": "\u011cenerale",
-"Advanced": "Por spertuloj",
-"Style": "Stilo",
-"Vertical space": "Vertikala spaco",
-"Horizontal space": "Horizontala spaco",
-"Border": "Limo",
-"Insert image": "Enmetu bildon",
-"Image...": "Bildo...",
-"Image list": "Bildlisto",
-"Rotate counterclockwise": "Rotaciu kontra\u016d horlo\u011do",
-"Rotate clockwise": "Rotaciu la\u016d horlo\u011do",
-"Flip vertically": "Respegulu vertikale",
-"Flip horizontally": "Respegulu horizontale",
-"Edit image": "Redaktu bildon",
-"Image options": "Bildaj opcioj",
-"Zoom in": "Plilar\u011digu",
-"Zoom out": "Malplilar\u011digu",
-"Crop": "Randtran\u0109u",
-"Resize": "\u015can\u011du dimensiojn",
-"Orientation": "Orientigo",
-"Brightness": "Heleco",
-"Sharpen": "Akrigu",
-"Contrast": "Kontrasto",
-"Color levels": "Kolorniveloj",
-"Gamma": "Gamo",
-"Invert": "Inversigu",
-"Apply": "Apliku",
-"Back": "Reen",
-"Insert date\/time": "Enmetu daton\/tempon",
-"Date\/time": "Dato\/tempo",
-"Insert\/Edit Link": "Enmeti\/redakti ligilon",
-"Insert\/edit link": "Enmetu\/redaktu ligilon",
-"Text to display": "Montrata teksto",
-"Url": "Urlo",
-"Open link in...": "Sekvi ligilon per...",
-"Current window": "Aktuala fenestro",
-"None": "Nenio",
-"New window": "Nova fenestro",
-"Remove link": "Forigu ligilon",
-"Anchors": "Ankroj",
-"Link...": "Ligilo...",
-"Paste or type a link": "Engluu a\u016d enigu ligilon",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "La enmetita URLo \u015dajnas esti retadreso. \u0108u vi deziras aldoni prefikson mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "La enmetita URLo \u015dajnas esti ekstera ligilo. \u0108u vi deziras aldoni nepran prefikson http:\/\/?",
-"Link list": "Ligila listo",
-"Insert video": "Enmetu videon",
-"Insert\/edit video": "Enmetu\/redaktu videon",
-"Insert\/edit media": "Enmeti\/redakti a\u016ddovida\u0135on  ",
-"Alternative source": "Alternativa fonto",
-"Alternative source URL": "URLo de alternativa fonto",
-"Media poster (Image URL)": "Ligilo al a\u016ddovida\u0135o (URLo de bildo)",
-"Paste your embed code below:": "Engluu vian internan kodon \u0109i-sube:",
-"Embed": "Enkonstruu",
-"Media...": "A\u016ddovida\u0135o...",
-"Nonbreaking space": "Nerompebla spaco",
-"Page break": "Pa\u011da fino",
-"Paste as text": "Engluu kiel tekston",
-"Preview": "Provrigardo",
-"Print...": "Presi...",
-"Save": "Konservi",
-"Find": "Trovi",
-"Replace with": "Anstata\u016digi per",
-"Replace": "Anstata\u016digi",
-"Replace all": "Anstata\u016digi\u0109ion",
-"Previous": "Anta\u016da",
-"Next": "Posta",
-"Find and replace...": "Ser\u0109i kaj anstata\u016di... ",
-"Could not find the specified string.": "Malsukceso trovi la indikitan sinsekvon",
-"Match case": "Sekvi usklecon",
-"Find whole words only": "Ser\u0109i nur tutan vorton",
-"Spell check": "Kontroli literumadon",
-"Ignore": "Ignoru",
-"Ignore all": "Ignoru \u0109ion",
-"Finish": "Finu",
-"Add to Dictionary": "Aldonu al vortaro",
-"Insert table": "Enmetu tabelon",
-"Table properties": "Tabelaj ecoj",
-"Delete table": "Forigu tabelon",
-"Cell": "\u0108elo",
-"Row": "Vico",
-"Column": "Kolumno",
-"Cell properties": "\u0108elaj ecoj",
-"Merge cells": "Kunigu \u0109elojn",
-"Split cell": "Disdividu \u0109elon",
-"Insert row before": "Enmetu vicon anta\u016d",
-"Insert row after": "Enmetu vicon poste",
-"Delete row": "Forigu vicon",
-"Row properties": "Vicaj ecoj",
-"Cut row": "Eltran\u0109u vicon",
-"Copy row": "Kopiu vicon",
-"Paste row before": "Engluu vicon anta\u016d",
-"Paste row after": "Engluu vicon poste",
-"Insert column before": "Enmetu kolumnon anta\u016d",
-"Insert column after": "Enmetu kolumnon poste",
-"Delete column": "Forigu kolumnon",
-"Cols": "Kolumonoj",
-"Rows": "Vicoj",
-"Width": "Lar\u011do",
-"Height": "Alto",
-"Cell spacing": "\u0108elspacoj",
-"Cell padding": "\u0108elmar\u011denoj",
-"Show caption": "Montri apudskribon",
-"Left": "Maldekstro",
-"Center": "Centro",
-"Right": "Dekstro",
-"Cell type": "\u0108ela tipo",
-"Scope": "Amplekso",
-"Alignment": "Aligo",
-"H Align": "H aligo",
-"V Align": "V aligo",
-"Top": "Supro",
-"Middle": "Mezo",
-"Bottom": "Subo",
-"Header cell": "\u0108apa \u0109elo",
-"Row group": "Vica grupo",
-"Column group": "Kolumna grupo",
-"Row type": "Vica tipo",
-"Header": "\u0108apo",
-"Body": "Korpo",
-"Footer": "Piedo",
-"Border color": "Lima koloro",
-"Insert template...": "Enmeti \u015dablonon...",
-"Templates": "\u015cablonoj",
-"Template": "\u015cablono",
-"Text color": "Teksta koloro",
-"Background color": "Fona koloro",
-"Custom...": "Propra...",
-"Custom color": "Propra koloro",
-"No color": "Neniu koloro",
-"Remove color": "Forigi koloron",
-"Table of Contents": "Enhavotabelo",
-"Show blocks": "Montru blokojn",
-"Show invisible characters": "Montru nevideblajn karaktrojn",
-"Word count": "Vortnombro ",
-"Count": "Nombri",
-"Document": "Dokumento",
-"Selection": "Elekto",
-"Words": "Vortoj",
-"Words: {0}": "Vortoj: {0}",
-"{0} words": "{0} vortoj",
-"File": "Dokumento",
-"Edit": "Redakti",
-"Insert": "Enmeti",
-"View": "Vidi",
-"Format": "Aspektigi",
-"Table": "Tabelo",
-"Tools": "Iloj",
-"Powered by {0}": "Funkciigita de {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ri\u0109teksta Areo. Premu ALT-F9 por menuo. Premu ALT-F10 por menuejo. Premu ALT-0 por helpo",
-"Image title": "Titolo de bildo",
-"Border width": "Lar\u011do de bordero",
-"Border style": "Stilo de bordero",
-"Error": "Eraro",
-"Warn": "Averto",
-"Valid": "Valida",
-"To open the popup, press Shift+Enter": "Por aperigi \u015dprucfenestron premu fulmoklavon Shift+Enter ",
-"Rich Text Area. Press ALT-0 for help.": "Ri\u0109teksta loko. Premu fulmoklavon ALT-0 por helpo.",
-"System Font": "Sistema tiparo",
-"Failed to upload image: {0}": "Al\u015dutado de bildo {0} malsukcesis",
-"Failed to load plugin: {0} from url {1}": "\u015cargado de kromprogramo {0} el URLo {1} malsukcesis",
-"Failed to load plugin url: {0}": "\u015cargado por kroprograma URLo {0} malsukcesis",
-"Failed to initialize plugin: {0}": "Pravalorizado de krompogramo {0} malsukcesis",
-"example": "ekzemplo",
-"Search": "Ser\u0109i",
-"All": "\u0108io",
-"Currency": "Valuto",
-"Text": "Teksto",
-"Quotations": "Cita\u0135oj",
-"Mathematical": "Matematika",
-"Extended Latin": "Etendita la latina",
-"Symbols": "Simboloj",
-"Arrows": "Sagsimboloj",
-"User Defined": "Propre difinita ",
-"dollar sign": "signo de usona dolaro",
-"currency sign": "valutsigno",
-"euro-currency sign": "signo de e\u016dro",
-"colon sign": "dupunkto",
-"cruzeiro sign": "signo de brazila kruzero",
-"french franc sign": "signo de francia franko",
-"lira sign": "signo de itala liro",
-"mill sign": "signo de milono de baza monunuo",
-"naira sign": "signo de ni\u011deria najro",
-"peseta sign": "signo de hispana peseto",
-"rupee sign": "signo de rupio",
-"won sign": "signo de koreia \u016dono",
-"new sheqel sign": "signo de israela siklo",
-"dong sign": "signo de vjetnama dongo",
-"kip sign": "signo de laosa kipo",
-"tugrik sign": "signo de mongola tugriko",
-"drachma sign": "signo de greka dra\u0125mo",
-"german penny symbol": "signo de pfenigo",
-"peso sign": "signo de peso",
-"guarani sign": "signo de paragvaja gvaranio",
-"austral sign": "signo de argentina a\u016dstralo",
-"hryvnia sign": "signo de ukrainia hrivno",
-"cedi sign": "signo de ganaa cedio",
-"livre tournois sign": "signo de pundo de Turo",
-"spesmilo sign": "signo de spesmilo",
-"tenge sign": "signo de kaza\u0125a tengo",
-"indian rupee sign": "signo de barata rupio",
-"turkish lira sign": "signo de turka liro",
-"nordic mark sign": "signo de marko",
-"manat sign": "signo de azerbaj\u011dana manato",
-"ruble sign": "signo de rusia rublo",
-"yen character": "signo de japana eno",
-"yuan character": "signo de \u0109ina renminbio",
-"yuan character, in hong kong and taiwan": "signo de juano, Hongkongo kaj Tajvano",
-"yen\/yuan character variant one": "alia varianto de signo de eno\/juano",
-"Loading emoticons...": "\u015cargado de mienvinjetoj",
-"Could not load emoticons": "Ne povas \u015dargi mienvinjetojn",
-"People": "Homoj",
-"Animals and Nature": "Bestoj kaj naturo",
-"Food and Drink": "Man\u011da\u0135o kaj trinka\u0135o",
-"Activity": "Aktiveco",
-"Travel and Places": "Voja\u011doj kaj lokoj",
-"Objects": "Objektoj",
-"Flags": "Flagoj",
-"Characters": "Simboloj",
-"Characters (no spaces)": "Simboloj (senspacetaj)",
-"{0} characters": "{0} signojn",
-"Error: Form submit field collision.": "Eraro: kolizio de kampoj dum sendado de formularo.",
-"Error: No form element found.": "Eraro: elementoj de formularo forestas",
-"Update": "\u011cisdatigi",
-"Color swatch": "Specimenaro de koloroj",
-"Turquoise": "Turkisa",
-"Green": "Verda",
-"Blue": "Blua",
-"Purple": "Purpura",
-"Navy Blue": "Helblua",
-"Dark Turquoise": "Malhela turkisa",
-"Dark Green": "Malhela verda",
-"Medium Blue": "Meza blua",
-"Medium Purple": "Meza purpla",
-"Midnight Blue": "Nigroblua",
-"Yellow": "Flava",
-"Orange": "Oran\u011da",
-"Red": "Ru\u011da",
-"Light Gray": "Helgriza",
-"Gray": "Griza",
-"Dark Yellow": "Malhela flava",
-"Dark Orange": "Malhela oran\u011da",
-"Dark Red": "Malhela ru\u011da",
-"Medium Gray": "Meza griza",
-"Dark Gray": "Malhela griza",
-"Light Green": "Helverda",
-"Light Yellow": "Helflava",
-"Light Red": "Helru\u011da",
-"Light Purple": "Helpurpura",
-"Light Blue": "Helblua",
-"Dark Purple": "Malhelpurpura",
-"Dark Blue": "Malhelblua",
-"Black": "Nigra",
-"White": "Blanka",
-"Switch to or from fullscreen mode": "Tra\u015dan\u011di tutekranan re\u011dimon",
-"Open help dialog": "Malfermi helpan dialogon",
-"history": "historio",
-"styles": "stilo",
-"formatting": "tekstaran\u011do",
-"alignment": "niveleco",
-"indentation": "krommar\u011deno",
-"permanent pen": "konstanta plumo",
-"comments": "komentoj",
-"Format Painter": "Formatelektilo",
-"Insert\/edit iframe": "Enmeti\/redakti enkonstruitan framon (iframe)",
-"Capitalization": "Komenci per majuskla",
-"lowercase": "minuskla",
-"UPPERCASE": "MAJUSKLA",
-"Title Case": "Uskleco de titolo",
-"Permanent Pen Properties": "Konstantaj ecoj de plumo",
-"Permanent pen properties...": "Konstantaj ecoj de plumo",
-"Font": "Tiparo",
-"Size": "Grando",
-"More...": "Pli...",
-"Spellcheck Language": "Lingvo por literumi",
-"Select...": "Elektu...",
-"Preferences": "Agordoj",
-"Yes": "Jes",
-"No": "Ne",
-"Keyboard Navigation": "Perklavara movi\u011dado",
-"Version": "Versio",
-"Anchor": "Ankro",
-"Special character": "Speciala karaktro",
-"Color": "Koloro",
-"Emoticons": "Emociikonoj",
-"Document properties": "Dokumentaj trajtoj",
-"Insert link": "Enmetu ligilon",
-"Target": "Celo",
-"Poster": "Afi\u015do",
-"Print": "Presu",
-"Whole words": "Tutaj vortoj",
-"Find and replace": "Trovi kaj anstata\u016digi",
-"Prev": "Anta\u016da",
-"Spellcheck": "Literumu",
-"Caption": "Cita\u0135o",
-"Insert template": "Enmetu \u015dablonon"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/es.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('es',{
-"Redo": "Rehacer",
-"Undo": "Deshacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Nuevo documento",
-"Ok": "Ok",
-"Cancel": "Cancelar",
-"Visual aids": "Ayudas visuales",
-"Bold": "Negrita",
-"Italic": "Cursiva",
-"Underline": "Subrayado",
-"Strikethrough": "Tachado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Limpiar formato",
-"Align left": "Alinear a la izquierda",
-"Align center": "Alinear al centro",
-"Align right": "Alinear a la derecha",
-"Justify": "Justificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Disminuir sangr\u00eda",
-"Increase indent": "Incrementar sangr\u00eda",
-"Close": "Cerrar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Su navegador no es compatible con el acceso directo al portapapeles. Use las teclas Crtl+X\/C\/V de su teclado.",
-"Headers": "Encabezados",
-"Header 1": "Encabezado 1",
-"Header 2": "Encabezado 2",
-"Header 3": "Encabezado 3",
-"Header 4": "Encabezado 4",
-"Header 5": "Encabezado 5",
-"Header 6": "Encabezado 6",
-"Headings": "Encabezados",
-"Heading 1": "Encabezado 1",
-"Heading 2": "Encabezado 2",
-"Heading 3": "Encabezado 3",
-"Heading 4": "Encabezado 4",
-"Heading 5": "Encabezado 5",
-"Heading 6": "Encabezado 6",
-"Preformatted": "Con formato previo",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "P\u00e1rrafo",
-"Blockquote": "Blockquote",
-"Inline": "Alineado",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Pegar est\u00e1 ahora en modo de texto plano. El contenido se pegar\u00e1 como texto plano hasta que desactive esta opci\u00f3n.",
-"Fonts": "Fuentes",
-"Font Sizes": "Tama\u00f1os de fuente",
-"Class": "Clase",
-"Browse for an image": "Buscar una imagen",
-"OR": "OR",
-"Drop an image here": "Arrastre una imagen aqu\u00ed",
-"Upload": "Cargar",
-"Block": "Bloque",
-"Align": "Alinear",
-"Default": "Por defecto",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Square": "Cuadrado",
-"Lower Alpha": "Inferior Alfa",
-"Lower Greek": "Inferior Griega",
-"Lower Roman": "Inferior Romana",
-"Upper Alpha": "Superior Alfa",
-"Upper Roman": "Superior Romana",
-"Anchor...": "Anclaje...",
-"Name": "Nombre",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Deber\u00eda comenzar por una letra, seguida solo de letras, n\u00fameros, guiones, puntos, dos puntos o guiones bajos.",
-"You have unsaved changes are you sure you want to navigate away?": "Tiene cambios sin guardar. \u00bfEst\u00e1 seguro de que quiere salir?",
-"Restore last draft": "Restaurar el \u00faltimo borrador",
-"Special character...": "Car\u00e1cter especial...",
-"Source code": "C\u00f3digo fuente",
-"Insert\/Edit code sample": "Insertar\/editar c\u00f3digo de prueba",
-"Language": "Idioma",
-"Code sample...": "Ejemplo de c\u00f3digo...",
-"Color Picker": "Selector de colores",
-"R": "R",
-"G": "V",
-"B": "A",
-"Left to right": "De izquierda a derecha",
-"Right to left": "De derecha a izquierda",
-"Emoticons...": "Emoticones...",
-"Metadata and Document Properties": "Metadatos y propiedades del documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descripci\u00f3n",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3n",
-"Shortcut": "Atajo",
-"Help": "Ayuda",
-"Address": "Direcci\u00f3n",
-"Focus to menubar": "Enfocar la barra del men\u00fa",
-"Focus to toolbar": "Enfocar la barra de herramientas",
-"Focus to element path": "Enfocar la ruta del elemento",
-"Focus to contextual toolbar": "Enfocar la barra de herramientas contextual",
-"Insert link (if link plugin activated)": "Insertar enlace (si el complemento de enlace est\u00e1 activado)",
-"Save (if save plugin activated)": "Guardar (si el componente de salvar est\u00e1 activado)",
-"Find (if searchreplace plugin activated)": "Buscar (si el complemento buscar-remplazar est\u00e1 activado)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Complementos premium:",
-"Learn more...": "Aprende m\u00e1s...",
-"You are using {0}": "Estas usando {0}",
-"Plugins": "Complementos",
-"Handy Shortcuts": "Accesos directos",
-"Horizontal line": "L\u00ednea horizontal",
-"Insert\/edit image": "Insertar\/editar imagen",
-"Image description": "Descripci\u00f3n de la imagen",
-"Source": "Enlace",
-"Dimensions": "Dimensiones",
-"Constrain proportions": "Restringir proporciones",
-"General": "General",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espacio vertical",
-"Horizontal space": "Espacio horizontal",
-"Border": "Borde",
-"Insert image": "Insertar imagen",
-"Image...": "Imagen...",
-"Image list": "Lista de im\u00e1genes",
-"Rotate counterclockwise": "Girar a la izquierda",
-"Rotate clockwise": "Girar a la derecha",
-"Flip vertically": "Invertir verticalmente",
-"Flip horizontally": "Invertir horizontalmente",
-"Edit image": "Editar imagen",
-"Image options": "Opciones de imagen",
-"Zoom in": "Acercar",
-"Zoom out": "Alejar",
-"Crop": "Recortar",
-"Resize": "Redimensionar",
-"Orientation": "Orientaci\u00f3n",
-"Brightness": "Brillo",
-"Sharpen": "Forma",
-"Contrast": "Contraste",
-"Color levels": "Niveles de color",
-"Gamma": "Gamma",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Atr\u00e1s",
-"Insert date\/time": "Insertar fecha\/hora",
-"Date\/time": "Fecha\/hora",
-"Insert\/Edit Link": "Insertar\/editar enlace",
-"Insert\/edit link": "Insertar\/editar enlace",
-"Text to display": "Texto para mostrar",
-"Url": "URL",
-"Open link in...": "Abrir enlace en...",
-"Current window": "Ventana actual",
-"None": "Ninguno",
-"New window": "Nueva ventana",
-"Remove link": "Quitar enlace",
-"Anchors": "Anclas",
-"Link...": "Enlace...",
-"Paste or type a link": "Pega o introduce un enlace",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "El enlace que has introducido no parece ser una direcci\u00f3n de correo electr\u00f3nico. Quieres a\u00f1adir el prefijo necesario mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "El enlace que has introducido no parece ser una enlace externo. Quieres a\u00f1adir el prefijo necesario http:\/\/ ?",
-"Link list": "Lista de enlaces",
-"Insert video": "Insertar video",
-"Insert\/edit video": "Insertar\/editar video",
-"Insert\/edit media": "Insertar\/editar medio",
-"Alternative source": "Enlace alternativo",
-"Alternative source URL": "Origen de URL alternativo",
-"Media poster (Image URL)": "P\u00f3ster de medio (URL de imagen)",
-"Paste your embed code below:": "Pega tu c\u00f3digo embebido debajo",
-"Embed": "Incrustado",
-"Media...": "Medios...",
-"Nonbreaking space": "Espacio fijo",
-"Page break": "Salto de p\u00e1gina",
-"Paste as text": "Pegar como texto",
-"Preview": "Previsualizar",
-"Print...": "Imprimir...",
-"Save": "Guardar",
-"Find": "Buscar",
-"Replace with": "Reemplazar con",
-"Replace": "Reemplazar",
-"Replace all": "Reemplazar todo",
-"Previous": "Anterior",
-"Next": "Siguiente",
-"Find and replace...": "Buscar y reemplazar...",
-"Could not find the specified string.": "No se encuentra la cadena de texto especificada",
-"Match case": "Coincidencia exacta",
-"Find whole words only": "Solo palabras completas",
-"Spell check": "Revisar ortograf\u00eda",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todos",
-"Finish": "Finalizar",
-"Add to Dictionary": "A\u00f1adir al Diccionario",
-"Insert table": "Insertar tabla",
-"Table properties": "Propiedades de la tabla",
-"Delete table": "Eliminar tabla",
-"Cell": "Celda",
-"Row": "Fila",
-"Column": "Columna",
-"Cell properties": "Propiedades de la celda",
-"Merge cells": "Combinar celdas",
-"Split cell": "Dividir celdas",
-"Insert row before": "Insertar fila antes",
-"Insert row after": "Insertar fila despu\u00e9s ",
-"Delete row": "Eliminar fila",
-"Row properties": "Propiedades de la fila",
-"Cut row": "Cortar fila",
-"Copy row": "Copiar fila",
-"Paste row before": "Pegar la fila antes",
-"Paste row after": "Pegar la fila despu\u00e9s",
-"Insert column before": "Insertar columna antes",
-"Insert column after": "Insertar columna despu\u00e9s",
-"Delete column": "Eliminar columna",
-"Cols": "Columnas",
-"Rows": "Filas",
-"Width": "Ancho",
-"Height": "Alto",
-"Cell spacing": "Espacio entre celdas",
-"Cell padding": "Relleno de celda",
-"Show caption": "Mostrar t\u00edtulo",
-"Left": "Izquierda",
-"Center": "Centrado",
-"Right": "Derecha",
-"Cell type": "Tipo de celda",
-"Scope": "\u00c1mbito",
-"Alignment": "Alineaci\u00f3n",
-"H Align": "Alineamiento Horizontal",
-"V Align": "Alineamiento Vertical",
-"Top": "Arriba",
-"Middle": "Centro",
-"Bottom": "Abajo",
-"Header cell": "Celda de la cebecera",
-"Row group": "Grupo de filas",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de fila",
-"Header": "Cabecera",
-"Body": "Cuerpo",
-"Footer": "Pie de p\u00e1gina",
-"Border color": "Color del borde",
-"Insert template...": "Insertar plantilla...",
-"Templates": "Plantillas",
-"Template": "Plantilla",
-"Text color": "Color del texto",
-"Background color": "Color de fondo",
-"Custom...": "Personalizar...",
-"Custom color": "Color personalizado",
-"No color": "Sin color",
-"Remove color": "Quitar color",
-"Table of Contents": "Tabla de contenidos",
-"Show blocks": "Mostrar bloques",
-"Show invisible characters": "Mostrar caracteres invisibles",
-"Word count": "Contar palabras",
-"Count": "Recuento",
-"Document": "Documento",
-"Selection": "Selecci\u00f3n",
-"Words": "Palabras",
-"Words: {0}": "Palabras: {0}",
-"{0} words": "{0} palabras",
-"File": "Archivo",
-"Edit": "Editar",
-"Insert": "Insertar",
-"View": "Ver",
-"Format": "Formato",
-"Table": "Tabla",
-"Tools": "Herramientas",
-"Powered by {0}": "Desarrollado por {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto enriquecido. Pulse ALT-F9 para el menu. Pulse ALT-F10 para la barra de herramientas. Pulse ALT-0 para ayuda",
-"Image title": "Titulo de imagen",
-"Border width": "Ancho de borde",
-"Border style": "Estilo de borde",
-"Error": "Error",
-"Warn": "Advertencia",
-"Valid": "V\u00e1lido",
-"To open the popup, press Shift+Enter": "Para abrir el elemento emergente, pulse May\u00fas+Intro",
-"Rich Text Area. Press ALT-0 for help.": "\u00c1rea de texto enriquecido. Pulse ALT-0 para abrir la ayuda.",
-"System Font": "Fuente de sistema",
-"Failed to upload image: {0}": "Fallo al cargar imagen: {0}",
-"Failed to load plugin: {0} from url {1}": "Fallo al cargar complemento: {0} desde URL {1}",
-"Failed to load plugin url: {0}": "Fallo al cargar URL del complemento: {0}",
-"Failed to initialize plugin: {0}": "Fallo al iniciar el complemento: {0}",
-"example": "ejemplo",
-"Search": "Buscar",
-"All": "Todo",
-"Currency": "Divisa",
-"Text": "Texto",
-"Quotations": "Comillas",
-"Mathematical": "S\u00edmbolo matem\u00e1tico",
-"Extended Latin": "Latino extendido A",
-"Symbols": "S\u00edmbolos",
-"Arrows": "Flechas",
-"User Defined": "Definido por el usuario",
-"dollar sign": "signo de d\u00f3lar",
-"currency sign": "signo de divisa",
-"euro-currency sign": "signo de euro",
-"colon sign": "signo de dos puntos",
-"cruzeiro sign": "signo de cruceiro",
-"french franc sign": "signo de franco franc\u00e9s",
-"lira sign": "signo de lira",
-"mill sign": "signo de mill",
-"naira sign": "signo de naira",
-"peseta sign": "signo de peseta",
-"rupee sign": "signo de rupia",
-"won sign": "signo de won",
-"new sheqel sign": "signo de nuevo s\u00e9quel",
-"dong sign": "signo de dong",
-"kip sign": "signo de kip",
-"tugrik sign": "signo de tugrik",
-"drachma sign": "signo de dracma",
-"german penny symbol": "signo de penique alem\u00e1n",
-"peso sign": "signo de peso",
-"guarani sign": "signo de guaran\u00ed",
-"austral sign": "signo de austral",
-"hryvnia sign": "signo de grivna",
-"cedi sign": "signo de cedi",
-"livre tournois sign": "signo de libra tornesa",
-"spesmilo sign": "signo de spesmilo",
-"tenge sign": "signo de tenge",
-"indian rupee sign": "signo de rupia india",
-"turkish lira sign": "signo de lira turca",
-"nordic mark sign": "signo de marco n\u00f3rdico",
-"manat sign": "signo de manat",
-"ruble sign": "signo de rublo",
-"yen character": "car\u00e1cter de yen",
-"yuan character": "car\u00e1cter de yuan",
-"yuan character, in hong kong and taiwan": "car\u00e1cter de yuan en Hong Kong y Taiw\u00e1n",
-"yen\/yuan character variant one": "Variante uno de car\u00e1cter de yen\/yuan",
-"Loading emoticons...": "Cargando emoticonos...",
-"Could not load emoticons": "No se han podido cargar los emoticonos",
-"People": "Personas",
-"Animals and Nature": "Animales y naturaleza",
-"Food and Drink": "Comida y bebida",
-"Activity": "Actividad",
-"Travel and Places": "Viajes y lugares",
-"Objects": "Objetos",
-"Flags": "Banderas",
-"Characters": "Caracteres",
-"Characters (no spaces)": "Caracteres (sin espacios)",
-"{0} characters": "{0} caracteres",
-"Error: Form submit field collision.": "Error: Colisi\u00f3n de campo al enviar formulario.",
-"Error: No form element found.": "Error: No se encuentra ning\u00fan elemento de formulario.",
-"Update": "Actualizar",
-"Color swatch": "Muestrario de colores",
-"Turquoise": "Turquesa",
-"Green": "Verde",
-"Blue": "Azul",
-"Purple": "P\u00farpura",
-"Navy Blue": "Azul marino",
-"Dark Turquoise": "Turquesa oscuro",
-"Dark Green": "Verde oscuro",
-"Medium Blue": "Azul medio",
-"Medium Purple": "P\u00farpura medio",
-"Midnight Blue": "Azul medio",
-"Yellow": "Amarillo",
-"Orange": "Naranja",
-"Red": "Rojo",
-"Light Gray": "Gris claro",
-"Gray": "Gris",
-"Dark Yellow": "Amarillo oscuro",
-"Dark Orange": "Naranja oscuro",
-"Dark Red": "Rojo oscuro",
-"Medium Gray": "Gris medio",
-"Dark Gray": "Gris oscuro",
-"Light Green": "Verde claro",
-"Light Yellow": "Amarillo claro",
-"Light Red": "Rojo claro",
-"Light Purple": "Morado claro",
-"Light Blue": "Azul claro",
-"Dark Purple": "Morado oscuro",
-"Dark Blue": "Azul oscuro",
-"Black": "Negro",
-"White": "Blanco",
-"Switch to or from fullscreen mode": "Activar o desactivar modo pantalla completa",
-"Open help dialog": "Abrir di\u00e1logo de ayuda",
-"history": "historial",
-"styles": "estilos",
-"formatting": "formato",
-"alignment": "alineaci\u00f3n",
-"indentation": "sangr\u00eda",
-"permanent pen": "bol\u00edgrafo permanente",
-"comments": "comentarios",
-"Format Painter": "Copiar formato",
-"Insert\/edit iframe": "Insertar\/editar iframe",
-"Capitalization": "Uso de may\u00fasculas",
-"lowercase": "min\u00fasculas",
-"UPPERCASE": "MAY\u00daSCULAS",
-"Title Case": "Tipo T\u00edtulo",
-"Permanent Pen Properties": "Propiedades del bol\u00edgrafo permanente",
-"Permanent pen properties...": "Propiedades del bol\u00edgrafo permanente...",
-"Font": "Fuente",
-"Size": "Tama\u00f1o",
-"More...": "M\u00e1s...",
-"Spellcheck Language": "Corrector",
-"Select...": "Seleccionar...",
-"Preferences": "Preferencias",
-"Yes": "S\u00ed",
-"No": "No",
-"Keyboard Navigation": "Navegaci\u00f3n con el teclado",
-"Version": "Versi\u00f3n",
-"Anchor": "Ancla",
-"Special character": "Car\u00e1cter especial",
-"Code sample": "Ejemplo de c\u00f3digo",
-"Color": "Color",
-"Emoticons": "Emoticonos",
-"Document properties": "Propiedades del documento",
-"Image": "Imagen",
-"Insert link": "Insertar enlace",
-"Target": "Destino",
-"Link": "Enlace",
-"Poster": "Miniatura",
-"Media": "Media",
-"Print": "Imprimir",
-"Prev": "Anterior",
-"Find and replace": "Buscar y reemplazar",
-"Whole words": "Palabras completas",
-"Spellcheck": "Corrector ortogr\u00e1fico",
-"Caption": "Subt\u00edtulo",
-"Insert template": "Insertar plantilla"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/es_419.js Added

@@ -0,0 +1,462 @@
+tinymce.addI18n('es_419',{
+"Redo": "Rehacer",
+"Undo": "Deshacer",
+"Cut": "Cortar",
+"Copy": "Copiar",
+"Paste": "Pegar",
+"Select all": "Seleccionar todo",
+"New document": "Nuevo documento",
+"Ok": "Ok",
+"Cancel": "Cancelar",
+"Visual aids": "Ayudas visuales",
+"Bold": "Negrita",
+"Italic": "Cursiva",
+"Underline": "Subrayado",
+"Strikethrough": "Tachado",
+"Superscript": "Super\u00edndice",
+"Subscript": "Sub\u00edndice",
+"Clear formatting": "Limpiar formato",
+"Align left": "Alinear a la izquierda",
+"Align center": "Centrar",
+"Align right": "Alinear a la derecha",
+"Justify": "Justificar",
+"Bullet list": "Lista de vi\u00f1etas",
+"Numbered list": "Lista numerada",
+"Decrease indent": "Disminuir sangr\u00eda",
+"Increase indent": "Aumentar sangr\u00eda",
+"Close": "Cerrar",
+"Formats": "Formatos",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tu navegador no soporta acceso directo al portapapeles. Favor usar los comandos de teclado Ctrl+X\/C\/V",
+"Headers": "Encabezados",
+"Header 1": "Encabezado 1",
+"Header 2": "Encabezado 2",
+"Header 3": "Encabezado 3",
+"Header 4": "Encabezado 4",
+"Header 5": "Encabezado 5",
+"Header 6": "Encabezado 6",
+"Headings": "T\u00edtulos",
+"Heading 1": "T\u00edtulo 1",
+"Heading 2": "T\u00edtulo 2",
+"Heading 3": "T\u00edtulo 3",
+"Heading 4": "T\u00edtulo 4",
+"Heading 5": "T\u00edtulo 5",
+"Heading 6": "T\u00edtulo 6",
+"Preformatted": "Preformateado",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "C\u00f3digo",
+"Paragraph": "P\u00e1rrafo",
+"Blockquote": "Cita",
+"Inline": "En l\u00ednea",
+"Blocks": "Bloques",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
+"Fonts": "Fonts",
+"Font Sizes": "Tama\u00f1os de Fuente",
+"Class": "Class",
+"Browse for an image": "Examinar imagen",
+"OR": "O",
+"Drop an image here": "Arrastrar imagen aqu\u00ed",
+"Upload": "Subir",
+"Block": "Bloque",
+"Align": "Alinear",
+"Default": "Default",
+"Circle": "Circle",
+"Disc": "Disc",
+"Square": "Square",
+"Lower Alpha": "Lower Alpha",
+"Lower Greek": "Lower Greek",
+"Lower Roman": "Lower Roman",
+"Upper Alpha": "Upper Alpha",
+"Upper Roman": "Upper Roman",
+"Anchor...": "Anchor...",
+"Name": "Name",
+"Id": "Id",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.",
+"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
+"Restore last draft": "Restore last draft",
+"Special character...": "Special character...",
+"Source code": "Source code",
+"Insert\/Edit code sample": "Insert\/Edit code sample",
+"Language": "Language",
+"Code sample...": "Code sample...",
+"Color Picker": "Color Picker",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "Left to right",
+"Right to left": "Right to left",
+"Emoticons": "Emoticons",
+"Emoticons...": "Emoticons...",
+"Metadata and Document Properties": "Metadata and Document Properties",
+"Title": "Title",
+"Keywords": "Keywords",
+"Description": "Description",
+"Robots": "Robots",
+"Author": "Author",
+"Encoding": "Encoding",
+"Fullscreen": "Fullscreen",
+"Action": "Action",
+"Shortcut": "Shortcut",
+"Help": "Help",
+"Address": "Address",
+"Focus to menubar": "Focus to menubar",
+"Focus to toolbar": "Focus to toolbar",
+"Focus to element path": "Focus to element path",
+"Focus to contextual toolbar": "Focus to contextual toolbar",
+"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
+"Save (if save plugin activated)": "Save (if save plugin activated)",
+"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
+"Plugins installed ({0}):": "Plugins installed ({0}):",
+"Premium plugins:": "Premium plugins:",
+"Learn more...": "Learn more...",
+"You are using {0}": "You are using {0}",
+"Plugins": "Plugins",
+"Handy Shortcuts": "Handy Shortcuts",
+"Horizontal line": "Horizontal line",
+"Insert\/edit image": "Insert\/edit image",
+"Alternative description": "Descripci\u00f3n alternativa",
+"Accessibility": "Accesibilidad",
+"Image is decorative": "La imagen es decorativa",
+"Source": "Source",
+"Dimensions": "Dimensions",
+"Constrain proportions": "Constrain proportions",
+"General": "General",
+"Advanced": "Advanced",
+"Style": "Style",
+"Vertical space": "Vertical space",
+"Horizontal space": "Horizontal space",
+"Border": "Border",
+"Insert image": "Insert image",
+"Image...": "Image...",
+"Image list": "Image list",
+"Rotate counterclockwise": "Rotate counterclockwise",
+"Rotate clockwise": "Rotate clockwise",
+"Flip vertically": "Flip vertically",
+"Flip horizontally": "Flip horizontally",
+"Edit image": "Edit image",
+"Image options": "Image options",
+"Zoom in": "Zoom in",
+"Zoom out": "Zoom out",
+"Crop": "Crop",
+"Resize": "Resize",
+"Orientation": "Orientation",
+"Brightness": "Brightness",
+"Sharpen": "Sharpen",
+"Contrast": "Contrast",
+"Color levels": "Color levels",
+"Gamma": "Gamma",
+"Invert": "Invert",
+"Apply": "Apply",
+"Back": "Back",
+"Insert date\/time": "Insert date\/time",
+"Date\/time": "Date\/time",
+"Insert\/edit link": "Insert\/edit link",
+"Text to display": "Text to display",
+"Url": "Url",
+"Open link in...": "Open link in...",
+"Current window": "Current window",
+"None": "None",
+"New window": "New window",
+"Open link": "Enlace abierto",
+"Remove link": "Remove link",
+"Anchors": "Anchors",
+"Link...": "Link...",
+"Paste or type a link": "Paste or type a link",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "La URL que ingres\u00f3 parece ser un enlace externo. \u00bfDesea agregar el prefijo https:\/\/ requerido?",
+"Link list": "Link list",
+"Insert video": "Insert video",
+"Insert\/edit video": "Insert\/edit video",
+"Insert\/edit media": "Insert\/edit media",
+"Alternative source": "Alternative source",
+"Alternative source URL": "Alternative source URL",
+"Media poster (Image URL)": "Media poster (Image URL)",
+"Paste your embed code below:": "Paste your embed code below:",
+"Embed": "Embed",
+"Media...": "Media...",
+"Nonbreaking space": "Nonbreaking space",
+"Page break": "Page break",
+"Paste as text": "Paste as text",
+"Preview": "Preview",
+"Print...": "Print...",
+"Save": "Save",
+"Find": "Find",
+"Replace with": "Replace with",
+"Replace": "Replace",
+"Replace all": "Replace all",
+"Previous": "Previous",
+"Next": "Next",
+"Find and Replace": "Encontrar y Reemplazar",
+"Find and replace...": "Find and replace...",
+"Could not find the specified string.": "Could not find the specified string.",
+"Match case": "Match case",
+"Find whole words only": "Find whole words only",
+"Find in selection": "Encontrar en la selecci\u00f3n",
+"Spellcheck": "Spellcheck",
+"Spellcheck Language": "Spellcheck Language",
+"No misspellings found.": "No se encontraron errores ortogr\u00e1ficos.",
+"Ignore": "Ignore",
+"Ignore all": "Ignore all",
+"Finish": "Finish",
+"Add to Dictionary": "Add to Dictionary",
+"Insert table": "Insert table",
+"Table properties": "Table properties",
+"Delete table": "Delete table",
+"Cell": "Cell",
+"Row": "Row",
+"Column": "Column",
+"Cell properties": "Cell properties",
+"Merge cells": "Merge cells",
+"Split cell": "Split cell",
+"Insert row before": "Insert row before",
+"Insert row after": "Insert row after",
+"Delete row": "Delete row",
+"Row properties": "Row properties",
+"Cut row": "Cut row",
+"Copy row": "Copy row",
+"Paste row before": "Paste row before",
+"Paste row after": "Paste row after",
+"Insert column before": "Insert column before",
+"Insert column after": "Insert column after",
+"Delete column": "Delete column",
+"Cols": "Cols",
+"Rows": "Rows",
+"Width": "Width",
+"Height": "Height",
+"Cell spacing": "Cell spacing",
+"Cell padding": "Cell padding",
+"Caption": "Caption",
+"Show caption": "Show caption",
+"Left": "Left",
+"Center": "Center",
+"Right": "Right",
+"Cell type": "Cell type",
+"Scope": "Scope",
+"Alignment": "Alignment",
+"H Align": "H Align",
+"V Align": "V Align",
+"Top": "Top",
+"Middle": "Middle",
+"Bottom": "Bottom",
+"Header cell": "Header cell",
+"Row group": "Row group",
+"Column group": "Column group",
+"Row type": "Row type",
+"Header": "Header",
+"Body": "Body",
+"Footer": "Footer",
+"Border color": "Border color",
+"Insert template...": "Insert template...",
+"Templates": "Templates",
+"Template": "Template",
+"Text color": "Text color",
+"Background color": "Background color",
+"Custom...": "Custom...",
+"Custom color": "Custom color",
+"No color": "No color",
+"Remove color": "Remove color",
+"Table of Contents": "Table of Contents",
+"Show blocks": "Show blocks",
+"Show invisible characters": "Show invisible characters",
+"Word count": "Word count",
+"Count": "Count",
+"Document": "Document",
+"Selection": "Selection",
+"Words": "Words",
+"Words: {0}": "Words: {0}",
+"{0} words": "{0} words",
+"File": "File",
+"Edit": "Edit",
+"Insert": "Insert",
+"View": "View",
+"Format": "Format",
+"Table": "Table",
+"Tools": "Tools",
+"Powered by {0}": "Powered by {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
+"Image title": "Image title",
+"Border width": "Border width",
+"Border style": "Border style",
+"Error": "Error",
+"Warn": "Warn",
+"Valid": "Valid",
+"To open the popup, press Shift+Enter": "To open the popup, press Shift+Enter",
+"Rich Text Area. Press ALT-0 for help.": "Rich Text Area. Press ALT-0 for help.",
+"System Font": "System Font",
+"Failed to upload image: {0}": "Failed to upload image: {0}",
+"Failed to load plugin: {0} from url {1}": "Failed to load plugin: {0} from url {1}",
+"Failed to load plugin url: {0}": "Failed to load plugin url: {0}",
+"Failed to initialize plugin: {0}": "Failed to initialize plugin: {0}",
+"example": "example",
+"Search": "Search",
+"All": "All",
+"Currency": "Currency",
+"Text": "Text",
+"Quotations": "Quotations",
+"Mathematical": "Mathematical",
+"Extended Latin": "Extended Latin",
+"Symbols": "Symbols",
+"Arrows": "Arrows",
+"User Defined": "User Defined",
+"dollar sign": "dollar sign",
+"currency sign": "currency sign",
+"euro-currency sign": "euro-currency sign",
+"colon sign": "colon sign",
+"cruzeiro sign": "cruzeiro sign",
+"french franc sign": "french franc sign",
+"lira sign": "lira sign",
+"mill sign": "mill sign",
+"naira sign": "naira sign",
+"peseta sign": "peseta sign",
+"rupee sign": "rupee sign",
+"won sign": "won sign",
+"new sheqel sign": "new sheqel sign",
+"dong sign": "dong sign",
+"kip sign": "kip sign",
+"tugrik sign": "tugrik sign",
+"drachma sign": "drachma sign",
+"german penny symbol": "german penny symbol",
+"peso sign": "peso sign",
+"guarani sign": "guarani sign",
+"austral sign": "austral sign",
+"hryvnia sign": "hryvnia sign",
+"cedi sign": "cedi sign",
+"livre tournois sign": "livre tournois sign",
+"spesmilo sign": "spesmilo sign",
+"tenge sign": "tenge sign",
+"indian rupee sign": "indian rupee sign",
+"turkish lira sign": "turkish lira sign",
+"nordic mark sign": "nordic mark sign",
+"manat sign": "manat sign",
+"ruble sign": "ruble sign",
+"yen character": "yen character",
+"yuan character": "yuan character",
+"yuan character, in hong kong and taiwan": "yuan character, in hong kong and taiwan",
+"yen\/yuan character variant one": "yen\/yuan character variant one",
+"Loading emoticons...": "Loading emoticons...",
+"Could not load emoticons": "Could not load emoticons",
+"People": "People",
+"Animals and Nature": "Animals and Nature",
+"Food and Drink": "Food and Drink",
+"Activity": "Activity",
+"Travel and Places": "Travel and Places",
+"Objects": "Objects",
+"Flags": "Flags",
+"Characters": "Characters",
+"Characters (no spaces)": "Characters (no spaces)",
+"{0} characters": "{0} characters",
+"Error: Form submit field collision.": "Error: Form submit field collision.",
+"Error: No form element found.": "Error: No form element found.",
+"Update": "Update",
+"Color swatch": "Color swatch",
+"Turquoise": "Turquoise",
+"Green": "Green",
+"Blue": "Blue",
+"Purple": "Purple",
+"Navy Blue": "Navy Blue",
+"Dark Turquoise": "Dark Turquoise",
+"Dark Green": "Dark Green",
+"Medium Blue": "Medium Blue",
+"Medium Purple": "Medium Purple",
+"Midnight Blue": "Midnight Blue",
+"Yellow": "Yellow",
+"Orange": "Orange",
+"Red": "Red",
+"Light Gray": "Light Gray",
+"Gray": "Gray",
+"Dark Yellow": "Dark Yellow",
+"Dark Orange": "Dark Orange",
+"Dark Red": "Dark Red",
+"Medium Gray": "Medium Gray",
+"Dark Gray": "Dark Gray",
+"Light Green": "Light Green",
+"Light Yellow": "Light Yellow",
+"Light Red": "Light Red",
+"Light Purple": "Light Purple",
+"Light Blue": "Light Blue",
+"Dark Purple": "Dark Purple",
+"Dark Blue": "Dark Blue",
+"Black": "Black",
+"White": "White",
+"Switch to or from fullscreen mode": "Switch to or from fullscreen mode",
+"Open help dialog": "Open help dialog",
+"history": "history",
+"styles": "styles",
+"formatting": "formatting",
+"alignment": "alignment",
+"indentation": "indentation",
+"Font": "Font",
+"Size": "Size",
+"More...": "More...",
+"Select...": "Select...",
+"Preferences": "Preferences",
+"Yes": "Yes",
+"No": "No",
+"Keyboard Navigation": "Keyboard Navigation",
+"Version": "Version",
+"Code view": "Vista de c\u00f3digo",
+"Open popup menu for split buttons": "Abrir men\u00fa emergente para botones divididos",
+"List Properties": "Propiedades de Lista",
+"List properties...": "Propiedades de lista...",
+"Start list at number": "Iniciar lista en el n\u00famero",
+"Line height": "Altura de la l\u00ednea",
+"comments": "comments",
+"Format Painter": "Format Painter",
+"Insert\/edit iframe": "Insert\/edit iframe",
+"Capitalization": "Capitalization",
+"lowercase": "lowercase",
+"UPPERCASE": "UPPERCASE",
+"Title Case": "Title Case",
+"permanent pen": "permanent pen",
+"Permanent Pen Properties": "Permanent Pen Properties",
+"Permanent pen properties...": "Permanent pen properties...",
+"case change": "Cambiar May\u00fasculas y Min\u00fasculas",
+"page embed": "p\u00e1gina incrustada",
+"Advanced sort...": "Orden avanzado...",
+"Advanced Sort": "Orden Avanzado",
+"Sort table by column ascending": "Ordenar tabla por columna ascendente",
+"Sort table by column descending": "Ordenar tabla por columna descendente",
+"Sort": "Ordenar",
+"Order": "Orden",
+"Sort by": "Ordenar por",
+"Ascending": "Ascendente",
+"Descending": "Descendiente",
+"Column {0}": "Columna {0}",
+"Row {0}": "Fila {0}",
+"Spellcheck...": "Corrector...",
+"Misspelled word": "Palabra mal escrita",
+"Suggestions": "Sugerencias",
+"Change": "Cambiar",
+"Finding word suggestions": "Encontrar sugerencias de palabras",
+"Success": "\u00c9xito",
+"Repair": "Reparar",
+"Issue {0} of {1}": "Problema {0} de {1}",
+"Images must be marked as decorative or have an alternative text description": "Las im\u00e1genes deben estar marcadas como decorativas o tener una descripci\u00f3n de texto alternativa",
+"Images must have an alternative text description. Decorative images are not allowed.": "Las im\u00e1genes deben tener una descripci\u00f3n de texto alternativa. No se permiten im\u00e1genes decorativas.",
+"Or provide alternative text:": "O proporcione texto alternativo:",
+"Make image decorative:": "Hacer la imagen decorativa:",
+"ID attribute must be unique": "El atributo de ID debe ser \u00fanico",
+"Make ID unique": "Hacer que ID sea \u00fanica",
+"Keep this ID and remove all others": "Conserve esta ID y elimine todas las dem\u00e1s",
+"Remove this ID": "Eliminar esta ID",
+"Remove all IDs": "Eliminar todos los ID",
+"Checklist": "Lista de Verificaci\u00f3n",
+"Anchor": "Anchor",
+"Special character": "Special character",
+"Code sample": "Code sample",
+"Color": "Color",
+"Document properties": "Document properties",
+"Image description": "Image description",
+"Image": "Image",
+"Insert link": "Insert link",
+"Target": "Target",
+"Link": "Link",
+"Poster": "Poster",
+"Media": "Media",
+"Print": "Print",
+"Prev": "Prev",
+"Find and replace": "Find and replace",
+"Whole words": "Whole words",
+"Insert template": "Insert template"
+});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/es_MX.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('es_MX',{
-"Redo": "Rehacer",
-"Undo": "Deshacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Nuevo documento",
-"Ok": "Aceptar",
-"Cancel": "Cancelar",
-"Visual aids": "Ayudas visuales",
-"Bold": "Negrita",
-"Italic": "Cursiva",
-"Underline": "Subrayado",
-"Strikethrough": "Tachado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Borrar formato",
-"Align left": "Alinear a la izquierda",
-"Align center": "Alinear al centro",
-"Align right": "Alinear a la derecha",
-"Justify": "Justificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Reducir sangr\u00eda",
-"Increase indent": "Aumentar sangr\u00eda",
-"Close": "Cerrar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Su navegador no admite el acceso directo al portapapeles. Utilice los m\u00e9todos abreviados de teclado Ctrl+ X\/C\/V.",
-"Headers": "Encabezados",
-"Header 1": "Encabezado 1",
-"Header 2": "Encabezado 2",
-"Header 3": "Encabezado 3",
-"Header 4": "Encabezado 4",
-"Header 5": "Encabezado 5",
-"Header 6": "Encabezado 6",
-"Headings": "T\u00edtulos",
-"Heading 1": "T\u00edtulo 1",
-"Heading 2": "T\u00edtulo 2",
-"Heading 3": "T\u00edtulo 3",
-"Heading 4": "T\u00edtulo 4",
-"Heading 5": "T\u00edtulo 5",
-"Heading 6": "T\u00edtulo 6",
-"Preformatted": "Con formato previo",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "P\u00e1rrafo",
-"Blockquote": "Blockquote",
-"Inline": "En l\u00ednea",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Se pegar\u00e1 en texto plano. El contenido se pegar\u00e1 como texto plano hasta que desactive esta opci\u00f3n.",
-"Fonts": "Fuentes",
-"Font Sizes": "Tama\u00f1os de fuente",
-"Class": "Clase",
-"Browse for an image": "Buscar una imagen",
-"OR": "O",
-"Drop an image here": "Soltar una imagen aqu\u00ed",
-"Upload": "Cargar",
-"Block": "Bloque",
-"Align": "Alinear",
-"Default": "Por defecto",
-"Circle": "Circulo",
-"Disc": "Disco",
-"Square": "Cuadro",
-"Lower Alpha": "Alfa min\u00fascula",
-"Lower Greek": "Griega min\u00fascula",
-"Lower Roman": "Romano min\u00fascula",
-"Upper Alpha": "Alfa may\u00fascula",
-"Upper Roman": "May\u00fascula Romana",
-"Anchor...": "Marcador...",
-"Name": "Nombre",
-"Id": "Identificador",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "El Identificador debe comenzar con una letra, seguido solo por letras, n\u00fameros, puntos, guiones medios o guiones bajos.  ",
-"You have unsaved changes are you sure you want to navigate away?": "No se  han guardado los cambios. \u00bfSeguro que desea abandonar la p\u00e1gina?",
-"Restore last draft": "Restaurar el \u00faltimo borrador",
-"Special character...": "Car\u00e1cter especial...",
-"Source code": "C\u00f3digo fuente",
-"Insert\/Edit code sample": "Insertar\/Editar c\u00f3digo muestra",
-"Language": "idioma",
-"Code sample...": "Ejemplo de c\u00f3digo...",
-"Color Picker": "Selector de colores",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Izquierda a derecha",
-"Right to left": "Derecha a Izquierda",
-"Emoticons...": "Emoticonos...",
-"Metadata and Document Properties": "Metadatos y propiedades del documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descripci\u00f3n ",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3n",
-"Shortcut": "Atajo",
-"Help": "Ayuda",
-"Address": "Direcci\u00f3n",
-"Focus to menubar": "Enfocar en barra de menu",
-"Focus to toolbar": "Enfocar en barra de herramientas",
-"Focus to element path": "Enfocar ruta del elemento",
-"Focus to contextual toolbar": "Enfocar en barra de herramientas contextual",
-"Insert link (if link plugin activated)": "Insertar enlace (si enlace del plugin est\u00e1 activo)",
-"Save (if save plugin activated)": "Guardar (si el plugin guardar est\u00e1 activo)",
-"Find (if searchreplace plugin activated)": "Buscar (si el plugin buscar\/reemplazar est\u00e1 activo)",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Plugins premium:",
-"Learn more...": "Aprende m\u00e1s...",
-"You are using {0}": "est\u00e1s usando {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Atajos \u00fatiles",
-"Horizontal line": "L\u00ednea Horizontal",
-"Insert\/edit image": "Insertar\/editar imagen",
-"Image description": "Descripci\u00f3n de imagen",
-"Source": "Origen",
-"Dimensions": "Dimensiones",
-"Constrain proportions": "Restringir proporciones",
-"General": "General",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espacio vertical",
-"Horizontal space": "Espacio horizontal",
-"Border": "Borde",
-"Insert image": "Insertar imagen",
-"Image...": "Imagen...",
-"Image list": "Lista de im\u00e1genes",
-"Rotate counterclockwise": "Rotar en sentido contrario a las manecillas",
-"Rotate clockwise": "Rotar en sentido de las manecillas",
-"Flip vertically": "Voltear verticalmente",
-"Flip horizontally": "Volter horizontalmente",
-"Edit image": "Editar imagen",
-"Image options": "Opciones de la imagen",
-"Zoom in": "Acercar",
-"Zoom out": "Alejar",
-"Crop": "Recortar",
-"Resize": "Cambiar tama\u00f1o",
-"Orientation": "Orientaci\u00f3n",
-"Brightness": "Brillo",
-"Sharpen": "Nitidez",
-"Contrast": "Contraste",
-"Color levels": "Niveles de Color",
-"Gamma": "Gamma",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Regresar",
-"Insert date\/time": "Insertar fecha\/hora",
-"Date\/time": "Fecha\/hora",
-"Insert\/Edit Link": "Insertar\/editar v\u00ednculo",
-"Insert\/edit link": "Inserta\/editar enlace",
-"Text to display": "Texto a mostrar",
-"Url": "Url",
-"Open link in...": "Abrir v\u00ednculo en...",
-"Current window": "Ventana actual",
-"None": "Ninguno",
-"New window": "Nueva ventana",
-"Remove link": "Eliminar elnace",
-"Anchors": "Anclas",
-"Link...": "V\u00ednculo...",
-"Paste or type a link": "Pega o escribe un enlace",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "El URL que ha insertado tiene formato de correo electr\u00f3nico. \u00bfDesea agregar con prefijo \"mailto:\"?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "El URL que ha ingresado es un enlace externo. \u00bfDesea agregar el prefijo \"http:\/\/\"?",
-"Link list": "Lista de enlaces",
-"Insert video": "Insertar video",
-"Insert\/edit video": "Insertar\/editar video",
-"Insert\/edit media": "Insertar\/editar multimedia",
-"Alternative source": "Fuente alternativa",
-"Alternative source URL": "URL de origen alternativo",
-"Media poster (Image URL)": "P\u00f3ster multimedia (URL de la imagen)",
-"Paste your embed code below:": "Pegue su c\u00f3digo de inserci\u00f3n abajo:",
-"Embed": "Incrustar",
-"Media...": "Elemento multimedia...",
-"Nonbreaking space": "Espacio de no separaci\u00f3n",
-"Page break": "Salto de p\u00e1gina ",
-"Paste as text": "Copiar como texto",
-"Preview": "Vista previa ",
-"Print...": "Imprimir...",
-"Save": "Guardar",
-"Find": "Buscar",
-"Replace with": "Remplazar con",
-"Replace": "Remplazar",
-"Replace all": "Remplazar todo",
-"Previous": "Anterior",
-"Next": "Siguiente",
-"Find and replace...": "Buscar y reemplazar...",
-"Could not find the specified string.": "No se ha encontrado la cadena especificada.",
-"Match case": "Coincidencia",
-"Find whole words only": "Buscar solo palabras completas",
-"Spell check": "Corrector ortogr\u00e1fico",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todo",
-"Finish": "Terminar",
-"Add to Dictionary": "Agregar al diccionario ",
-"Insert table": "Insertar tabla",
-"Table properties": "Propiedades de tabla",
-"Delete table": "Eliminar tabla",
-"Cell": "Celda",
-"Row": "Rengl\u00f3n ",
-"Column": "Columna",
-"Cell properties": "Propiedades de celda",
-"Merge cells": "Unir celdas",
-"Split cell": "Dividir celdas",
-"Insert row before": "Insertar rengl\u00f3n antes",
-"Insert row after": "Insertar rengl\u00f3n despu\u00e9s",
-"Delete row": "Eliminar rengl\u00f3n ",
-"Row properties": "Propiedades del rengl\u00f3n ",
-"Cut row": "Cortar renglon",
-"Copy row": "Copiar rengl\u00f3n ",
-"Paste row before": "Pegar rengl\u00f3n antes",
-"Paste row after": "Pegar rengl\u00f3n despu\u00e9s",
-"Insert column before": "Insertar columna antes",
-"Insert column after": "Insertar columna despu\u00e9s",
-"Delete column": "Eliminar columna",
-"Cols": "Columnas",
-"Rows": "Renglones ",
-"Width": "Ancho",
-"Height": "Alto",
-"Cell spacing": "Espacio entre celdas",
-"Cell padding": "Relleno de la celda",
-"Show caption": "Mostrar leyenda",
-"Left": "Izquierda",
-"Center": "Centro",
-"Right": "Derecha",
-"Cell type": "Tipo de celda",
-"Scope": "Alcance",
-"Alignment": "Alineaci\u00f3n ",
-"H Align": "Alineaci\u00f3n Horizontal",
-"V Align": "Alineaci\u00f3n Vertical",
-"Top": "Arriba",
-"Middle": "Centrado",
-"Bottom": "Abajo",
-"Header cell": "Celda de encabezado",
-"Row group": "Grupo de renglones",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de rengl\u00f3n ",
-"Header": "Encabezado",
-"Body": "Cuerpo",
-"Footer": "Pie",
-"Border color": "Color del borde",
-"Insert template...": "Insertar plantilla...",
-"Templates": "Plantilla",
-"Template": "Plantilla",
-"Text color": "Color de letra",
-"Background color": "Color de fondo",
-"Custom...": "Personalizar",
-"Custom color": "Perzonalizar color",
-"No color": "Sin color",
-"Remove color": "Eliminar color",
-"Table of Contents": "Tabla de Contenidos",
-"Show blocks": "Mostrar bloques",
-"Show invisible characters": "Mostrar caracteres invisibles",
-"Word count": "Contar palabras",
-"Count": "Recuento",
-"Document": "Documento",
-"Selection": "Selecci\u00f3n",
-"Words": "Palabras",
-"Words: {0}": "Palabras:{0}",
-"{0} words": "{0} palabras",
-"File": "Archivo",
-"Edit": "Editar",
-"Insert": "Insertar",
-"View": "Vistas",
-"Format": "Formato",
-"Table": "Tabla",
-"Tools": "Herramientas",
-"Powered by {0}": "Creado con {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Presione dentro del \u00e1rea de texto ALT-F9 para invocar el men\u00fa, ALT-F10 para la barra de herramientas y ALT-0 para la ayuda.",
-"Image title": "T\u00edtulo de la imagen",
-"Border width": "Ancho del borde",
-"Border style": "Estilo del borde",
-"Error": "Error",
-"Warn": "Advertencia",
-"Valid": "V\u00e1lido",
-"To open the popup, press Shift+Enter": "Para abrir la ventana emergente, pulse May\u00fas+Intro",
-"Rich Text Area. Press ALT-0 for help.": "\u00c1rea de texto enriquecido. Pulse ALT-0 para obtener ayuda.",
-"System Font": "Fuente del sistema",
-"Failed to upload image: {0}": "Error al cargar la imagen: {0}",
-"Failed to load plugin: {0} from url {1}": "Error al cargar el complemento: {0} desde la url {1}",
-"Failed to load plugin url: {0}": "Error al cargar la url del complemento: {0}",
-"Failed to initialize plugin: {0}": "Error al inicializar el complemento: {0}",
-"example": "ejemplo",
-"Search": "Buscar",
-"All": "Todo",
-"Currency": "Moneda",
-"Text": "Texto",
-"Quotations": "Comillas",
-"Mathematical": "Matem\u00e1ticos",
-"Extended Latin": "Lat\u00edn extendido",
-"Symbols": "S\u00edmbolos",
-"Arrows": "Flechas",
-"User Defined": "Definido por el usuario",
-"dollar sign": "signo de d\u00f3lar",
-"currency sign": "signo de moneda",
-"euro-currency sign": "signo de euro",
-"colon sign": "signo del col\u00f3n",
-"cruzeiro sign": "signo del cruzeiro",
-"french franc sign": "signo del franco franc\u00e9s",
-"lira sign": "signo de la lira",
-"mill sign": "signo de mil",
-"naira sign": "signo del naira",
-"peseta sign": "signo de la peseta",
-"rupee sign": "signo de la rupia",
-"won sign": "signo del won",
-"new sheqel sign": "signo de nuevo shequel",
-"dong sign": "signo del dong",
-"kip sign": "signo del kip",
-"tugrik sign": "signo del tugrik",
-"drachma sign": "signo del dracma",
-"german penny symbol": "signo del penique alem\u00e1n",
-"peso sign": "signo del peso",
-"guarani sign": "signo del guaran\u00ed",
-"austral sign": "signo del austral",
-"hryvnia sign": "signo de hryvnia",
-"cedi sign": "signo de cedi",
-"livre tournois sign": "signo de livre tournois",
-"spesmilo sign": "signo de spesmilo",
-"tenge sign": "signo de tenge",
-"indian rupee sign": "signo de la rupia india",
-"turkish lira sign": "signo de la lira turca",
-"nordic mark sign": "signo del marco n\u00f3rdico",
-"manat sign": "signo de manat",
-"ruble sign": "signo de rublo",
-"yen character": "car\u00e1cter del yen",
-"yuan character": "car\u00e1cter del yuan",
-"yuan character, in hong kong and taiwan": "car\u00e1cter del yuan, en Hong Kong y Taiw\u00e1n",
-"yen\/yuan character variant one": "variante uno del car\u00e1cter del yen\/yuan",
-"Loading emoticons...": "Cargando emoticonos...",
-"Could not load emoticons": "No se pudieron cargar los emoticonos",
-"People": "Personas",
-"Animals and Nature": "Animales y naturaleza",
-"Food and Drink": "Comida y bebida",
-"Activity": "Actividad",
-"Travel and Places": "Viajes y lugares",
-"Objects": "Objetos",
-"Flags": "Banderas",
-"Characters": "Caracteres",
-"Characters (no spaces)": "Caracteres (sin espacios)",
-"{0} characters": "{0} caracteres",
-"Error: Form submit field collision.": "Error: colisi\u00f3n de campo env\u00edo de formulario.",
-"Error: No form element found.": "Error: no se encontr\u00f3 ning\u00fan elemento de formulario.",
-"Update": "Actualizar",
-"Color swatch": "Muestrario de colores",
-"Turquoise": "Turquesa",
-"Green": "Verde",
-"Blue": "Azul",
-"Purple": "Morado",
-"Navy Blue": "Azul marino",
-"Dark Turquoise": "Turquesa oscuro",
-"Dark Green": "Verde oscuro",
-"Medium Blue": "Azul medio",
-"Medium Purple": "Morado medio",
-"Midnight Blue": "Azul noche",
-"Yellow": "Amarillo",
-"Orange": "Anaranjado",
-"Red": "Rojo",
-"Light Gray": "Gris claro",
-"Gray": "Gris",
-"Dark Yellow": "Amarillo oscuro",
-"Dark Orange": "Anaranjado oscuro",
-"Dark Red": "Rojo oscuro",
-"Medium Gray": "Gris medio",
-"Dark Gray": "Gris oscuro",
-"Light Green": "Verde claro",
-"Light Yellow": "Amarillo claro",
-"Light Red": "Rojo claro",
-"Light Purple": "Morado claro",
-"Light Blue": "Azul claro",
-"Dark Purple": "Morado oscuro",
-"Dark Blue": "Azul oscuro",
-"Black": "Negro",
-"White": "Blanco",
-"Switch to or from fullscreen mode": "Cambiar a modo de pantalla completa o salir de \u00e9l",
-"Open help dialog": "Abrir di\u00e1logo de ayuda",
-"history": "historial",
-"styles": "estilos",
-"formatting": "formato",
-"alignment": "alineaci\u00f3n",
-"indentation": "sangr\u00eda",
-"permanent pen": "l\u00e1piz permanente",
-"comments": "comentarios",
-"Format Painter": "Copiar formato",
-"Insert\/edit iframe": "Insertar\/editar marco flotante",
-"Capitalization": "Uso de may\u00fasculas",
-"lowercase": "min\u00fascula",
-"UPPERCASE": "MAY\u00daSCULA",
-"Title Case": "Tipo t\u00edtulo",
-"Permanent Pen Properties": "Propiedades del l\u00e1piz permanente",
-"Permanent pen properties...": "Propiedades del l\u00e1piz permanente...",
-"Font": "Fuente",
-"Size": "Tama\u00f1o",
-"More...": "M\u00e1s...",
-"Spellcheck Language": "Idioma de la revisi\u00f3n ortogr\u00e1fica",
-"Select...": "Seleccionar...",
-"Preferences": "Preferencias",
-"Yes": "S\u00ed",
-"No": "No",
-"Keyboard Navigation": "Navegaci\u00f3n con el teclado",
-"Version": "Versi\u00f3n",
-"Anchor": "Anclar",
-"Special character": "Caracter especial",
-"Code sample": "C\u00f3digo muestra",
-"Color": "Color",
-"Emoticons": "Emoticones",
-"Document properties": "Propiedades del documento",
-"Image": "Imagen",
-"Insert link": "Insertar enlace",
-"Target": "Objetivo",
-"Link": "Enlace",
-"Poster": "Cartel",
-"Media": "Multimedia",
-"Print": "Imprimir",
-"Prev": "Anterior",
-"Find and replace": "Buscar y reemplazar",
-"Whole words": "Palabras completas",
-"Spellcheck": "Revisi\u00f3n ortogr\u00e1fica",
-"Caption": "Subt\u00edtulo",
-"Insert template": "Insertar plantilla"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/et.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('et',{
-"Redo": "Tee uuesti",
-"Undo": "V\u00f5ta tagasi",
-"Cut": "L\u00f5ika",
-"Copy": "Kopeeri",
-"Paste": "Kleebi",
-"Select all": "Vali k\u00f5ik",
-"New document": "Uus dokument",
-"Ok": "Ok",
-"Cancel": "Katkesta",
-"Visual aids": "N\u00e4itevahendid",
-"Bold": "Rasvane",
-"Italic": "Kaldkiri",
-"Underline": "Allakriipsutatud",
-"Strikethrough": "L\u00e4bikriipsutatud",
-"Superscript": "\u00dclaindeks",
-"Subscript": "Alaindeks",
-"Clear formatting": "Puhasta vorming",
-"Align left": "Joonda vasakule",
-"Align center": "Joonda keskele",
-"Align right": "Joonda paremale",
-"Justify": "Joonda r\u00f6\u00f6pselt",
-"Bullet list": "J\u00e4rjestamata loend",
-"Numbered list": "J\u00e4rjestatud loend",
-"Decrease indent": "V\u00e4henda taanet",
-"Increase indent": "Suurenda taanet",
-"Close": "Sulge",
-"Formats": "Vormingud",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Sinu veebilehitseja ei toeta otsest ligip\u00e4\u00e4su l\u00f5ikelauale. Palun kasuta selle asemel klaviatuuri kiirk\u00e4sklusi Ctrl+X\/C\/V.",
-"Headers": "P\u00e4ised",
-"Header 1": "Pealkiri 1",
-"Header 2": "Pealkiri 2",
-"Header 3": "Pealkiri 3",
-"Header 4": "Pealkiri 4",
-"Header 5": "Pealkiri 5",
-"Header 6": "Pealkiri 6",
-"Headings": "Pealkirjad",
-"Heading 1": "Pealkiri 1",
-"Heading 2": "Pealkiri 2",
-"Heading 3": "Pealkiri 3",
-"Heading 4": "Pealkiri 4",
-"Heading 5": "Pealkiri 5",
-"Heading 6": "Pealkiri 6",
-"Preformatted": "Eelvormindaud",
-"Div": "Sektsioon",
-"Pre": "Eelvormindatud",
-"Code": "Kood",
-"Paragraph": "L\u00f5ik",
-"Blockquote": "Plokktsitaat",
-"Inline": "Reasisene",
-"Blocks": "Plokid",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Asetamine on n\u00fc\u00fcd tekstire\u017eiimis. Sisu asetatakse n\u00fc\u00fcd lihttekstina, kuni sa l\u00fclitad selle valiku v\u00e4lja.",
-"Fonts": "Fondid",
-"Font Sizes": "Kirja suurused",
-"Class": "Klass",
-"Browse for an image": "Sirvi pilte",
-"OR": "V\u00d5I",
-"Drop an image here": "Kukuta pilt siia",
-"Upload": "\u00dcles laadimine",
-"Block": "Plokk",
-"Align": "Joonda",
-"Default": "Vaikimisi",
-"Circle": "Ring",
-"Disc": "Ketas",
-"Square": "Ruut",
-"Lower Alpha": "V\u00e4iket\u00e4hed (a, b, c)",
-"Lower Greek": "Kreeka v\u00e4iket\u00e4hed (\u03b1, \u03b2, \u03b3)",
-"Lower Roman": "Rooma v\u00e4iket\u00e4hed (i, ii, iii)",
-"Upper Alpha": "Suurt\u00e4hed (A, B, C)",
-"Upper Roman": "Rooma suurt\u00e4hed (I, II, III)",
-"Anchor...": "Ankur ...",
-"Name": "Nimi",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID peaks algama t\u00e4hega ning sellele peaks j\u00e4rgnema ainult t\u00e4hed, arvud, sidekriipsud, punktid, koolonid v\u00f5i alakriipsud.",
-"You have unsaved changes are you sure you want to navigate away?": "Sul on salvestamata muudatusi. Oled Sa kindel, et soovid mujale navigeeruda?",
-"Restore last draft": "Taasta viimane mustand",
-"Special character...": "Eriline tegelane ...",
-"Source code": "L\u00e4htekood",
-"Insert\/Edit code sample": "Sisesta\/muuda koodin\u00e4idis",
-"Language": "Keel",
-"Code sample...": "Koodin\u00e4ide ...",
-"Color Picker": "V\u00e4rvivalija",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Vasakult paremale",
-"Right to left": "Paremalt vasakule",
-"Emoticons...": "Emotikonid ...",
-"Metadata and Document Properties": "Metaandmed ja dokumendi atribuudid",
-"Title": "Pealkiri",
-"Keywords": "M\u00e4rks\u00f5nad",
-"Description": "Kirjeldus",
-"Robots": "Robotid",
-"Author": "Autor",
-"Encoding": "M\u00e4rgistik",
-"Fullscreen": "T\u00e4isekraan",
-"Action": "Tegevus",
-"Shortcut": "Otsetee",
-"Help": "Abiinfo",
-"Address": "Aadress",
-"Focus to menubar": "Fookus men\u00fc\u00fcribale",
-"Focus to toolbar": "Fookus t\u00f6\u00f6riistaribale",
-"Focus to element path": "Fookus elemendi asukohale",
-"Focus to contextual toolbar": "Fookus kontekstimen\u00fc\u00fcle",
-"Insert link (if link plugin activated)": "Sisesta link (kui lingi plugin on aktiveeritud)",
-"Save (if save plugin activated)": "Salvesta (kui salvestamise plugin on aktiveeritud)",
-"Find (if searchreplace plugin activated)": "Otsi (kui plugin searchreplace on aktiveeritud)",
-"Plugins installed ({0}):": "Pluginad on paigaldatud ({0}):",
-"Premium plugins:": "Tasulised pluginad:",
-"Learn more...": "Vaata lisainfot...",
-"You are using {0}": "Sa kasutad {0}",
-"Plugins": "Pluginad",
-"Handy Shortcuts": "Mugavad otseteed",
-"Horizontal line": "Horisontaaljoon",
-"Insert\/edit image": "Lisa\/muuda pilt",
-"Image description": "Pildi kirjeldus",
-"Source": "Allikas",
-"Dimensions": "M\u00f5\u00f5tmed",
-"Constrain proportions": "S\u00e4ilita kuvasuhe",
-"General": "\u00dcldine",
-"Advanced": "T\u00e4iendavad seaded",
-"Style": "Stiil",
-"Vertical space": "P\u00fcstine vahe",
-"Horizontal space": "Reavahe",
-"Border": "\u00c4\u00e4ris",
-"Insert image": "Lisa pilt",
-"Image...": "Pilt ...",
-"Image list": "Piltide nimekiri",
-"Rotate counterclockwise": "P\u00f6\u00f6ra vastup\u00e4eva",
-"Rotate clockwise": "P\u00f6\u00f6ra p\u00e4rip\u00e4eva",
-"Flip vertically": "Peegelda vertikaalselt",
-"Flip horizontally": "Peegelda horisontaalselt",
-"Edit image": "Muuda pilti",
-"Image options": "Pildi valikud",
-"Zoom in": "Suumi sisse",
-"Zoom out": "Suumi v\u00e4lja",
-"Crop": "L\u00f5ika",
-"Resize": "Muuda suurust",
-"Orientation": "Suund",
-"Brightness": "Heledus",
-"Sharpen": "Teravamaks",
-"Contrast": "Kontrast",
-"Color levels": "V\u00e4rvi tasemed",
-"Gamma": "Gamma",
-"Invert": "P\u00f6\u00f6ra v\u00e4rvid",
-"Apply": "Rakenda",
-"Back": "Tagasi",
-"Insert date\/time": "Lisa kuup\u00e4ev\/kellaaeg",
-"Date\/time": "Kuup\u00e4ev\/kellaaeg",
-"Insert\/Edit Link": "Lingi lisamine \/ muutmine",
-"Insert\/edit link": "Lisa\/muuda link",
-"Text to display": "Kuvatav tekst",
-"Url": "Viide (url)",
-"Open link in...": "Ava link saidil ...",
-"Current window": "Praegune aken",
-"None": "Puudub",
-"New window": "Uus aken",
-"Remove link": "Eemalda link",
-"Anchors": "Ankrud",
-"Link...": "Link...",
-"Paste or type a link": "Aseta v\u00f5i sisesta link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, mille sa sisestasid, n\u00e4ib olevat e-posti aadress. Kas sa soovid lisada sellele eesliite mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL, mille sa sisestasid, n\u00e4ib olevat v\u00e4line link. Kas sa soovid lisada sellele eesliite http:\/\/ ?",
-"Link list": "Linkide nimekiri",
-"Insert video": "Lisa video",
-"Insert\/edit video": "Lisa\/muuda video",
-"Insert\/edit media": "Lisa\/muuda multimeediat",
-"Alternative source": "Teine allikas",
-"Alternative source URL": "Alternatiivne allika URL",
-"Media poster (Image URL)": "Meediaplakat (pildi URL)",
-"Paste your embed code below:": "Kleebi oma manustamiskood siia alla:",
-"Embed": "Manusta",
-"Media...": "Meedia ...",
-"Nonbreaking space": "T\u00fchim\u00e4rk (nbsp)",
-"Page break": "Lehevahetus",
-"Paste as text": "Aseta tekstina",
-"Preview": "Eelvaade",
-"Print...": "Prindi ...",
-"Save": "Salvesta",
-"Find": "Otsi",
-"Replace with": "Asendus",
-"Replace": "Asenda",
-"Replace all": "Asenda k\u00f5ik",
-"Previous": "Eelmine",
-"Next": "J\u00e4rg",
-"Find and replace...": "Leidke ja asendage ...",
-"Could not find the specified string.": "Ei suutnud leida etteantud s\u00f5net.",
-"Match case": "Erista suur- ja v\u00e4iket\u00e4hti",
-"Find whole words only": "Leidke ainult terved s\u00f5nad",
-"Spell check": "\u00d5igekirja kontroll",
-"Ignore": "Eira",
-"Ignore all": "Eira k\u00f5iki",
-"Finish": "L\u00f5peta",
-"Add to Dictionary": "Lisa s\u00f5naraamatusse",
-"Insert table": "Lisa tabel",
-"Table properties": "Tabeli omadused",
-"Delete table": "Kustuta tabel",
-"Cell": "Lahter",
-"Row": "Rida",
-"Column": "Tulp",
-"Cell properties": "Lahtri omadused",
-"Merge cells": "\u00dchenda lahtrid",
-"Split cell": "T\u00fckelda lahter",
-"Insert row before": "Lisa rida enne",
-"Insert row after": "Lisa rida j\u00e4rele",
-"Delete row": "Kustuta rida",
-"Row properties": "Rea omadused",
-"Cut row": "L\u00f5ika rida",
-"Copy row": "Kopeeri rida",
-"Paste row before": "Kleebi rida enne",
-"Paste row after": "Kleebi rida j\u00e4rele",
-"Insert column before": "Lisa tulp enne",
-"Insert column after": "Lisa tulp j\u00e4rele",
-"Delete column": "Kustuta tulp",
-"Cols": "Veerud",
-"Rows": "Read",
-"Width": "Laius",
-"Height": "K\u00f5rgus",
-"Cell spacing": "Lahtrivahe",
-"Cell padding": "Lahtri sisu ja tabeli \u00e4\u00e4rise vahe",
-"Show caption": "Kuva pealdis",
-"Left": "Vasakul",
-"Center": "Keskel",
-"Right": "Paremal",
-"Cell type": "Lahtri t\u00fc\u00fcp",
-"Scope": "Ulatus",
-"Alignment": "Joondus",
-"H Align": "H Joondus",
-"V Align": "V Joondus",
-"Top": "\u00dcleval",
-"Middle": "Keskel",
-"Bottom": "All",
-"Header cell": "P\u00e4islahter",
-"Row group": "Ridade r\u00fchm",
-"Column group": "Veergude r\u00fchm",
-"Row type": "Rea t\u00fc\u00fcp",
-"Header": "P\u00e4is",
-"Body": "P\u00f5hiosa",
-"Footer": "Jalus",
-"Border color": "Piirjoone v\u00e4rv",
-"Insert template...": "Sisesta mall ...",
-"Templates": "Mallid",
-"Template": "Mall",
-"Text color": "Teksti v\u00e4rv",
-"Background color": "Tausta v\u00e4rv",
-"Custom...": "Kohandatud...",
-"Custom color": "Kohandatud v\u00e4rv",
-"No color": "V\u00e4rvi pole",
-"Remove color": "Eemaldage v\u00e4rv",
-"Table of Contents": "Sisukord",
-"Show blocks": "N\u00e4ita plokke",
-"Show invisible characters": "N\u00e4ita peidetud m\u00e4rke",
-"Word count": "S\u00f5nade arv",
-"Count": "Krahv",
-"Document": "Dokument",
-"Selection": "Valik",
-"Words": "S\u00f5nad",
-"Words: {0}": "S\u00f5nu: {0}",
-"{0} words": "{0} s\u00f5na",
-"File": "Fail",
-"Edit": "Muuda",
-"Insert": "Sisesta",
-"View": "Vaade",
-"Format": "Vorming",
-"Table": "Tabel",
-"Tools": "T\u00f6\u00f6riistad",
-"Powered by {0}": "Kasutatud tarkvara {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastatud teksti ala. Men\u00fc\u00fc jaoks vajuta ALT-F9. T\u00f6\u00f6riistariba jaoks vajuta ALT-F10. Abi saamiseks vajuta ALT-0.",
-"Image title": "Pildi pealkiri",
-"Border width": "\u00c4\u00e4rise laius",
-"Border style": "Piiri stiil",
-"Error": "Viga",
-"Warn": "Hoiatage",
-"Valid": "Kehtib",
-"To open the popup, press Shift+Enter": "H\u00fcpikakna avamiseks vajutage t\u00f5stuklahvi + sisestusklahvi",
-"Rich Text Area. Press ALT-0 for help.": "Rikasteksti ala. Abi saamiseks vajutage ALT-0.",
-"System Font": "S\u00fcsteemi font",
-"Failed to upload image: {0}": "Pildi \u00fcleslaadimine eba\u00f5nnestus: {0}",
-"Failed to load plugin: {0} from url {1}": "Pistikprogrammi laadimine nurjus: {0} URL-ist {1}",
-"Failed to load plugin url: {0}": "Pistikprogrammi URL-i laadimine nurjus: {0}",
-"Failed to initialize plugin: {0}": "Pistikprogrammi l\u00e4htestamine eba\u00f5nnestus: {0}",
-"example": "n\u00e4ide",
-"Search": "Otsing",
-"All": "K\u00f5ik",
-"Currency": "Valuuta",
-"Text": "Tekst",
-"Quotations": "Tsitaadid",
-"Mathematical": "Matemaatiline",
-"Extended Latin": "Laiendatud ladina keel",
-"Symbols": "S\u00fcmbolid",
-"Arrows": "Nooled",
-"User Defined": "Kasutaja m\u00e4\u00e4ratud",
-"dollar sign": "dollari m\u00e4rk",
-"currency sign": "v\u00e4\u00e4ringu m\u00e4rk",
-"euro-currency sign": "euro v\u00e4\u00e4ringu m\u00e4rk",
-"colon sign": "j\u00e4mesoole m\u00e4rk",
-"cruzeiro sign": "cruzeiro m\u00e4rk",
-"french franc sign": "Prantsuse frangi m\u00e4rk",
-"lira sign": "liiri m\u00e4rk",
-"mill sign": "veskim\u00e4rk",
-"naira sign": "naira m\u00e4rk",
-"peseta sign": "peseta m\u00e4rk",
-"rupee sign": "ruupia m\u00e4rk",
-"won sign": "v\u00f5itis m\u00e4rgi",
-"new sheqel sign": "uus \u0161ekeli m\u00e4rk",
-"dong sign": "dongi m\u00e4rk",
-"kip sign": "kip m\u00e4rk",
-"tugrik sign": "tugriku m\u00e4rk",
-"drachma sign": "drahmam\u00e4rk",
-"german penny symbol": "saksa senti s\u00fcmbol",
-"peso sign": "peeso m\u00e4rk",
-"guarani sign": "guarani m\u00e4rk",
-"austral sign": "austraalne m\u00e4rk",
-"hryvnia sign": "grivna m\u00e4rk",
-"cedi sign": "cedi m\u00e4rk",
-"livre tournois sign": "elav turniiri m\u00e4rk",
-"spesmilo sign": "spesmilo m\u00e4rk",
-"tenge sign": "tenge m\u00e4rk",
-"indian rupee sign": "India ruupia m\u00e4rk",
-"turkish lira sign": "t\u00fcrgi liiri m\u00e4rk",
-"nordic mark sign": "p\u00f5hjam\u00e4rgi m\u00e4rk",
-"manat sign": "manati m\u00e4rk",
-"ruble sign": "rubla m\u00e4rk",
-"yen character": "jeeni tegelaskuju",
-"yuan character": "j\u00fcaani tegelaskuju",
-"yuan character, in hong kong and taiwan": "j\u00fcaani tegelane, Hongkongis ja Taiwanis",
-"yen\/yuan character variant one": "jeeni \/ j\u00fcaani t\u00e4hem\u00e4rgi variant \u00fcks",
-"Loading emoticons...": "Emotikonide laadimine ...",
-"Could not load emoticons": "Emotikonide laadimine nurjus",
-"People": "Inimesed",
-"Animals and Nature": "Loomad ja loodus",
-"Food and Drink": "Toit ja jook",
-"Activity": "Tegevus",
-"Travel and Places": "Reisimine ja kohad",
-"Objects": "Objektid",
-"Flags": "Lipud",
-"Characters": "Tegelased",
-"Characters (no spaces)": "M\u00e4rgid (t\u00fchikud puuduvad)",
-"{0} characters": "{0} t\u00e4hem\u00e4rki",
-"Error: Form submit field collision.": "Viga: vormi esitamise v\u00e4lja kokkup\u00f5rge.",
-"Error: No form element found.": "Viga: vormielementi ei leitud.",
-"Update": "Uuenda",
-"Color swatch": "V\u00e4rvivalik",
-"Turquoise": "T\u00fcrkiis",
-"Green": "Roheline",
-"Blue": "Sinine",
-"Purple": "Lilla",
-"Navy Blue": "Merev\u00e4e sinine",
-"Dark Turquoise": "Tume t\u00fcrkiissinine",
-"Dark Green": "Tumeroheline",
-"Medium Blue": "Keskmine sinine",
-"Medium Purple": "Keskmine lilla",
-"Midnight Blue": "Kesk\u00f6ine sinine",
-"Yellow": "Kollane",
-"Orange": "Oran\u017e",
-"Red": "Punane",
-"Light Gray": "Helehall",
-"Gray": "Hall",
-"Dark Yellow": "Tumekollane",
-"Dark Orange": "Tumeoran\u017e",
-"Dark Red": "Tumepunane",
-"Medium Gray": "Keskmiselt hall",
-"Dark Gray": "Tumehall",
-"Light Green": "Heleroheline",
-"Light Yellow": "Helekollane",
-"Light Red": "Helepunane",
-"Light Purple": "Helelilla",
-"Light Blue": "Helesinine",
-"Dark Purple": "Tumelilla",
-"Dark Blue": "Tumesinine",
-"Black": "Must",
-"White": "Valge",
-"Switch to or from fullscreen mode": "L\u00fclitumine t\u00e4isekraanre\u017eiimile v\u00f5i sellest v\u00e4lja",
-"Open help dialog": "Ava dialoog",
-"history": "ajalugu",
-"styles": "stiilid",
-"formatting": "vormindamine",
-"alignment": "joondamine",
-"indentation": "taane",
-"permanent pen": "p\u00fcsiv pliiats",
-"comments": "kommentaare",
-"Format Painter": "Format Painter",
-"Insert\/edit iframe": "Sisesta \/ redigeeri iframe",
-"Capitalization": "Suurt\u00e4htede kasutamine",
-"lowercase": "v\u00e4iket\u00e4hed",
-"UPPERCASE": "\u00dcLEMINEK",
-"Title Case": "Pealkirja juhtum",
-"Permanent Pen Properties": "P\u00fcsivad pliiatsi omadused",
-"Permanent pen properties...": "Pliiatsi p\u00fcsivad omadused ...",
-"Font": "Font",
-"Size": "Suurus",
-"More...": "Veel ...",
-"Spellcheck Language": "\u00d5igekirjakontroll",
-"Select...": "Valige ...",
-"Preferences": "Eelistused",
-"Yes": "Jah",
-"No": "Ei",
-"Keyboard Navigation": "Klaviatuuril navigeerimine",
-"Version": "Versioon",
-"Anchor": "Ankur",
-"Special character": "Erim\u00e4rk",
-"Code sample": "Koodi n\u00e4idis",
-"Color": "V\u00e4rv",
-"Emoticons": "Emotikonid",
-"Document properties": "Dokumendi omadused",
-"Image": "Pilt",
-"Insert link": "Lisa link",
-"Target": "Sihtm\u00e4rk",
-"Link": "Link",
-"Poster": "Lisaja",
-"Media": "Multimeedia",
-"Print": "Tr\u00fcki",
-"Prev": "Eelm",
-"Find and replace": "Otsi ja asenda",
-"Whole words": "Terviks\u00f5nad",
-"Spellcheck": "\u00d5igekirja kontroll",
-"Caption": "Alapealkiri",
-"Insert template": "Lisa mall"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/eu.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('eu',{
-"Redo": "Berregin",
-"Undo": "Desegin",
-"Cut": "Ebaki",
-"Copy": "Kopiatu",
-"Paste": "Itsatsi",
-"Select all": "Hautatu dena",
-"New document": "Dokumentu berria",
-"Ok": "Ondo",
-"Cancel": "Ezeztatu",
-"Visual aids": "Laguntza bisualak",
-"Bold": "Lodia",
-"Italic": "Etzana",
-"Underline": "Azpimarratua",
-"Strikethrough": "Marratua",
-"Superscript": "Goi-indizea",
-"Subscript": "Azpiindizea",
-"Clear formatting": "Ezabatu formatua",
-"Align left": "Lerrokatu ezkerrean",
-"Align center": "Lerrokatu erdian",
-"Align right": "Lerrokatu eskuinean",
-"Justify": "Justifikatuta",
-"Bullet list": "Bulet zerrenda",
-"Numbered list": "Zenbaki-zerrenda",
-"Decrease indent": "Txikitu koska",
-"Increase indent": "Handitu koska",
-"Close": "Itxi",
-"Formats": "Formatuak",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Zure nabigatzaileak ez du arbela zuzenean erabiltzeko euskarririk. Mesedez erabili CTRL+X\/C\/V teklatuko lasterbideak.",
-"Headers": "Goiburuak",
-"Header 1": "1. goiburua",
-"Header 2": "2. goiburua",
-"Header 3": "3. goiburua",
-"Header 4": "4. goiburua",
-"Header 5": "5. goiburua",
-"Header 6": "6. goiburua",
-"Headings": "Izenburuak",
-"Heading 1": "1. izenburua",
-"Heading 2": "2. izenburua",
-"Heading 3": "3. izenburua",
-"Heading 4": "4. izenburua",
-"Heading 5": "5. izenburua",
-"Heading 6": "6. izenburua",
-"Preformatted": "Aurreformateatuta",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kodea",
-"Paragraph": "Paragrafoa",
-"Blockquote": "Blockquote",
-"Inline": "Txertatuta",
-"Blocks": "Blokeak",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Itsatsi testu arrunt moduan dago orain. Edukiak testu arruntak bezala itsatsiko dira aukera hau itzaltzen duzunera arte.",
-"Fonts": "Letra-motak",
-"Font Sizes": "Letra-tamainak",
-"Class": "Klasea",
-"Browse for an image": "Irudia arakatu",
-"OR": "EDO",
-"Drop an image here": "Irudia hona ekarri",
-"Upload": "Kargatu",
-"Block": "Blokea",
-"Align": "Lerrokatu",
-"Default": "Lehenetstia",
-"Circle": "Zirkulua",
-"Disc": "Diskoa",
-"Square": "Karratua",
-"Lower Alpha": "Behe alfa",
-"Lower Greek": "Behe grekoa",
-"Lower Roman": "Behe erromatarra",
-"Upper Alpha": "Goi alfa",
-"Upper Roman": "Goi erromatarra",
-"Anchor...": "Aingura...",
-"Name": "Izena",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Ida hizki batekin hasi behar da, jarraian hizkiak, zenbakiak, gidoiak, puntuak, bi-puntu edo azpiko marrak bakarrik izan ditzake.",
-"You have unsaved changes are you sure you want to navigate away?": "Gorde gabeko aldaketak dituzu, zihur zaude hemendik irten nahi duzula?",
-"Restore last draft": "Leheneratu azken zirriborroa",
-"Special character...": "Karaktere bereziak...",
-"Source code": "Iturburu-kodea",
-"Insert\/Edit code sample": "Txertatu\/editatu kode adibidea",
-"Language": "Hizkuntza",
-"Code sample...": "Kode adibidea...",
-"Color Picker": "Kolore-hautatzailea",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Ezkerretik eskuinera",
-"Right to left": "Eskuinetik ezkerrera",
-"Emoticons...": "Emotikonoak...",
-"Metadata and Document Properties": "Metadatuak eta dokumentuaren propietateak",
-"Title": "Titulua",
-"Keywords": "Hitz gakoak",
-"Description": "Deskribapena",
-"Robots": "Robotak",
-"Author": "Egilea",
-"Encoding": "Encoding",
-"Fullscreen": "Pantaila osoa",
-"Action": "Akzioa",
-"Shortcut": "Laster tekla",
-"Help": "Laguntza",
-"Address": "Helbidea",
-"Focus to menubar": "Fokoa menu-barrara eraman",
-"Focus to toolbar": "Fokoa tresna-barrara eraman",
-"Focus to element path": "Fokoa elementuaren bidera eraman",
-"Focus to contextual toolbar": "Fokoa kontestuko tresna-barrara eraman",
-"Insert link (if link plugin activated)": "Lotura txertatu (lotura plugina aktibatuta badago)",
-"Save (if save plugin activated)": "Gorde (gordetzeko plugina aktibatuta badago)",
-"Find (if searchreplace plugin activated)": "Bilatu (bilatuordezkatu plugina instalatuta badago)",
-"Plugins installed ({0}):": "Instalatutako pluginak ({0}):",
-"Premium plugins:": "Premium pluginak:",
-"Learn more...": "Gehiago ikasi...",
-"You are using {0}": "{0} erabiltzen ari zara",
-"Plugins": "Pluginak",
-"Handy Shortcuts": "Laster-tekla erabilgarriak",
-"Horizontal line": "Marra horizontala",
-"Insert\/edit image": "Irudia txertatu\/editatu",
-"Image description": "Irudiaren deskribapena",
-"Source": "Iturburua",
-"Dimensions": "Neurriak",
-"Constrain proportions": "Zerraditu proportzioak",
-"General": "Orokorra",
-"Advanced": "Aurreratua",
-"Style": "Estiloa",
-"Vertical space": "Hutsune bertikala",
-"Horizontal space": "Hutsune horizontala",
-"Border": "Ertza",
-"Insert image": "Irudia txertatu",
-"Image...": "Irudia...",
-"Image list": "Irudi zerrenda",
-"Rotate counterclockwise": "Erlojuaren aurkako eran biratu",
-"Rotate clockwise": "Erlojuaren eran biratu",
-"Flip vertically": "Bertikalki irauli",
-"Flip horizontally": "Horizontalki irauli",
-"Edit image": "Irudia editatu",
-"Image options": "Irudiaren aukerak",
-"Zoom in": "Zooma handiagotu",
-"Zoom out": "Zooma txikiagotu",
-"Crop": "Moztu",
-"Resize": "Tamaina aldatu",
-"Orientation": "Orientazioa",
-"Brightness": "Distira",
-"Sharpen": "Zorroztu",
-"Contrast": "Kontrastatu",
-"Color levels": "Kolore mailak",
-"Gamma": "Gamma",
-"Invert": "Biratu",
-"Apply": "Gorde",
-"Back": "Atzera",
-"Insert date\/time": "Data\/ordua txertatu",
-"Date\/time": "Data\/ordua",
-"Insert\/Edit Link": "Lotura txertatu\/aldatu...",
-"Insert\/edit link": "Esteka txertatu\/editatu",
-"Text to display": "Bistaratzeko testua",
-"Url": "Url",
-"Open link in...": "Lotura hemen ireki...",
-"Current window": "Leiho hau",
-"None": "Bat ere ez",
-"New window": "Lehio berria",
-"Remove link": "Kendu esteka",
-"Anchors": "Estekak",
-"Link...": "Esteka...",
-"Paste or type a link": "Itsatsu edo idatzi lotura",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Sartu duzun URL-ak e-posta helbidea dela dirudi. Nahi duzu dagokion mailto: aurrizkia gehitzea?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Sartu duzun URL-ak kanpoko esteka dela dirudi. Nahi duzu dagokion http:\/\/ aurrizkia gehitzea?",
-"Link list": "Loturen zerrenda",
-"Insert video": "Bideoa txertatu",
-"Insert\/edit video": "Bideoa txertatu\/editatu",
-"Insert\/edit media": "Media txertatu\/editatu",
-"Alternative source": "Iturburu alternatiboa",
-"Alternative source URL": "Ordezko jatorri URL-a",
-"Media poster (Image URL)": "Media posterra (irudiaren URL-a)",
-"Paste your embed code below:": "Itsatsi hemen zure enkapsulatzeko kodea:",
-"Embed": "Kapsulatu",
-"Media...": "Multimedia...",
-"Nonbreaking space": "Zuriune zatiezina",
-"Page break": "Orrialde-jauzia",
-"Paste as text": "Itsatsi testu bezala",
-"Preview": "Aurrebista",
-"Print...": "Inprimatu...",
-"Save": "Gorde",
-"Find": "Bilatu",
-"Replace with": "Honekin ordeztu",
-"Replace": "Ordeztu",
-"Replace all": "Ordeztu dena",
-"Previous": "Aurrekoa",
-"Next": "Hurrengoa",
-"Find and replace...": "Bilatu eta ordezkatu...",
-"Could not find the specified string.": "Ezin izan da zehaztutako katea aurkitu.",
-"Match case": "Maiuskula\/minuskula",
-"Find whole words only": "Hitz osoak bakarrik bilatu",
-"Spell check": "Hizkuntza zuzenketa",
-"Ignore": "Ez ikusi",
-"Ignore all": "Ez ikusi guztia",
-"Finish": "Amaitu",
-"Add to Dictionary": "Hiztegira gehitu",
-"Insert table": "Txertatu taula",
-"Table properties": "Taularen propietateak",
-"Delete table": "Taula ezabatu",
-"Cell": "Gelaxka",
-"Row": "Errenkada",
-"Column": "Zutabea",
-"Cell properties": "Gelaxkaren propietateak",
-"Merge cells": "Batu gelaxkak",
-"Split cell": "Banatu gelaxkak",
-"Insert row before": "Txertatu errenkada aurretik",
-"Insert row after": "Txertatu errenkada ostean",
-"Delete row": "Ezabatu errenkada",
-"Row properties": "Errenkadaren propietateak",
-"Cut row": "Ebaki errenkada",
-"Copy row": "Kopiatu errenkada",
-"Paste row before": "Itsatsi errenkada aurretik",
-"Paste row after": "Itsatsi errenkada ostean",
-"Insert column before": "Txertatu zutabe aurretik",
-"Insert column after": "Txertatu zutabea ostean",
-"Delete column": "Ezabatu zutabea",
-"Cols": "Zutabeak",
-"Rows": "Errenkadak",
-"Width": "Zabalera",
-"Height": "Altuera",
-"Cell spacing": "Gelaxka arteko tartea",
-"Cell padding": "Gelaxken betegarria",
-"Show caption": "Erakutsi irudi-oina erakutsi",
-"Left": "Ezkerra",
-"Center": "Erdia",
-"Right": "Eskuina",
-"Cell type": "Gelaxka mota",
-"Scope": "Esparrua",
-"Alignment": "Lerrokatzea",
-"H Align": "Lerrokatze horizontala",
-"V Align": "Lerrokatze bertikala",
-"Top": "Goian",
-"Middle": "Erdian",
-"Bottom": "Behean",
-"Header cell": "Goiburuko gelaxka",
-"Row group": "Lerro taldea",
-"Column group": "Zutabe taldea",
-"Row type": "Lerro mota",
-"Header": "Goiburua",
-"Body": "Gorputza",
-"Footer": "Oina",
-"Border color": "Inguruko marraren kolorea",
-"Insert template...": "Txantiloia txertatu...",
-"Templates": "Txantiloiak",
-"Template": "Txantiloia",
-"Text color": "Testuaren kolorea",
-"Background color": "Atzeko kolorea",
-"Custom...": "Pertsonalizatu",
-"Custom color": "Pertsonalizatutako kolorea",
-"No color": "Kolorerik ez",
-"Remove color": "Kendu kolorea",
-"Table of Contents": "Edukien taula",
-"Show blocks": "Erakutsi blokeak",
-"Show invisible characters": "Erakutsi karaktere izkutuak",
-"Word count": "Hizki-kontaketa",
-"Count": "Zenbatu",
-"Document": "Dokumentua",
-"Selection": "Aukera",
-"Words": "Hitzak",
-"Words: {0}": "Hitzak: {0}",
-"{0} words": "{0} hitz",
-"File": "Fitxategia",
-"Edit": "Editatu",
-"Insert": "Sartu",
-"View": "Ikusi",
-"Format": "Formatua",
-"Table": "Taula",
-"Tools": "Tresnak",
-"Powered by {0}": "{0}rekin egina",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Testu aberastuko area. Sakatu ALT-F9 menurako. Sakatu ALT-F10 tresna-barrarako. Sakatu ALT-0 laguntzarako",
-"Image title": "Irudiaren izenburua",
-"Border width": "Ertzaren zabalera",
-"Border style": "Ertzaren estiloa",
-"Error": "Errorea",
-"Warn": "Oharra",
-"Valid": "Zuzena",
-"To open the popup, press Shift+Enter": "Leiho berria irekitzeko, sakatu Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Testu aberastuko area. Sakatu ALT-0 laguntza lortzeko.",
-"System Font": "Sistemaren letra-mota",
-"Failed to upload image: {0}": "Errorea gertatu da irudia igotzean: {0}",
-"Failed to load plugin: {0} from url {1}": "Errorea gertatu da {0} plugina kargatzean {1} url-tik",
-"Failed to load plugin url: {0}": "Errorea gertatu da pluginaren url-a kargatzean: {0}",
-"Failed to initialize plugin: {0}": "Errorea gertatu da plugina hasieratzean: {0}",
-"example": "adibidea",
-"Search": "Bilatu",
-"All": "Guztiak",
-"Currency": "Moneta",
-"Text": "Testua",
-"Quotations": "Aipuak",
-"Mathematical": "Matematika",
-"Extended Latin": "Latin zabaldua",
-"Symbols": "Ikurrak",
-"Arrows": "Geziak",
-"User Defined": "Erabiltzaileak definitutakoak",
-"dollar sign": "dolarraren ikurra",
-"currency sign": "monetaren ikurra",
-"euro-currency sign": "euroaren ikurra",
-"colon sign": "bi puntuen ikurra",
-"cruzeiro sign": "cruzeiroaren ikurra",
-"french franc sign": "libera frantsesaren ikurra",
-"lira sign": "liraren ikurra",
-"mill sign": "millaren ikurra",
-"naira sign": "naira ikurra",
-"peseta sign": "pezetaren ikurra",
-"rupee sign": "rupiaren ikurra",
-"won sign": "wonaren ikurra",
-"new sheqel sign": "sheqel berriaren ikurra",
-"dong sign": "dongaren ikurra",
-"kip sign": "kiparen ikurra",
-"tugrik sign": "tugrikaren ikurra",
-"drachma sign": "drakmaren ikurra",
-"german penny symbol": "alemaniako peniaren ikurra",
-"peso sign": "pesoaren ikurra",
-"guarani sign": "guaraniaren ikurra",
-"austral sign": "australaren ikurra",
-"hryvnia sign": "hryvniaren ikurra",
-"cedi sign": "cediaren ikurra",
-"livre tournois sign": "libre tournoisaren ikurra",
-"spesmilo sign": "spesmiloaren ikurra",
-"tenge sign": "tengearen ikurra",
-"indian rupee sign": "indiako rupiaren ikurra",
-"turkish lira sign": "lira turkiarraren ikurra",
-"nordic mark sign": "iparraldeko markoaren ikurra",
-"manat sign": "manataren ikurra",
-"ruble sign": "rubloaren ikurra",
-"yen character": "yenaren karakterea",
-"yuan character": "yuanaren karakterea",
-"yuan character, in hong kong and taiwan": "yuanaren karakterea, hong kong eta taiwanen",
-"yen\/yuan character variant one": "yen\/yuan karakterearen 1go bariantea",
-"Loading emoticons...": "Emotikonoak kargatzen...",
-"Could not load emoticons": "Ezin izan dira emotikonoak kargatu",
-"People": "Jendea",
-"Animals and Nature": "Animaliak eta natura",
-"Food and Drink": "Janari eta edaria",
-"Activity": "Ekintzak",
-"Travel and Places": "Bidaiak eta lekuak",
-"Objects": "Objektuak",
-"Flags": "Banderak",
-"Characters": "Karaktereak",
-"Characters (no spaces)": "Karaktereak (espaziorik gabe)",
-"{0} characters": "{0} karaktere",
-"Error: Form submit field collision.": "Errorea: formularioaren eremuetan talka gertatu da.",
-"Error: No form element found.": "Errorea: ez da formularioa aurkitu.",
-"Update": "Eguneratu",
-"Color swatch": "Koloreak",
-"Turquoise": "Turkesa",
-"Green": "Berdea",
-"Blue": "Urdina",
-"Purple": "Morea",
-"Navy Blue": "Itsas-urdina",
-"Dark Turquoise": "Turkesa iluna",
-"Dark Green": "Berde iluna",
-"Medium Blue": "Tarteko urdina",
-"Medium Purple": "Tarteko morea",
-"Midnight Blue": "Gauerdiko urdina",
-"Yellow": "Horia",
-"Orange": "Laranja",
-"Red": "Gorria",
-"Light Gray": "Gris argia",
-"Gray": "Grisa",
-"Dark Yellow": "Hori iluna",
-"Dark Orange": "Laranja iluna",
-"Dark Red": "Gorri iluna",
-"Medium Gray": "Tarteko grisa",
-"Dark Gray": "Gris iluna",
-"Light Green": "Berde argia",
-"Light Yellow": "Hori argia",
-"Light Red": "Gorri argia",
-"Light Purple": "More argia",
-"Light Blue": "Urdin argia",
-"Dark Purple": "More iluna",
-"Dark Blue": "Urdin iluna",
-"Black": "Beltza",
-"White": "Zuria",
-"Switch to or from fullscreen mode": "Pantaila osoko modura joan edo handik itzuli",
-"Open help dialog": "Laguntza elkarrizketa ireki",
-"history": "historia",
-"styles": "estiloak",
-"formatting": "formatua",
-"alignment": "lerrokatzea",
-"indentation": "koska",
-"permanent pen": "boligrafo iraunkorra",
-"comments": "iruzkinak",
-"Format Painter": "Formatua kopiatu",
-"Insert\/edit iframe": "Txertatu\/editatu bideoa",
-"Capitalization": "Letra larriak",
-"lowercase": "Letra xeheak",
-"UPPERCASE": "Maiuskula",
-"Title Case": "Izenburu kasua",
-"Permanent Pen Properties": "Boligrafo iraunkorraren ezaugarriak",
-"Permanent pen properties...": "Boligrafo iraunkorraren ezaugarriak...",
-"Font": "Letra-motak",
-"Size": "Tamaina",
-"More...": "Gehiago...",
-"Spellcheck Language": "Zuzenketa ortografikoaren hizkuntza",
-"Select...": "Aukeratu...",
-"Preferences": "Lehentasunak",
-"Yes": "Bai",
-"No": "Ez",
-"Keyboard Navigation": "Teklatuaren nabigazioa",
-"Version": "Bertsioa",
-"Anchor": "Esteka",
-"Special character": "Karaktere bereziak",
-"Code sample": "Kode adibidea",
-"Color": "Kolorea",
-"Emoticons": "Irrifartxoak",
-"Document properties": "Dokumentuaren propietateak",
-"Image": "Irudia",
-"Insert link": "Esteka txertatu",
-"Target": "Target",
-"Link": "Lotura",
-"Poster": "Poster-a",
-"Media": "Media",
-"Print": "Inprimatu",
-"Prev": "Aurrekoa",
-"Find and replace": "Bilatu eta ordeztu",
-"Whole words": "hitz osoak",
-"Spellcheck": "Egiaztapenak",
-"Caption": "Epigrafea",
-"Insert template": "Txertatu txantiloia"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/fa_IR.js Deleted

@@ -1,420 +0,0 @@
-tinymce.addI18n('fa_IR',{
-"Redo": "\u0628\u0627\u0632\u0627\u0646\u062c\u0627\u0645",
-"Undo": "\u0648\u0627\u06af\u0631\u062f",
-"Cut": "\u0628\u0631\u0634",
-"Copy": "\u06a9\u067e\u06cc",
-"Paste": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646",
-"Select all": "\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0645\u0647",
-"New document": "\u0633\u0646\u062f \u062c\u062f\u06cc\u062f",
-"Ok": "\u062a\u0623\u06cc\u06cc\u062f",
-"Cancel": "\u0644\u063a\u0648",
-"Visual aids": "\u06a9\u0645\u06a9\u200c\u0647\u0627\u06cc \u0628\u0635\u0631\u06cc",
-"Bold": "\u067e\u0631\u0631\u0646\u06af",
-"Italic": "\u06a9\u062c",
-"Underline": "\u0632\u06cc\u0631 \u062e\u0637 \u062f\u0627\u0631",
-"Strikethrough": "\u062e\u0637 \u0632\u062f\u0646",
-"Superscript": "\u0628\u0627\u0644\u0627\u0646\u06af\u0627\u0634\u062a",
-"Subscript": "\u0632\u06cc\u0631\u0646\u06af\u0627\u0634\u062a",
-"Clear formatting": "\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc",
-"Align left": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u0627\u0632 \u0686\u067e",
-"Align center": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u0627\u0632 \u0648\u0633\u0637",
-"Align right": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u0627\u0632 \u0631\u0627\u0633\u062a",
-"Justify": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc \u062f\u0648\u0637\u0631\u0641\u0647",
-"Bullet list": "\u0641\u0647\u0631\u0633\u062a \u0646\u0634\u0627\u0646\u0647\u200c\u062f\u0627\u0631",
-"Numbered list": "\u0641\u0647\u0631\u0633\u062a \u0634\u0645\u0627\u0631\u0647\u200c\u062f\u0627\u0631",
-"Decrease indent": "\u06a9\u0627\u0647\u0634 \u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"Increase indent": "\u0627\u0641\u0632\u0627\u06cc\u0634 \u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"Close": "\u0628\u0633\u062a\u0646",
-"Formats": "\u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc\u200c\u0647\u0627",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u0631\u0648\u0631\u06af\u0631 \u0634\u0645\u0627 \u0627\u0632 \u062f\u0633\u062a\u0631\u0633\u06cc \u0645\u0633\u062a\u0642\u06cc\u0645 \u0628\u0647 \u06a9\u0644\u06cc\u067e\u200c\u0628\u0648\u0631\u062f \u067e\u0634\u062a\u06cc\u0628\u0627\u0646\u06cc \u0646\u0645\u06cc\u200c\u06a9\u0646\u062f\u060c \u0644\u0637\u0641\u0627\u064b \u0627\u0632 \u0645\u06cc\u0627\u0646\u0628\u0631\u0647\u0627\u06cc Ctrl+X\/C\/V \u0635\u0641\u062d\u0647 \u06a9\u0644\u06cc\u062f \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f.",
-"Headers": "\u0633\u0631\u0628\u0631\u06af\u200c\u0647\u0627",
-"Header 1": "\u0633\u0631\u0628\u0631\u06af 1",
-"Header 2": "\u0633\u0631\u0628\u0631\u06af 2",
-"Header 3": "\u0633\u0631\u0628\u0631\u06af 3",
-"Header 4": "\u0633\u0631\u0628\u0631\u06af 4",
-"Header 5": "\u0633\u0631\u0628\u0631\u06af 5",
-"Header 6": "\u0633\u0631\u0628\u0631\u06af 6",
-"Headings": "\u0633\u0631\u0641\u0635\u0644\u200c\u0647\u0627",
-"Heading 1": "\u0633\u0631\u0641\u0635\u0644\u200c 1",
-"Heading 2": "\u0633\u0631\u0641\u0635\u0644 2",
-"Heading 3": "\u0633\u0631\u0641\u0635\u0644 3",
-"Heading 4": "\u0633\u0631\u0641\u0635\u0644 4",
-"Heading 5": "\u0633\u0631\u0641\u0635\u0644 5",
-"Heading 6": "\u0633\u0631\u0641\u0635\u0644 6",
-"Preformatted": "\u0627\u0632 \u067e\u06cc\u0634 \u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc\u200c\u0634\u062f\u0647",
-"Div": "\u0628\u062e\u0634",
-"Pre": "\u067e\u06cc\u0634",
-"Code": "\u06a9\u062f",
-"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0631\u0627\u0641",
-"Blockquote": "\u0646\u0642\u0644 \u0642\u0648\u0644 \u0628\u0644\u0648\u06a9\u06cc",
-"Inline": "\u0647\u0645\u200c\u0631\u0627\u0633\u062a\u0627",
-"Blocks": "\u0628\u0644\u0648\u06a9\u200c\u0647\u0627",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0627\u0645\u06a9\u0627\u0646 \u0686\u0633\u0628\u0627\u0646\u062f\u0646\u060c \u062f\u0631 \u062d\u0627\u0644\u062a \u0645\u062a\u0646 \u062e\u0627\u0644\u0635 \u062a\u0646\u0638\u06cc\u0645 \u06af\u0634\u062a\u0647. \u062a\u0627 \u0632\u0645\u0627\u0646 \u062a\u063a\u06cc\u06cc\u0631 \u0627\u06cc\u0646 \u062d\u0627\u0644\u062a\u060c \u0645\u062d\u062a\u0648\u0627\u06cc \u0645\u0648\u0631\u062f \u0686\u0633\u0628\u0627\u0646\u062f\u0646\u060c \u0628\u0647 \u0635\u0648\u0631\u062a \u0645\u062a\u0646 \u062e\u0627\u0644\u0635 \u062e\u0648\u0627\u0647\u062f \u0686\u0633\u0628\u06cc\u062f.",
-"Fonts": "\u0641\u0648\u0646\u062a\u200c\u200c\u0647\u0627",
-"Font Sizes": "\u0627\u0646\u062f\u0627\u0632\u0647\u0654 \u0641\u0648\u0646\u062a",
-"Class": "\u0637\u0628\u0642\u0647",
-"Browse for an image": "\u06af\u0634\u062a\u0646 \u0628\u0631\u0627\u06cc \u0639\u06a9\u0633 \u0645\u0648\u0631\u062f \u0646\u0638\u0631",
-"OR": "\u06cc\u0627",
-"Drop an image here": "\u062a\u0635\u0648\u06cc\u0631 \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u0631\u0627 \u0627\u06cc\u0646\u062c\u0627 \u0631\u0647\u0627 \u06a9\u0646\u06cc\u062f",
-"Upload": "\u0622\u067e\u0644\u0648\u062f",
-"Block": "\u0628\u0644\u0648\u06a9",
-"Align": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc",
-"Default": "\u067e\u06cc\u0634 \u0641\u0631\u0636",
-"Circle": "\u062f\u0627\u06cc\u0631\u0647",
-"Disc": "\u062f\u0627\u06cc\u0631\u0647\u0621 \u062a\u0648\u067e\u0631",
-"Square": "\u0686\u0647\u0627\u0631 \u06af\u0648\u0634",
-"Lower Alpha": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9",
-"Lower Greek": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9 \u06cc\u0648\u0646\u0627\u0646\u06cc",
-"Lower Roman": "\u0627\u0631\u0642\u0627\u0645 \u06a9\u0648\u0686\u06a9 \u0631\u0648\u0645\u06cc",
-"Upper Alpha": "\u062d\u0631\u0648\u0641 \u0628\u0632\u0631\u06af",
-"Upper Roman": "\u0627\u0631\u0642\u0627\u0645 \u0628\u0632\u0631\u06af \u0631\u0648\u0645\u06cc",
-"Anchor...": "\u0642\u0644\u0627\u0628...",
-"Name": "\u0646\u0627\u0645",
-"Id": "\u0634\u0646\u0627\u0633\u0647",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0634\u0646\u0627\u0633\u0647 \u0645\u06cc \u0628\u0627\u06cc\u0633\u062a \u0628\u0627 \u06cc\u06a9 \u062d\u0631\u0641 \u0627\u0644\u0641\u0628\u0627 \u0622\u063a\u0627\u0632 \u0648 \u0628\u0627 \u062f\u0646\u0628\u0627\u0644\u0647 \u0627\u06cc \u0627\u0632 \u062d\u0631\u0648\u0641\u060c \u0627\u0639\u062f\u0627\u062f\u060c \u0639\u0644\u0627\u0645\u062a \u0645\u0650\u0646\u0647\u0627\u060c \u0646\u0642\u0637\u0647\u060c \u062f\u0648 \u0646\u0642\u0637\u0647 \u06cc\u0627 \u062e\u0637 \u062a\u06cc\u0631\u0647 \u0627\u062f\u0627\u0645\u0647 \u06cc\u0627\u0628\u062f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0634\u0645\u0627 \u0630\u062e\u06cc\u0631\u0647 \u0646\u0634\u062f\u0647 \u0627\u0646\u062f\u060c \u0622\u06cc\u0627 \u062c\u0647\u062a \u062e\u0631\u0648\u062c \u0627\u0637\u0645\u06cc\u0646\u0627\u0646 \u062f\u0627\u0631\u06cc\u062f\u061f",
-"Restore last draft": "\u0628\u0627\u0632\u06cc\u0627\u0628\u06cc \u0622\u062e\u0631\u06cc\u0646 \u067e\u06cc\u0634 \u0646\u0648\u06cc\u0633",
-"Special character...": "\u062d\u0631\u0648\u0641 \u062e\u0627\u0635",
-"Source code": "\u0645\u062a\u0646 \u06a9\u062f \u0645\u0646\u0628\u0639",
-"Insert\/Edit code sample": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0646\u0645\u0648\u0646\u0647\u0621 \u06a9\u062f",
-"Language": "\u0632\u0628\u0627\u0646",
-"Code sample...": "\u0646\u0645\u0648\u0646\u0647 \u06a9\u062f...",
-"Color Picker": "\u0627\u0646\u062a\u062e\u0627\u0628\u200c\u06a9\u0646\u0646\u062f\u0647 \u0631\u0646\u06af",
-"R": "\u0642\u0631\u0645\u0632",
-"G": "\u0633\u0628\u0632",
-"B": "\u0622\u0628\u06cc",
-"Left to right": "\u0686\u067e \u0628\u0647 \u0631\u0627\u0633\u062a",
-"Right to left": "\u0631\u0627\u0633\u062a \u0628\u0647 \u0686\u067e",
-"Emoticons...": "\u0635\u0648\u0631\u062a\u06a9\u200c\u0647\u0627...",
-"Metadata and Document Properties": "\u0641\u0631\u0627\u062f\u0627\u062f\u0647 \u0648 \u0645\u0634\u062e\u0635\u0627\u062a \u0633\u0646\u062f",
-"Title": "\u0639\u0646\u0648\u0627\u0646",
-"Keywords": "\u0648\u0627\u0698\u06af\u0627\u0646 \u06a9\u0644\u06cc\u062f\u06cc",
-"Description": "\u062a\u0648\u0636\u06cc\u062d",
-"Robots": "\u0631\u0648\u0628\u0627\u062a\u0647\u0627",
-"Author": "\u0645\u0648\u0644\u0641",
-"Encoding": "\u06a9\u062f\u06af\u0632\u0627\u0631\u06cc \u0645\u062a\u0646",
-"Fullscreen": "\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647",
-"Action": "\u0639\u0645\u0644",
-"Shortcut": "\u0645\u06cc\u0627\u0646\u0628\u064f\u0631",
-"Help": "\u0631\u0627\u0647\u0646\u0645\u0627",
-"Address": "\u0646\u0634\u0627\u0646\u06cc",
-"Focus to menubar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0645\u0646\u0648",
-"Focus to toolbar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631",
-"Focus to element path": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0645\u0633\u06cc\u0631 \u0627\u0650\u0644\u0650\u0645\u0627\u0646",
-"Focus to contextual toolbar": "\u062a\u0645\u0631\u06a9\u0632 \u0628\u0631 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 \u0645\u062a\u0646\u06cc",
-"Insert link (if link plugin activated)": "\u062f\u0631\u062c \u067e\u06cc\u0648\u0646\u062f (\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u067e\u06cc\u0648\u0646\u062f \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Save (if save plugin activated)": "\u062b\u0628\u062a\u00a0(\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u0630\u062e\u06cc\u0631\u0647 \u0633\u0627\u0632\u06cc \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Find (if searchreplace plugin activated)": "\u06cc\u0627\u0641\u062a\u0646 (\u0627\u06af\u0631 \u0627\u0641\u0632\u0648\u0646\u0647\u0621 \u062c\u0633\u062a\u062c\u0648\/\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc \u0641\u0639\u0627\u0644 \u0634\u062f)",
-"Plugins installed ({0}):": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627\u06cc\u06cc \u06a9\u0647 \u0646\u0635\u0628 \u0634\u062f\u0646\u062f ({0}):",
-"Premium plugins:": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627\u06cc \u0645\u062e\u0635\u0648\u0635:",
-"Learn more...": "\u06cc\u0627\u062f\u06af\u06cc\u0631\u06cc \u0628\u06cc\u0634\u062a\u0631...",
-"You are using {0}": "\u0634\u0645\u0627 \u062f\u0631 \u062d\u0627\u0644 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0627\u0632 {0} \u0645\u06cc \u0628\u0627\u0634\u06cc\u062f",
-"Plugins": "\u0627\u0641\u0632\u0648\u0646\u0647 \u0647\u0627",
-"Handy Shortcuts": "\u0645\u06cc\u0627\u0646\u0628\u064f\u0631\u0647\u0627\u06cc \u0633\u0648\u062f\u0645\u0646\u062f",
-"Horizontal line": "\u062e\u0637 \u0627\u0641\u0642\u06cc",
-"Insert\/edit image": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u062a\u0635\u0648\u06cc\u0631",
-"Image description": "\u062a\u0648\u0635\u06cc\u0641 \u062a\u0635\u0648\u06cc\u0631",
-"Source": "\u0645\u0646\u0628\u0639",
-"Dimensions": "\u0627\u0628\u0639\u0627\u062f",
-"Constrain proportions": "\u062d\u0641\u0638 \u062a\u0646\u0627\u0633\u0628",
-"General": "\u0639\u0645\u0648\u0645\u06cc",
-"Advanced": "\u067e\u06cc\u0634\u0631\u0641\u062a\u0647",
-"Style": "\u0633\u0628\u06a9",
-"Vertical space": "\u0641\u0636\u0627\u06cc \u0639\u0645\u0648\u062f\u06cc",
-"Horizontal space": "\u0641\u0636\u0627\u06cc \u0627\u0641\u0642\u06cc",
-"Border": "\u0644\u0628\u0647",
-"Insert image": "\u062f\u0631\u062c \u062a\u0635\u0648\u06cc\u0631",
-"Image...": "\u062a\u0635\u0648\u06cc\u0631...",
-"Image list": "\u0641\u0647\u0631\u0633\u062a \u062a\u0635\u0648\u06cc\u0631\u06cc",
-"Rotate counterclockwise": "\u062f\u064e\u0648\u064e\u0631\u0627\u0646 \u067e\u0627\u062f \u0633\u0627\u0639\u062a \u06af\u0631\u062f",
-"Rotate clockwise": "\u062f\u064e\u0648\u064e\u0631\u0627\u0646 \u0633\u0627\u0639\u062a \u06af\u0631\u062f",
-"Flip vertically": "\u0642\u0631\u06cc\u0646\u0647 \u0639\u0645\u0648\u062f\u06cc",
-"Flip horizontally": "\u0642\u0631\u06cc\u0646\u0647 \u0627\u0641\u0642\u06cc",
-"Edit image": "\u0648\u06cc\u0631\u0627\u0633\u062a \u062a\u0635\u0648\u06cc\u0631",
-"Image options": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u062a\u0635\u0648\u06cc\u0631",
-"Zoom in": "\u0628\u0632\u0631\u06af \u0646\u0645\u0627\u06cc\u06cc",
-"Zoom out": "\u06a9\u0648\u0686\u06a9 \u0646\u0645\u0627\u06cc\u06cc",
-"Crop": "\u0628\u064f\u0631\u0634 \u062f\u064f\u0648\u0631",
-"Resize": "\u062a\u063a\u06cc\u06cc\u0631 \u0627\u0646\u062f\u0627\u0632\u0647",
-"Orientation": "\u06af\u0650\u0631\u0627",
-"Brightness": "\u0631\u0648\u0634\u0646\u0627\u06cc\u06cc",
-"Sharpen": "\u0628\u0647\u0628\u0648\u062f \u0644\u0628\u0647",
-"Contrast": "\u062a\u0636\u0627\u062f \u0631\u0646\u06af",
-"Color levels": "\u0633\u0637\u0648\u062d \u0631\u0646\u06af",
-"Gamma": "\u06af\u0627\u0645\u0627",
-"Invert": "\u0628\u0631\u06af\u0634\u062a \u0631\u0646\u06af",
-"Apply": "\u0627\u0650\u0639\u0645\u0627\u0644",
-"Back": "\u0628\u0627\u0632\u06af\u0634\u062a",
-"Insert date\/time": "\u062f\u0631\u062c \u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
-"Date\/time": "\u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
-"Insert\/Edit Link": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u067e\u06cc\u0648\u0646\u062f",
-"Insert\/edit link": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u067e\u06cc\u0648\u0646\u062f",
-"Text to display": "\u0645\u062a\u0646 \u0646\u0645\u0627\u06cc\u0634\u06cc",
-"Url": "\u0622\u062f\u0631\u0633",
-"Open link in...": "\u0628\u0627\u0632 \u06a9\u0631\u062f\u0646 \u067e\u06cc\u0648\u0646\u062f \u062f\u0631...",
-"Current window": "\u067e\u0646\u062c\u0631\u0647 \u062c\u0627\u0631\u06cc",
-"None": "\u0647\u06cc\u0686",
-"New window": "\u067e\u0646\u062c\u0631\u0647\u0621 \u062c\u062f\u06cc\u062f",
-"Remove link": "\u062d\u0630\u0641 \u067e\u06cc\u0648\u0646\u062f",
-"Anchors": "\u0642\u0644\u0627\u0628 \u0647\u0627",
-"Link...": "\u067e\u06cc\u0648\u0646\u062f...",
-"Paste or type a link": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u06cc\u0627 \u062a\u0627\u06cc\u067e \u067e\u06cc\u0648\u0646\u062f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u0622\u062f\u0631\u0633 \u0648\u0631\u0648\u062f\u06cc \u06cc\u06a9 \u0631\u0627\u06cc\u0627\u0646\u0627\u0645\u0647 \u0628\u0627\u0634\u062f. \u0622\u06cc\u0627 \u062a\u0645\u0627\u06cc\u0644 \u0628\u0647 \u0627\u0641\u0632\u0648\u0631\u062f\u0646 \u067e\u06cc\u0634\u0648\u0646\u062f mailto: \u062f\u0627\u0631\u06cc\u062f\u061f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0628\u0647 \u0646\u0638\u0631 \u0645\u06cc \u0631\u0633\u062f \u0622\u062f\u0631\u0633 \u0648\u0631\u0648\u062f\u06cc \u0627\u0631\u062c\u0627\u0639\u06cc \u0628\u0647 \u062e\u0627\u0631\u062c \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0627\u06cc\u062a \u0645\u06cc \u0628\u0627\u0634\u062f. \u0622\u06cc\u0627 \u062a\u0645\u0627\u06cc\u0644 \u0628\u0647 \u0627\u0641\u0632\u0648\u0631\u062f\u0646 \u067e\u06cc\u0634\u0648\u0646\u062f http:\/\/ \u062f\u0627\u0631\u06cc\u062f\u061f",
-"Link list": "\u0641\u0647\u0631\u0633\u062a \u067e\u06cc\u0648\u0646\u062f",
-"Insert video": "\u062f\u0631\u062c \u0648\u06cc\u062f\u06cc\u0648",
-"Insert\/edit video": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0648\u06cc\u062f\u06cc\u0648",
-"Insert\/edit media": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u0631\u0633\u0627\u0646\u0647",
-"Alternative source": "\u0645\u0646\u0628\u0639 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646",
-"Alternative source URL": "\u0646\u0634\u0627\u0646\u06cc \u0648\u0628 \u0645\u0646\u0628\u0639 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646",
-"Media poster (Image URL)": "\u067e\u0648\u0633\u062a\u0631 \u0631\u0633\u0627\u0646\u0647 (\u0646\u0634\u0627\u0646\u06cc \u0648\u0628 \u062a\u0635\u0648\u06cc\u0631)",
-"Paste your embed code below:": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u06a9\u062f \u062c\u0627\u0633\u0627\u0632\u06cc \u0634\u0645\u0627 \u062f\u0631 \u0632\u06cc\u0631: ",
-"Embed": "\u062c\u0627\u0633\u0627\u0632\u06cc",
-"Media...": "\u0631\u0633\u0627\u0646\u0647...",
-"Nonbreaking space": "\u0641\u0636\u0627\u06cc \u062e\u0627\u0644\u06cc \u0628\u0631\u0634 \u0646\u0627\u067e\u0630\u06cc\u0631",
-"Page break": "\u0628\u0631\u0634 \u0635\u0641\u062d\u0647",
-"Paste as text": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0645\u062a\u0646",
-"Preview": "\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634",
-"Print...": "\u0686\u0627\u067e...",
-"Save": "\u0630\u062e\u06cc\u0631\u0647",
-"Find": "\u062c\u0633\u062a\u062c\u0648",
-"Replace with": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc \u0628\u0627",
-"Replace": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc",
-"Replace all": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u0647\u0645\u0647",
-"Previous": "\u0642\u0628\u0644\u06cc",
-"Next": "\u0628\u0639\u062f\u06cc",
-"Find and replace...": "\u06cc\u0627\u0641\u062a\u0646 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646...",
-"Could not find the specified string.": "\u0631\u0634\u062a\u0647\u0621 \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u06cc\u0627\u0641\u062a \u0646\u06af\u0631\u062f\u06cc\u062f.",
-"Match case": "\u062a\u0637\u0627\u0628\u0642 \u062d\u0631\u0648\u0641",
-"Find whole words only": "\u06cc\u0627\u0641\u062a\u0646 \u062f\u0642\u06cc\u0642\u0627\u064b \u06a9\u0644 \u0648\u0627\u0698\u0647",
-"Spell check": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627",
-"Ignore": "\u0628\u06cc \u062e\u06cc\u0627\u0644",
-"Ignore all": "\u0628\u06cc \u062e\u06cc\u0627\u0644 \u0647\u0645\u0647",
-"Finish": "\u0627\u062a\u0645\u0627\u0645",
-"Add to Dictionary": "\u0628\u0647 \u0648\u0627\u0698\u0647 \u0646\u0627\u0645\u0647 \u0628\u06cc \u0627\u0641\u0632\u0627",
-"Insert table": "\u062f\u0631\u062c \u062c\u062f\u0648\u0644",
-"Table properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u062c\u062f\u0648\u0644",
-"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
-"Cell": "\u0633\u0644\u0648\u0644",
-"Row": "\u0633\u0637\u0631",
-"Column": "\u0633\u062a\u0648\u0646",
-"Cell properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0644\u0648\u0644",
-"Merge cells": "\u067e\u06cc\u0648\u0646\u062f \u0633\u0644\u0648\u0644 \u0647\u0627",
-"Split cell": "\u062c\u062f\u0627 \u0633\u0627\u0632\u06cc \u0633\u0644\u0648\u0644",
-"Insert row before": "\u062f\u0631\u062c \u0633\u0637\u0631 \u062f\u0631 \u0628\u0627\u0644\u0627",
-"Insert row after": "\u062f\u0631\u062c \u0633\u0637\u0631 \u062f\u0631 \u067e\u0627\u06cc\u06cc\u0646",
-"Delete row": "\u062d\u0630\u0641 \u0633\u0637\u0631",
-"Row properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0637\u0631",
-"Cut row": "\u0628\u0631\u0634 \u0633\u0637\u0631",
-"Copy row": "\u0631\u0648\u0646\u0648\u06cc\u0633\u06cc \u0633\u0637\u0631",
-"Paste row before": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631 \u062f\u0631 \u0628\u0627\u0644\u0627",
-"Paste row after": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631 \u062f\u0631 \u067e\u0627\u06cc\u06cc\u0646",
-"Insert column before": "\u062f\u0631\u062c \u0633\u062a\u0648\u0646 \u0642\u0628\u0644",
-"Insert column after": "\u062f\u0631\u062c \u0633\u062a\u0648\u0646 \u0628\u0639\u062f",
-"Delete column": "\u062d\u0630\u0641 \u0633\u062a\u0648\u0646",
-"Cols": "\u0633\u062a\u0648\u0646 \u0647\u0627",
-"Rows": "\u0633\u0637\u0631 \u0647\u0627",
-"Width": "\u0639\u0631\u0636",
-"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
-"Cell spacing": "\u0641\u0627\u0635\u0644\u0647 \u0645\u06cc\u0627\u0646 \u0633\u0644\u0648\u0644\u06cc",
-"Cell padding": "\u062d\u0627\u0634\u06cc\u0647 \u062f\u0631\u0648\u0646 \u0633\u0644\u0648\u0644\u06cc",
-"Show caption": "\u0646\u0645\u0627\u06cc\u0634 \u0639\u0646\u0648\u0627\u0646",
-"Left": "\u0686\u067e",
-"Center": "\u0645\u06cc\u0627\u0646\u0647",
-"Right": "\u0631\u0627\u0633\u062a",
-"Cell type": "\u0646\u0648\u0639 \u0633\u0644\u0648\u0644",
-"Scope": "\u062d\u0648\u0632\u0647",
-"Alignment": "\u0647\u0645 \u062a\u0631\u0627\u0632\u06cc",
-"H Align": "\u062a\u0631\u0627\u0632 \u0627\u0641\u0642\u06cc",
-"V Align": "\u062a\u0631\u0627\u0632 \u0639\u0645\u0648\u062f\u06cc",
-"Top": "\u0628\u0627\u0644\u0627",
-"Middle": "\u0645\u06cc\u0627\u0646\u0647",
-"Bottom": "\u067e\u0627\u06cc\u06cc\u0646",
-"Header cell": "\u0633\u0644\u0648\u0644 \u0633\u0631 \u0633\u062a\u0648\u0646",
-"Row group": "\u06af\u0631\u0648\u0647 \u0633\u0637\u0631\u06cc",
-"Column group": "\u06af\u0631\u0648\u0647 \u0633\u062a\u0648\u0646\u06cc",
-"Row type": "\u0646\u0648\u0639 \u0633\u0637\u0631",
-"Header": "\u0633\u0631 \u0622\u0645\u062f",
-"Body": "\u0628\u062f\u0646\u0647",
-"Footer": "\u067e\u0627 \u0646\u0648\u0634\u062a",
-"Border color": "\u0631\u0646\u06af \u0644\u0628\u0647",
-"Insert template...": "\u062f\u0631\u062c \u0627\u0644\u06af\u0648...",
-"Templates": "\u0627\u0644\u06af\u0648\u0647\u0627",
-"Template": "\u0627\u0644\u06af\u0648",
-"Text color": "\u0631\u0646\u06af \u0645\u062a\u0646",
-"Background color": "\u0631\u0646\u06af \u067e\u0633 \u0632\u0645\u06cc\u0646\u0647",
-"Custom...": "\u062f\u0644\u062e\u0648\u0627\u0647...",
-"Custom color": "\u0631\u0646\u06af \u062f\u0644\u062e\u0648\u0627\u0647",
-"No color": "\u0628\u062f\u0648\u0646 \u0631\u0646\u06af",
-"Remove color": "\u062d\u0630\u0641 \u0631\u0646\u06af",
-"Table of Contents": "\u0641\u0647\u0631\u0633\u062a \u0639\u0646\u0627\u0648\u06cc\u0646",
-"Show blocks": "\u0646\u0645\u0627\u06cc\u0634 \u0628\u0644\u0648\u06a9 \u0647\u0627",
-"Show invisible characters": "\u0646\u0645\u0627\u06cc\u0634 \u0646\u0648\u06cc\u0633\u0647 \u0647\u0627\u06cc \u0646\u0627\u067e\u06cc\u062f\u0627",
-"Word count": "\u062a\u0639\u062f\u0627\u062f \u0648\u0627\u0698\u0647\u200c\u0647\u0627",
-"Count": "\u0634\u0645\u0627\u0631\u0634",
-"Document": "\u0627\u0633\u0646\u0627\u062f",
-"Selection": "\u0627\u0646\u062a\u062e\u0627\u0628",
-"Words": "\u06a9\u0644\u0645\u0627\u062a",
-"Words: {0}": "\u0648\u0627\u0698\u0647 \u0647\u0627: {0}",
-"{0} words": "{0} \u0648\u0627\u0698\u0647",
-"File": "\u067e\u0631\u0648\u0646\u062f\u0647",
-"Edit": "\u0648\u06cc\u0631\u0627\u06cc\u0634",
-"Insert": "\u062f\u0631\u062c",
-"View": "\u0646\u0645\u0627\u06cc\u0634",
-"Format": "\u0642\u0627\u0644\u0628",
-"Table": "\u062c\u062f\u0648\u0644",
-"Tools": "\u0627\u0628\u0632\u0627\u0631\u0647\u0627",
-"Powered by {0}": "\u062a\u0648\u0627\u0646 \u06af\u0631\u0641\u062a\u0647 \u0627\u0632 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0646\u0627\u062d\u06cc\u0647 \u0645\u062a\u0646 \u063a\u0646\u06cc.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0645\u0646\u0648 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + F9 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + F10 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.\n\u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647 \u0631\u0627\u0647\u0646\u0645\u0627 \u0627\u0632 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc \u062a\u0631\u06a9\u06cc\u0628\u06cc ALT + 0 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u0646\u0645\u0627\u06cc\u06cc\u062f.",
-"Image title": "\u0639\u0646\u0648\u0627\u0646 \u062a\u0635\u0648\u06cc\u0631",
-"Border width": "\u0639\u0631\u0636 \u062d\u0627\u0634\u06cc\u0647",
-"Border style": "\u0633\u0628\u06a9 \u062d\u0627\u0634\u06cc\u0647",
-"Error": "\u062e\u0637\u0627",
-"Warn": "\u0647\u0634\u062f\u0627\u0631",
-"Valid": "\u0645\u0639\u062a\u0628\u0631",
-"To open the popup, press Shift+Enter": "\u062c\u0647\u062a \u0628\u0627\u0632 \u06a9\u0631\u062f\u0646 \u067e\u0646\u062c\u0631\u0647 \u0628\u0627\u0632\u0634\u0648\u060c \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc Shift + Enter \u0631\u0627 \u0641\u0634\u0627\u0631 \u062f\u0647\u06cc\u062f.",
-"Rich Text Area. Press ALT-0 for help.": "\u0646\u0627\u062d\u06cc\u0647 \u0645\u062a\u0646 \u063a\u0646\u06cc. \u062c\u0647\u062a \u0645\u0634\u0627\u0647\u062f\u0647\u0654 \u0631\u0627\u0647\u0646\u0645\u0627 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc ALT + 0 \u0631\u0627 \u0641\u0634\u0627\u0631 \u062f\u0647\u06cc\u062f.",
-"System Font": "\u0641\u0648\u0646\u062a \u0633\u06cc\u0633\u062a\u0645\u06cc",
-"Failed to upload image: {0}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u062a\u0635\u0648\u06cc\u0631: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0627\u0641\u0632\u0648\u0646\u0647: {0} \u0627\u0632 \u0646\u0634\u0627\u0646\u06cc \u0648\u0628 {1}",
-"Failed to load plugin url: {0}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0646\u0634\u0627\u0646\u06cc \u0648\u0628 \u0627\u0641\u0632\u0648\u0646\u0647: {0}",
-"Failed to initialize plugin: {0}": "\u0639\u062f\u0645 \u0645\u0648\u0641\u0642\u06cc\u062a \u062f\u0631 \u0631\u0627\u0647\u200c\u0627\u0646\u062f\u0627\u0632\u06cc \u0627\u0641\u0632\u0648\u0646\u0647: {0}",
-"example": "\u0645\u062b\u0627\u0644",
-"Search": "\u062c\u0633\u062a\u062c\u0648",
-"All": "\u0647\u0645\u0647",
-"Currency": "\u0627\u0631\u0632",
-"Text": "\u0645\u062a\u0646",
-"Quotations": "\u0646\u0642\u0644\u200c\u0642\u0648\u0644\u200c\u0647\u0627",
-"Mathematical": "\u0631\u06cc\u0627\u0636\u06cc",
-"Extended Latin": "\u0644\u0627\u062a\u06cc\u0646 \u06af\u0633\u062a\u0631\u062f\u0647",
-"Symbols": "\u0646\u0645\u0627\u062f\u0647\u0627",
-"Arrows": "\u067e\u06cc\u06a9\u0627\u0646\u200c\u0647\u0627",
-"User Defined": "\u0628\u0647 \u062e\u0648\u0627\u0633\u062a \u06a9\u0627\u0631\u0628\u0631",
-"dollar sign": "\u0646\u0645\u0627\u062f \u062f\u0644\u0627\u0631",
-"currency sign": "\u0646\u0645\u0627\u062f \u0627\u0631\u0632",
-"euro-currency sign": "\u0646\u0645\u0627\u062f \u06cc\u0648\u0631\u0648",
-"colon sign": "\u0646\u0645\u0627\u062f \u062f\u0648\u0646\u0642\u0637\u0647",
-"cruzeiro sign": "\u0646\u0645\u0627\u062f \u06a9\u0631\u0648\u0632\u06cc\u0631\u0648",
-"french franc sign": "\u0646\u0645\u0627\u062f \u0641\u0631\u0627\u0646\u06a9 \u0641\u0631\u0627\u0646\u0633\u0647",
-"lira sign": "\u0646\u0645\u0627\u062f \u0644\u06cc\u0631\u0647",
-"mill sign": "\u0646\u0645\u0627\u062f \u0645\u06cc\u0644",
-"naira sign": "\u0646\u0645\u0627\u062f \u0646\u0627\u06cc\u0631\u0627",
-"peseta sign": "\u0646\u0645\u0627\u062f \u067e\u0632\u062a\u0627",
-"rupee sign": "\u0646\u0645\u0627\u062f \u0631\u0648\u067e\u06cc\u0647",
-"won sign": "\u0646\u0645\u0627\u062f \u0648\u0648\u0646",
-"new sheqel sign": "\u0646\u0645\u0627\u062f \u0634\u06a9\u0644 \u062c\u062f\u06cc\u062f",
-"dong sign": "\u0646\u0645\u0627\u062f \u062f\u0627\u0646\u06af",
-"kip sign": "\u0646\u0645\u0627\u062f \u06a9\u06cc\u067e",
-"tugrik sign": "\u0646\u0645\u0627\u062f \u062a\u0648\u06af\u0631\u0648\u06af",
-"drachma sign": "\u0646\u0645\u0627\u062f \u062f\u0631\u0627\u062e\u0645\u0627",
-"german penny symbol": "\u0646\u0645\u0627\u062f \u067e\u0646\u06cc \u0622\u0644\u0645\u0627\u0646\u06cc",
-"peso sign": "\u0646\u0645\u0627\u062f \u067e\u0632\u0648",
-"guarani sign": "\u0646\u0645\u0627\u062f \u06af\u0648\u0627\u0631\u0627\u0646\u06cc",
-"austral sign": "\u0646\u0645\u0627\u062f \u0622\u0633\u062a\u0631\u0627\u0644",
-"hryvnia sign": "\u0646\u0645\u0627\u062f \u06af\u0631\u06cc\u0648\u0646\u0627",
-"cedi sign": "\u0646\u0645\u0627\u062f \u0633\u062f\u06cc",
-"livre tournois sign": "\u0646\u0645\u0627\u062f \u0644\u06cc\u0648\u0631\u0647 \u062a\u0648\u0631\u0646\u0648\u0627",
-"spesmilo sign": "\u0646\u0645\u0627\u062f \u0627\u0633\u067e\u0633\u0645\u06cc\u0644\u0648",
-"tenge sign": "\u0646\u0645\u0627\u062f \u062a\u0646\u06af\u0647",
-"indian rupee sign": "\u0646\u0645\u0627\u062f \u0631\u0648\u067e\u06cc\u0647 \u0647\u0646\u062f\u06cc",
-"turkish lira sign": "\u0646\u0645\u0627\u062f \u0644\u06cc\u0631\u0647 \u062a\u0631\u06a9\u06cc",
-"nordic mark sign": "\u0646\u0645\u0627\u062f \u0645\u0627\u0631\u06a9 \u0646\u0631\u0648\u0698",
-"manat sign": "\u0646\u0645\u0627\u062f \u0645\u0646\u0627\u062a",
-"ruble sign": "\u0646\u0645\u0627\u062f \u0631\u0648\u0628\u0644",
-"yen character": "\u0646\u0648\u06cc\u0633\u0647 \u06cc\u0646",
-"yuan character": "\u0646\u0648\u06cc\u0633\u0647 \u06cc\u0648\u0627\u0646",
-"yuan character, in hong kong and taiwan": "\u0646\u0648\u06cc\u0633\u0647 \u06cc\u0648\u0627\u0646\u060c \u062f\u0631 \u0647\u0646\u06af\u200c\u06a9\u0646\u06af \u0648 \u062a\u0627\u06cc\u0648\u0627\u0646",
-"yen\/yuan character variant one": "\u0646\u0648\u06cc\u0633\u0647 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06cc\u0646\/\u06cc\u0648\u0627\u0646",
-"Loading emoticons...": "\u062f\u0631 \u062d\u0627\u0644 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0634\u06a9\u0644\u06a9\u200c\u0647\u0627...",
-"Could not load emoticons": "\u0634\u06a9\u0644\u06a9\u200c\u0647\u0627 \u0628\u0627\u0631\u06af\u0630\u0627\u0631\u06cc \u0646\u0634\u062f\u0646\u062f",
-"People": "\u0627\u0641\u0631\u0627\u062f",
-"Animals and Nature": "\u062d\u06cc\u0648\u0627\u0646\u0627\u062a \u0648 \u0637\u0628\u06cc\u0639\u062a",
-"Food and Drink": "\u063a\u0630\u0627 \u0648 \u0646\u0648\u0634\u06cc\u062f\u0646\u06cc",
-"Activity": "\u0641\u0639\u0627\u0644\u06cc\u062a",
-"Travel and Places": "\u0633\u0641\u0631 \u0648 \u0627\u0645\u0627\u06a9\u0646",
-"Objects": "\u0627\u0634\u06cc\u0627",
-"Flags": "\u067e\u0631\u0686\u0645\u200c\u0647\u0627",
-"Characters": "\u0646\u0648\u06cc\u0633\u0647\u200c\u0647\u0627",
-"Characters (no spaces)": "\u0646\u0648\u06cc\u0633\u0647 \u0647\u0627 (\u0628\u062f\u0648\u0646 \u0641\u0627\u0635\u0644\u0647)",
-"{0} characters": "{0} \u062d\u0631\u0641",
-"Error: Form submit field collision.": "\u062e\u0637\u0627: \u062a\u062f\u0627\u062e\u0644 \u062f\u0631 \u062b\u0628\u062a \u0641\u0631\u0645.",
-"Error: No form element found.": "\u062e\u0637\u0627: \u0647\u06cc\u0686 \u0627\u0644\u0645\u0627\u0646 \u0641\u0631\u0645\u06cc \u06cc\u0627\u0641\u062a \u0646\u0634\u062f.",
-"Update": "\u0628\u0647\u200c\u0631\u0648\u0632\u0631\u0633\u0627\u0646\u06cc",
-"Color swatch": "\u0646\u0645\u0648\u0646\u0647 \u0631\u0646\u06af",
-"Turquoise": "\u0641\u06cc\u0631\u0648\u0632\u0647\u200c\u0627\u06cc",
-"Green": "\u0633\u0628\u0632",
-"Blue": "\u0622\u0628\u06cc",
-"Purple": "\u0628\u0646\u0641\u0634",
-"Navy Blue": "\u0633\u0631\u0645\u0647\u200c\u0627\u06cc",
-"Dark Turquoise": "\u0641\u06cc\u0631\u0648\u0632\u0647\u200c\u0627\u06cc \u062a\u06cc\u0631\u0647",
-"Dark Green": "\u0633\u0628\u0632 \u062a\u06cc\u0631\u0647",
-"Medium Blue": "\u0622\u0628\u06cc \u0633\u06cc\u0631",
-"Medium Purple": "\u0622\u0628\u06cc \u0628\u0646\u0641\u0634",
-"Midnight Blue": "\u0622\u0628\u06cc \u0646\u0641\u062a\u06cc",
-"Yellow": "\u0632\u0631\u062f",
-"Orange": "\u0646\u0627\u0631\u0646\u062c\u06cc",
-"Red": "\u0642\u0631\u0645\u0632",
-"Light Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc \u0631\u0648\u0634\u0646",
-"Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc",
-"Dark Yellow": "\u0632\u0631\u062f \u062a\u06cc\u0631\u0647",
-"Dark Orange": "\u0646\u0627\u0631\u0646\u062c\u06cc \u062a\u06cc\u0631\u0647",
-"Dark Red": "\u0642\u0631\u0645\u0632 \u062a\u06cc\u0631\u0647",
-"Medium Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc \u0646\u06cc\u0645\u0647\u200c\u0631\u0648\u0634\u0646",
-"Dark Gray": "\u062e\u0627\u06a9\u0633\u062a\u0631\u06cc \u062a\u06cc\u0631\u0647",
-"Light Green": "\u0633\u0628\u0632 \u0631\u0648\u0634\u0646",
-"Light Yellow": "\u0632\u0631\u062f \u0631\u0648\u0634\u0646",
-"Light Red": "\u0642\u0631\u0645\u0632 \u0631\u0648\u0634\u0646",
-"Light Purple": "\u0628\u0646\u0641\u0634 \u0631\u0648\u0634\u0646",
-"Light Blue": "\u0622\u0628\u06cc \u0631\u0648\u0634\u0646",
-"Dark Purple": "\u0628\u0646\u0641\u0634 \u062a\u06cc\u0631\u0647",
-"Dark Blue": "\u0622\u0628\u06cc \u062a\u06cc\u0631\u0647",
-"Black": "\u0633\u06cc\u0627\u0647",
-"White": "\u0633\u0641\u06cc\u062f",
-"Switch to or from fullscreen mode": "\u062a\u063a\u06cc\u06cc\u0631 \u0627\u0632 \u062d\u0627\u0644\u062a \u062a\u0645\u0627\u0645\u200c\u0635\u0641\u062d\u0647 \u06cc\u0627 \u0628\u0647 \u062d\u0627\u0644\u062a \u062a\u0645\u0627\u0645\u200c\u0635\u0641\u062d\u0647",
-"Open help dialog": "\u0628\u0627\u0632 \u06a9\u0631\u062f\u0646 \u06a9\u0627\u062f\u0631 \u0631\u0627\u0647\u0646\u0645\u0627",
-"history": "\u062a\u0627\u0631\u06cc\u062e\u0686\u0647",
-"styles": "\u0633\u0628\u06a9\u200c\u0647\u0627",
-"formatting": "\u0642\u0627\u0644\u0628\u200c\u0628\u0646\u062f\u06cc",
-"alignment": "\u062a\u0631\u0627\u0632\u0628\u0646\u062f\u06cc",
-"indentation": "\u062a\u0648\u0631\u0641\u062a\u06af\u06cc",
-"permanent pen": "\u0642\u0644\u0645 \u062f\u0627\u0626\u0645\u06cc",
-"comments": "\u0646\u0638\u0631\u0627\u062a",
-"Format Painter": "\u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc \u0646\u0642\u0627\u0634",
-"Insert\/edit iframe": "\u062f\u0631\u062c\/\u0648\u06cc\u0631\u0627\u06cc\u0634 iframe",
-"Capitalization": "\u062d\u0631\u0648\u0641 \u0628\u0632\u0631\u06af",
-"lowercase": "\u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9",
-"UPPERCASE": "\u062d\u0631\u0648\u0641 \u0628\u0631\u062c\u0633\u062a\u0647",
-"Title Case": "\u0639\u0646\u0648\u0627\u0646 \u0628\u0646\u062f\u06cc",
-"Permanent Pen Properties": "\u0645\u0634\u062e\u0635\u0627\u062a \u067e\u0627\u06cc\u062f\u0627\u0631 \u0642\u0644\u0645",
-"Permanent pen properties...": "\u0645\u0634\u062e\u0635\u0627\u062a \u067e\u0627\u06cc\u062f\u0627\u0631 \u0642\u0644\u0645...",
-"Font": "\u0642\u0644\u0645",
-"Size": "\u0627\u0646\u062f\u0627\u0632\u0647",
-"More...": "\u0628\u06cc\u0634\u062a\u0631...",
-"Spellcheck Language": "\u0632\u0628\u0627\u0646 \u0628\u0631\u0631\u0633\u06cc \u063a\u0644\u0637 \u0627\u0645\u0644\u0627\u06cc\u06cc",
-"Select...": "\u0627\u0646\u062a\u062e\u0627\u0628...",
-"Preferences": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0628\u0631\u06af\u0632\u06cc\u062f\u0647",
-"Yes": "\u0628\u0644\u0647",
-"No": "\u062e\u06cc\u0631",
-"Keyboard Navigation": "\u067e\u06cc\u0645\u0627\u06cc\u0634 \u0635\u0641\u062d\u0647 \u06a9\u0644\u06cc\u062f",
-"Version": "\u0646\u0633\u062e\u0647",
-"Anchor": "\u0642\u0644\u0627\u0628",
-"Special character": "\u0646\u0648\u06cc\u0633\u0647 \u0647\u0627\u06cc \u062e\u0627\u0635",
-"Code sample": "\u0646\u0645\u0648\u0646\u0647 \u06a9\u064f\u062f",
-"Color": "\u0631\u0646\u06af",
-"Emoticons": "\u0635\u0648\u0631\u062a\u06a9 \u0647\u0627",
-"Document properties": "\u062a\u0646\u0638\u06cc\u0645\u0627\u062a \u0633\u0646\u062f",
-"Image": "\u062a\u0635\u0648\u06cc\u0631",
-"Insert link": "\u062f\u0631\u062c \u067e\u06cc\u0648\u0646\u062f",
-"Target": "\u0645\u0642\u0635\u062f",
-"Link": "\u067e\u06cc\u0648\u0646\u062f",
-"Poster": "\u067e\u0648\u0633\u062a\u0631",
-"Media": "\u0631\u0633\u0627\u0646\u0647",
-"Print": "\u0686\u0627\u067e",
-"Prev": "\u0642\u0628\u0644\u06cc",
-"Find and replace": "\u062c\u0633\u062a\u062c\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646\u06cc",
-"Whole words": "\u062a\u0645\u0627\u0645 \u0648\u0627\u0698\u06af\u0627\u0646",
-"Spellcheck": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u0621",
-"Caption": "\u0639\u0646\u0648\u0627\u0646",
-"Insert template": "\u062f\u0631\u062c \u0627\u0644\u06af\u0648",
-"_dir": "rtl"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/fi.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('fi',{
-"Redo": "Tee uudelleen",
-"Undo": "Kumoa",
-"Cut": "Leikkaa",
-"Copy": "Kopioi",
-"Paste": "Liit\u00e4",
-"Select all": "Valitse kaikki",
-"New document": "Uusi asiakirja",
-"Ok": "Ok",
-"Cancel": "Peruuta",
-"Visual aids": "Visuaaliset neuvot",
-"Bold": "Lihavoitu",
-"Italic": "Kursivoitu",
-"Underline": "Alleviivaus",
-"Strikethrough": "Yliviivaus",
-"Superscript": "Yl\u00e4indeksi",
-"Subscript": "Alaindeksi",
-"Clear formatting": "Poista muotoilu",
-"Align left": "Tasaa vasemmalle",
-"Align center": "Tasaa keskelle",
-"Align right": "Tasaa oikealle",
-"Justify": "Tasaus",
-"Bullet list": "J\u00e4rjest\u00e4m\u00e4t\u00f6n lista",
-"Numbered list": "J\u00e4rjestetty lista",
-"Decrease indent": "Sisenn\u00e4",
-"Increase indent": "Loitonna",
-"Close": "Sulje",
-"Formats": "Muotoilut",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Selaimesi ei tue leikep\u00f6yd\u00e4n suoraa k\u00e4ytt\u00e4mist\u00e4. Ole hyv\u00e4 ja k\u00e4yt\u00e4 n\u00e4pp\u00e4imist\u00f6n Ctrl+X\/C\/V n\u00e4pp\u00e4inyhdistelmi\u00e4.",
-"Headers": "Otsikot",
-"Header 1": "Otsikko 1",
-"Header 2": "Otsikko 2",
-"Header 3": "Otsikko 3",
-"Header 4": "Otsikko 4",
-"Header 5": "Otsikko 5",
-"Header 6": "Otsikko 6",
-"Headings": "Otsikot",
-"Heading 1": "Otsikko 1",
-"Heading 2": "Otsikko 2",
-"Heading 3": "Otsikko 3",
-"Heading 4": "Otsikko 4",
-"Heading 5": "Otsikko 5",
-"Heading 6": "Otsikko 6",
-"Preformatted": "Esimuotoiltu",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Koodi",
-"Paragraph": "Kappale",
-"Blockquote": "Lohkolainaus",
-"Inline": "Samalla rivill\u00e4",
-"Blocks": "Lohkot",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Liitt\u00e4minen on nyt pelk\u00e4n tekstin -tilassa. Sis\u00e4ll\u00f6t liitet\u00e4\u00e4n nyt pelkk\u00e4n\u00e4 tekstin\u00e4, kunnes otat vaihtoehdon pois k\u00e4yt\u00f6st\u00e4.",
-"Fonts": "Fontti",
-"Font Sizes": "Fonttikoko",
-"Class": "Luokka",
-"Browse for an image": "Selaa kuvia",
-"OR": "TAI",
-"Drop an image here": "Pudota kuva t\u00e4h\u00e4n",
-"Upload": "Vie",
-"Block": "Lohko",
-"Align": "Tasaa",
-"Default": "Oletus",
-"Circle": "Pallo",
-"Disc": "Ympyr\u00e4",
-"Square": "Neli\u00f6",
-"Lower Alpha": "pienet kirjaimet: a, b, c",
-"Lower Greek": "pienet kirjaimet: \u03b1, \u03b2, \u03b3",
-"Lower Roman": "pienet kirjaimet: i, ii, iii",
-"Upper Alpha": "isot kirjaimet: A, B, C",
-"Upper Roman": "isot kirjaimet: I, II, III",
-"Anchor...": "Ankkuri...",
-"Name": "Nimi",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id voi alkaa kirjaimella, sen j\u00e4lkeen voi k\u00e4ytt\u00e4\u00e4 kirjaimia, numeroja, viivoja, pisteit\u00e4, kaksoispistett\u00e4 ja alaviivausta",
-"You have unsaved changes are you sure you want to navigate away?": "Sinulla on tallentamattomia muutoksia, haluatko varmasti siirty\u00e4 toiselle sivulle?",
-"Restore last draft": "Palauta aiempi luonnos",
-"Special character...": "Erikoismerkki...",
-"Source code": "L\u00e4hdekoodi",
-"Insert\/Edit code sample": "Lis\u00e4\u00e4\/muokkaa koodiesimerkki",
-"Language": "Kieli",
-"Code sample...": "Koodin\u00e4yte...",
-"Color Picker": "V\u00e4rivalitsin",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Vasemmalta oikealle",
-"Right to left": "Oikealta vasemmalle",
-"Emoticons...": "Emoticonit...",
-"Metadata and Document Properties": "Metadata ja asiakirjan ominaisuudet",
-"Title": "Otsikko",
-"Keywords": "Avainsanat",
-"Description": "Kuvaus",
-"Robots": "Robotit",
-"Author": "Tekij\u00e4",
-"Encoding": "Merkist\u00f6",
-"Fullscreen": "Koko ruutu",
-"Action": "Toiminto",
-"Shortcut": "Oikotie",
-"Help": "Ohje",
-"Address": "Osoite",
-"Focus to menubar": "Kohdistus valikkoon",
-"Focus to toolbar": "Kohdistus ty\u00f6kalupalkkiin",
-"Focus to element path": "Kohdistus elementtiin",
-"Focus to contextual toolbar": "Kohdistus kontekstuaaliseen ty\u00f6kalupalkkiin",
-"Insert link (if link plugin activated)": "Lis\u00e4\u00e4 linkki (jos linkki-liit\u00e4nn\u00e4inen aktiivinen)",
-"Save (if save plugin activated)": "Tallenna (jos tallenna-liit\u00e4nn\u00e4inen aktiivinen)",
-"Find (if searchreplace plugin activated)": "Etsi (jos etsikorvaa-liit\u00e4nn\u00e4inen aktiivinen)",
-"Plugins installed ({0}):": "Asennetut liit\u00e4nn\u00e4iset ({0}):",
-"Premium plugins:": "Premium liit\u00e4nn\u00e4iset:",
-"Learn more...": "Lis\u00e4tietoja...",
-"You are using {0}": "K\u00e4yt\u00e4t {0}",
-"Plugins": "Liit\u00e4nn\u00e4iset",
-"Handy Shortcuts": "K\u00e4tev\u00e4t pikan\u00e4pp\u00e4imet",
-"Horizontal line": "Vaakasuora viiva",
-"Insert\/edit image": "Lis\u00e4\u00e4\/muokkaa kuva",
-"Image description": "Kuvaus",
-"Source": "L\u00e4hde",
-"Dimensions": "Mittasuhteet",
-"Constrain proportions": "S\u00e4ilyt\u00e4 mittasuhteet",
-"General": "Yleiset",
-"Advanced": "Lis\u00e4asetukset",
-"Style": "Tyyli",
-"Vertical space": "Vertikaalinen tila",
-"Horizontal space": "Horisontaalinen tila",
-"Border": "Reunus",
-"Insert image": "Lis\u00e4\u00e4 kuva",
-"Image...": "Kuva...",
-"Image list": "Kuvalista",
-"Rotate counterclockwise": "Kierr\u00e4 vastap\u00e4iv\u00e4\u00e4n",
-"Rotate clockwise": "Kierr\u00e4 my\u00f6t\u00e4p\u00e4iv\u00e4\u00e4n",
-"Flip vertically": "K\u00e4\u00e4nn\u00e4 pystysuunnassa",
-"Flip horizontally": "K\u00e4\u00e4nn\u00e4 vaakasuunnassa",
-"Edit image": "Muokkaa kuvaa",
-"Image options": "Kuvan asetukset",
-"Zoom in": "L\u00e4henn\u00e4",
-"Zoom out": "Loitonna",
-"Crop": "Rajaa valintaan",
-"Resize": "Kuvan koon muutos",
-"Orientation": "Suunta",
-"Brightness": "Kirkkaus",
-"Sharpen": "Ter\u00e4vyys",
-"Contrast": "Kontrasti",
-"Color levels": "V\u00e4ritasot",
-"Gamma": "Gamma",
-"Invert": "K\u00e4\u00e4nteinen",
-"Apply": "Aseta",
-"Back": "Takaisin",
-"Insert date\/time": "Lis\u00e4\u00e4 p\u00e4iv\u00e4m\u00e4\u00e4r\u00e4 tai aika",
-"Date\/time": "P\u00e4iv\u00e4m\u00e4\u00e4r\u00e4\/aika",
-"Insert\/Edit Link": "Lis\u00e4\u00e4 linkki\/muokkaa linkki\u00e4",
-"Insert\/edit link": "Lis\u00e4\u00e4\/muokkaa linkki",
-"Text to display": "N\u00e4ytett\u00e4v\u00e4 teksti",
-"Url": "Osoite",
-"Open link in...": "Avaa linkki...",
-"Current window": "Nykyinen ikkuna",
-"None": "Ei mit\u00e4\u00e4n",
-"New window": "Uusi ikkuna",
-"Remove link": "Poista linkki",
-"Anchors": "Ankkurit",
-"Link...": "Linkki...",
-"Paste or type a link": "Sijoita tai kirjoita linkki",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan s\u00e4hk\u00f6postiosoite. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun mailto: -etuliitteen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan ulkoinen linkki. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun http:\/\/ -etuliitteen?",
-"Link list": "Linkkilista",
-"Insert video": "Lis\u00e4\u00e4 video",
-"Insert\/edit video": "Lis\u00e4\u00e4\/muokkaa video",
-"Insert\/edit media": "Lis\u00e4\u00e4\/muokkaa media",
-"Alternative source": "Vaihtoehtoinen l\u00e4hde",
-"Alternative source URL": "Vaihtoehtoinen l\u00e4hde-URL",
-"Media poster (Image URL)": "Median julkaisija (kuvan URL)",
-"Paste your embed code below:": "Liit\u00e4 upotuskoodisi alapuolelle:",
-"Embed": "Upota",
-"Media...": "Media...",
-"Nonbreaking space": "Sitova v\u00e4lily\u00f6nti",
-"Page break": "Sivunvaihto",
-"Paste as text": "Liit\u00e4 tekstin\u00e4",
-"Preview": "Esikatselu",
-"Print...": "Tulosta",
-"Save": "Tallenna",
-"Find": "Etsi",
-"Replace with": "Korvaa",
-"Replace": "Korvaa",
-"Replace all": "Korvaa kaikki",
-"Previous": "Edellinen",
-"Next": "Seur.",
-"Find and replace...": "Etsi ja korvaa...",
-"Could not find the specified string.": "Haettua merkkijonoa ei l\u00f6ytynyt.",
-"Match case": "Erota isot ja pienet kirjaimet",
-"Find whole words only": "Etsi vain kokonaisia sanoja",
-"Spell check": "Oikeinkirjoituksen tarkistus",
-"Ignore": "\u00c4l\u00e4 huomioi",
-"Ignore all": "\u00c4l\u00e4 huomioi mit\u00e4\u00e4n",
-"Finish": "Lopeta",
-"Add to Dictionary": "Lis\u00e4\u00e4 sanakirjaan",
-"Insert table": "Lis\u00e4\u00e4 taulukko",
-"Table properties": "Taulukon ominaisuudet",
-"Delete table": "Poista taulukko",
-"Cell": "Solu",
-"Row": "Rivi",
-"Column": "Sarake",
-"Cell properties": "Solun ominaisuudet",
-"Merge cells": "Yhdist\u00e4 solut",
-"Split cell": "Jaa solu",
-"Insert row before": "Lis\u00e4\u00e4 rivi ennen",
-"Insert row after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
-"Delete row": "Poista rivi",
-"Row properties": "Rivin ominaisuudet",
-"Cut row": "Leikkaa rivi",
-"Copy row": "Kopioi rivi",
-"Paste row before": "Liit\u00e4 rivi ennen",
-"Paste row after": "Liit\u00e4 rivi j\u00e4lkeen",
-"Insert column before": "Lis\u00e4\u00e4 rivi ennen",
-"Insert column after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
-"Delete column": "Poista sarake",
-"Cols": "Sarakkeet",
-"Rows": "Rivit",
-"Width": "Leveys",
-"Height": "Korkeus",
-"Cell spacing": "Solun v\u00e4li",
-"Cell padding": "Solun tyhj\u00e4 tila",
-"Show caption": "N\u00e4yt\u00e4 kuvateksti",
-"Left": "Vasen",
-"Center": "Keskell\u00e4",
-"Right": "Oikea",
-"Cell type": "Solun tyyppi",
-"Scope": "Laajuus",
-"Alignment": "Tasaus",
-"H Align": "H tasaus",
-"V Align": "V tasaus",
-"Top": "Yl\u00e4reuna",
-"Middle": "Keskikohta",
-"Bottom": "Alareuna",
-"Header cell": "Otsikkosolu",
-"Row group": "Riviryhm\u00e4",
-"Column group": "Sarakeryhm\u00e4",
-"Row type": "Rivityyppi",
-"Header": "Otsikko",
-"Body": "Runko",
-"Footer": "Alaosa",
-"Border color": "Reunuksen v\u00e4ri",
-"Insert template...": "Lis\u00e4\u00e4 malli...",
-"Templates": "Pohjat",
-"Template": "Pohja",
-"Text color": "Tekstin v\u00e4ri",
-"Background color": "Taustan v\u00e4ri",
-"Custom...": "Mukauta...",
-"Custom color": "Mukautettu v\u00e4ri",
-"No color": "Ei v\u00e4ri\u00e4",
-"Remove color": "Poista v\u00e4ri",
-"Table of Contents": "Sis\u00e4llysluettelo",
-"Show blocks": "N\u00e4yt\u00e4 lohkot",
-"Show invisible characters": "N\u00e4yt\u00e4 n\u00e4kym\u00e4tt\u00f6m\u00e4t merkit",
-"Word count": "Sanam\u00e4\u00e4r\u00e4",
-"Count": "M\u00e4\u00e4r\u00e4",
-"Document": "Tiedosto",
-"Selection": "Valinta",
-"Words": "Sanaa",
-"Words: {0}": "Sanat: {0}",
-"{0} words": "{0} sanaa",
-"File": "Tiedosto",
-"Edit": "Muokkaa",
-"Insert": "Lis\u00e4\u00e4",
-"View": "N\u00e4yt\u00e4",
-"Format": "Muotoilu",
-"Table": "Taulukko",
-"Tools": "Ty\u00f6kalut",
-"Powered by {0}": "Tehty {0}:ll\u00e4",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastetun tekstin alue. Paina ALT-F9 valikkoon. Paina ALT-F10 ty\u00f6kaluriviin. Paina ALT-0 ohjeeseen.",
-"Image title": "Kuvan otsikko",
-"Border width": "Reunuksen leveys",
-"Border style": "Reunuksen tyyli",
-"Error": "Virhe",
-"Warn": "Varoitus",
-"Valid": "Voimassa",
-"To open the popup, press Shift+Enter": "Avaa ponnahdusikkuna painamalla Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Rikastetun tekstin alue. Avaa ohje painamalla ALT-0.",
-"System Font": "J\u00e4rjestelm\u00e4fontti",
-"Failed to upload image: {0}": "Kuvan lataus ep\u00e4onnistui: {0}",
-"Failed to load plugin: {0} from url {1}": "Liit\u00e4nn\u00e4isen lataus ep\u00e4onnistui: {0} url:st\u00e4 {1}",
-"Failed to load plugin url: {0}": "Liit\u00e4nn\u00e4isen url:n lataus ep\u00e4onnistui: {0}",
-"Failed to initialize plugin: {0}": "Liit\u00e4nn\u00e4isen alustus ep\u00e4onnistui: {0}",
-"example": "esimerkki",
-"Search": "Etsi",
-"All": "Kaikki",
-"Currency": "Valuutta",
-"Text": "Teksti",
-"Quotations": "Lainaukset",
-"Mathematical": "Matemaattiset",
-"Extended Latin": "Laajennettu latina",
-"Symbols": "Symbolit",
-"Arrows": "Nuolet",
-"User Defined": "K\u00e4ytt\u00e4j\u00e4m\u00e4\u00e4ritetty",
-"dollar sign": "dollarimerkki",
-"currency sign": "valuuttamerkki",
-"euro-currency sign": "eurovaluuttamerkki",
-"colon sign": "kaksoispisteen merkki",
-"cruzeiro sign": "cruzeiro-merkki",
-"french franc sign": "ranskalaisen frangin merkki",
-"lira sign": "liiran merkki",
-"mill sign": "millin merkki",
-"naira sign": "nairan merkki",
-"peseta sign": "pesetan merkki",
-"rupee sign": "rupian merkki",
-"won sign": "wonin merkki",
-"new sheqel sign": "uuden sekelin merkki",
-"dong sign": "dongin merkki",
-"kip sign": "kipin merkki",
-"tugrik sign": "tugrikin merkki",
-"drachma sign": "drakman merkki",
-"german penny symbol": "saksalaisen pennin merkki",
-"peso sign": "peson merkki",
-"guarani sign": "guaranin merkki",
-"austral sign": "australin merkki",
-"hryvnia sign": "hryvnian merkki",
-"cedi sign": "cedin merkki",
-"livre tournois sign": "livre tournoisin merkki",
-"spesmilo sign": "spesmilon merkki",
-"tenge sign": "tengen merkki",
-"indian rupee sign": "intialaisen rupian merkki",
-"turkish lira sign": "turkkilaisen liiran merkki",
-"nordic mark sign": "pohjoismaisen markan merkki",
-"manat sign": "manatin merkki",
-"ruble sign": "ruplan merkki",
-"yen character": "jenin merkki",
-"yuan character": "juanin merkki",
-"yuan character, in hong kong and taiwan": "juanin merkki, Hongkongissa ja Taiwanissa",
-"yen\/yuan character variant one": "jenin\/juanin merkin variantti",
-"Loading emoticons...": "Ladataan emoticoneja...",
-"Could not load emoticons": "Emoticoneja ei voitu ladata",
-"People": "Ihmiset",
-"Animals and Nature": "El\u00e4imet ja luonto",
-"Food and Drink": "Ruoka ja juoma",
-"Activity": "Aktiviteetit",
-"Travel and Places": "Matkailu ja paikat",
-"Objects": "Esineet",
-"Flags": "Liput",
-"Characters": "Merkki\u00e4",
-"Characters (no spaces)": "Merkki\u00e4 (ilman v\u00e4lily\u00f6ntej\u00e4)",
-"{0} characters": "{0} merkki\u00e4",
-"Error: Form submit field collision.": "Virhe: lomakkeen l\u00e4hetyskent\u00e4n t\u00f6rm\u00e4ys.",
-"Error: No form element found.": "Virhe: muotoelementti\u00e4 ei l\u00f6ytynyt.",
-"Update": "P\u00e4ivit\u00e4",
-"Color swatch": "V\u00e4rin\u00e4yte",
-"Turquoise": "Turkoosi",
-"Green": "Vihre\u00e4",
-"Blue": "Sininen",
-"Purple": "Purppura",
-"Navy Blue": "Laivastonsininen",
-"Dark Turquoise": "Tumma turkoosi",
-"Dark Green": "Tumma vihre\u00e4",
-"Medium Blue": "Keskitumma sininen",
-"Medium Purple": "Keskitumma purppura",
-"Midnight Blue": "keskiy\u00f6n sininen",
-"Yellow": "Keltainen",
-"Orange": "Oranssi",
-"Red": "Punainen",
-"Light Gray": "Vaaleanharmaa",
-"Gray": "Harmaa",
-"Dark Yellow": "Tummankeltainen",
-"Dark Orange": "Tumma oranssi",
-"Dark Red": "Tumma punainen",
-"Medium Gray": "Keskiharmaa",
-"Dark Gray": "Tummanharmaa",
-"Light Green": "Vaaleanvihre\u00e4",
-"Light Yellow": "Vaaleankeltainen",
-"Light Red": "Vaaleanpunainen",
-"Light Purple": "Liila",
-"Light Blue": "Vaaleansininen",
-"Dark Purple": "Tummanvioletti",
-"Dark Blue": "Tummansininen",
-"Black": "Musta",
-"White": "Valkoinen",
-"Switch to or from fullscreen mode": "Vaihda kokon\u00e4ytt\u00f6\u00f6n tai kokon\u00e4yt\u00f6st\u00e4",
-"Open help dialog": "Avaa ohjeen valintaikkuna",
-"history": "historia",
-"styles": "tyylit",
-"formatting": "muotoiltu",
-"alignment": "tasaus",
-"indentation": "sisennys",
-"permanent pen": "pysyv\u00e4 kyn\u00e4",
-"comments": "kommentit",
-"Format Painter": "Muotoilusivellin",
-"Insert\/edit iframe": "Lis\u00e4\u00e4\/muokkaa iframe-kehyst\u00e4",
-"Capitalization": "Kapitalisointi",
-"lowercase": "pienaakkoset",
-"UPPERCASE": "SUURAAKKOSET",
-"Title Case": "Otsikon kapitalisointi",
-"Permanent Pen Properties": "Pysyv\u00e4t kyn\u00e4n ominaisuudet",
-"Permanent pen properties...": "Pysyv\u00e4t kyn\u00e4n ominaisuudet...",
-"Font": "Fontti",
-"Size": "Koko",
-"More...": "Lis\u00e4\u00e4...",
-"Spellcheck Language": "Oikoluvun kieli",
-"Select...": "Valitse...",
-"Preferences": "Asetukset",
-"Yes": "Kyll\u00e4",
-"No": "Ei",
-"Keyboard Navigation": "Navigointi n\u00e4pp\u00e4imist\u00f6ll\u00e4",
-"Version": "Versio",
-"Anchor": "Ankkuri",
-"Special character": "Erikoismerkki",
-"Code sample": "Koodiesimerkki",
-"Color": "V\u00e4ri",
-"Emoticons": "Hymi\u00f6t",
-"Document properties": "Dokumentin ominaisuudet",
-"Image": "Kuva",
-"Insert link": "Lis\u00e4\u00e4 linkki",
-"Target": "Kohde",
-"Link": "Linkki",
-"Poster": "L\u00e4hett\u00e4j\u00e4",
-"Media": "Media",
-"Print": "Tulosta",
-"Prev": "Edel.",
-"Find and replace": "Etsi ja korvaa",
-"Whole words": "Koko sanat",
-"Spellcheck": "Oikolue",
-"Caption": "Seloste",
-"Insert template": "Lis\u00e4\u00e4 pohja"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/fo.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('fo',{
-"Cut": "Klipp",
-"Heading 5": "Yvirskrift 5",
-"Header 2": "H\u00f8vd 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "T\u00edn kagi hevur ikki beinlei\u00f0is atgongd til setibor\u00f0i\u00f0. Vinarliga br\u00faka CTRL+X\/C\/V snarvegirnar \u00edsta\u00f0in.",
-"Heading 4": "Yvirskrift 4",
-"Div": "DIv",
-"Heading 2": "Yvirskrift 2",
-"Paste": "L\u00edma",
-"Close": "Lat aftur",
-"Font Family": "Stav familja",
-"Pre": "Pre",
-"Align right": "H\u00f8gra stilla",
-"New document": "N\u00fdtt skjal",
-"Blockquote": "Blokksitat",
-"Numbered list": "Tal listi",
-"Heading 1": "Yvirskrift 1",
-"Headings": "Yvirskriftir",
-"Increase indent": "Vaks inndr\u00e1tt",
-"Formats": "Sni\u00f0",
-"Headers": "H\u00f8vd",
-"Select all": "Vel alt",
-"Header 3": "H\u00f8vd 3",
-"Blocks": "Blokkar",
-"Undo": "Angra ger",
-"Strikethrough": "Strika \u00edgj\u00f8gnum",
-"Bullet list": "Punkt listi",
-"Header 1": "H\u00f8vd 1",
-"Superscript": "H\u00e1skrift",
-"Clear formatting": "Strika sni\u00f0",
-"Font Sizes": "Stav st\u00f8dd",
-"Subscript": "L\u00e1gskrift",
-"Header 6": "H\u00f8vd 6",
-"Redo": "Ger aftur",
-"Paragraph": "T\u00e1ttur",
-"Ok": "Ok",
-"Bold": "Feit",
-"Code": "Kota",
-"Italic": "Sk\u00e1ktekstur",
-"Align center": "Mi\u00f0set",
-"Header 5": "H\u00f8vd 5",
-"Heading 6": "Yvirskrift 6",
-"Heading 3": "Yvirskrift 3",
-"Decrease indent": "Minka inndr\u00e1tt",
-"Header 4": "H\u00f8vd 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Klistra er n\u00fa \u00ed vanligum tekst standi. Innihald ver\u00f0ur n\u00fa klistra sum vanligur tekstur, inntil t\u00fa sl\u00f8kkir hendan standin.",
-"Underline": "Undirstrika",
-"Cancel": "\u00d3gilda",
-"Justify": "L\u00edka breddar",
-"Inline": "\u00cd linju",
-"Copy": "Avrita",
-"Align left": "Vinstra stilla",
-"Visual aids": "Sj\u00f3nhj\u00e1lp",
-"Lower Greek": "L\u00edti Grikskt",
-"Square": "Fj\u00f3rhyrningur",
-"Default": "Forsettur",
-"Lower Alpha": "L\u00edti Alfa",
-"Circle": "Ringur",
-"Disc": "Skiva",
-"Upper Alpha": "St\u00f3rt Alfa",
-"Upper Roman": "St\u00f3rt R\u00f3mverskt",
-"Lower Roman": "L\u00edti R\u00f3mverskt",
-"Name": "Navn",
-"Anchor": "Akker",
-"You have unsaved changes are you sure you want to navigate away?": "T\u00fa hevur broytingar, i\u00f0 ikki eru goymdar. Ert t\u00fa v\u00edsur \u00ed at t\u00fa vilt halda fram?",
-"Restore last draft": "Endurskapa seinasta uppkast",
-"Special character": "Serst\u00f8k tekn",
-"Source code": "keldukota",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Litur",
-"Right to left": "H\u00f8gra til vinstra",
-"Left to right": "Vinstra til h\u00f8gra",
-"Emoticons": "Emotikonur",
-"Robots": "Robottar",
-"Document properties": "Skjal eginleikar",
-"Title": "Heiti",
-"Keywords": "Leitior\u00f0",
-"Encoding": "Koding",
-"Description": "L\u00fdsing",
-"Author": "H\u00f8vundur",
-"Fullscreen": "Fullan sk\u00edggja",
-"Horizontal line": "Vatnr\u00f8tt linja",
-"Horizontal space": "Vatnr\u00e6tt fr\u00e1st\u00f8\u00f0a",
-"Insert\/edit image": "Innset\/r\u00e6tta mynd",
-"General": "Vanligt",
-"Advanced": "Framkomi",
-"Source": "Kelda",
-"Border": "Rammi",
-"Constrain proportions": "Var\u00f0veit lutfall",
-"Vertical space": "Loddr\u00e6t fr\u00e1st\u00f8\u00f0a",
-"Image description": "L\u00fdsing av mynd",
-"Style": "St\u00edlur",
-"Dimensions": "St\u00f8dd",
-"Insert image": "Innset mynd",
-"Zoom in": "Draga inn",
-"Contrast": "M\u00f3tsetningur",
-"Back": "Aftur",
-"Gamma": "Gamma",
-"Flip horizontally": "Vippa vatnr\u00e6tt",
-"Resize": "Broyt st\u00f8dd",
-"Sharpen": "Skerpa",
-"Zoom out": "Draga \u00fat",
-"Image options": "Mynda valm\u00f8guleikar",
-"Apply": "Set \u00e1",
-"Brightness": "Lj\u00f3s",
-"Rotate clockwise": "Mal runt vi\u00f0 klokkuni",
-"Rotate counterclockwise": "Mal runt \u00edm\u00f3ti klokkuni",
-"Edit image": "R\u00e6tta mynd",
-"Color levels": "Lit stig",
-"Crop": "Klipp av",
-"Orientation": "Helling",
-"Flip vertically": "Vippa loddr\u00e6tt",
-"Invert": "Vend \u00f8vut",
-"Insert date\/time": "Innset dag\/t\u00ed\u00f0",
-"Remove link": "Strika leinki",
-"Url": "Url",
-"Text to display": "Tekstur at v\u00edsa",
-"Anchors": "Akker",
-"Insert link": "Innset leinki",
-"New window": "N\u00fdggjan glugga",
-"None": "Eingin",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Tann URL t\u00fa skriva\u00f0i s\u00e6r \u00fat til at ver\u00f0a ein uttanh\u00fdsis adressa. Ynskir t\u00fa at seta ta\u00f0 kravda http:\/\/ forskoyti frammanfyri?",
-"Target": "M\u00e1l",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Tann URL t\u00fa skriva\u00f0i s\u00e6r \u00fat til at vera ein teldupost adressa. Ynskir t\u00fa at seta ta\u00f0 kravda mailto: forskoyti frammanfyri?",
-"Insert\/edit link": "Innset\/r\u00e6tta leinki",
-"Insert\/edit video": "Innset\/r\u00e6tta kykmynd",
-"Poster": "Uppslag",
-"Alternative source": "Onnur kelda",
-"Paste your embed code below:": "Innset ta\u00f0 kodu, sum skal leggjast inn \u00ed, ni\u00f0anfyri:",
-"Insert video": "Innset kykmynd",
-"Embed": "Legg inn \u00ed",
-"Nonbreaking space": "Hart millumr\u00fam",
-"Page break": "S\u00ed\u00f0uskift",
-"Paste as text": "Klistra sum tekst",
-"Preview": "V\u00eds frammanundan",
-"Print": "Prenta",
-"Save": "Goym",
-"Could not find the specified string.": "Kundi ikki finna leititekst",
-"Replace": "Skift \u00fat",
-"Next": "N\u00e6sta",
-"Whole words": "Heil or\u00f0",
-"Find and replace": "Finn og skift \u00fat",
-"Replace with": "Set \u00edsta\u00f0in",
-"Find": "Finn",
-"Replace all": "Skift alt \u00fat",
-"Match case": "Samsvara st\u00f3rar og l\u00edtlar b\u00f3kstavir",
-"Prev": "Fyrra",
-"Spellcheck": "R\u00e6ttstavari",
-"Finish": "Enda",
-"Ignore all": "Leyp alt um",
-"Ignore": "Leyp um",
-"Add to Dictionary": "Legg til or\u00f0ab\u00f3k",
-"Insert row before": "Innset ra\u00f0 \u00e1\u00f0renn",
-"Rows": "R\u00f8\u00f0",
-"Height": "H\u00e6dd",
-"Paste row after": "L\u00edma ra\u00f0 aftan\u00e1",
-"Alignment": "Stilling",
-"Border color": "Kant litur",
-"Column group": "Teig b\u00f3lkur",
-"Row": "Ra\u00f0",
-"Insert column before": "Innset teig \u00e1\u00f0renn",
-"Split cell": "Syndra puntar",
-"Cell padding": "Punt fylling",
-"Cell spacing": "Punt fr\u00e1st\u00f8\u00f0a",
-"Row type": "Ra\u00f0 slag",
-"Insert table": "Innset talvu",
-"Body": "Likam",
-"Caption": "Tekstur",
-"Footer": "F\u00f3tur",
-"Delete row": "Skrika ra\u00f0",
-"Paste row before": "L\u00edma ra\u00f0 \u00e1\u00f0renn",
-"Scope": "N\u00fdtslu\u00f8ki",
-"Delete table": "Strika talvu",
-"H Align": "Vatnr\u00e6tt stilla",
-"Top": "Ovast",
-"Header cell": "H\u00f8vd puntur",
-"Column": "Teigur",
-"Row group": "Ra\u00f0 b\u00f3lkur",
-"Cell": "Puntur",
-"Middle": "\u00cd mi\u00f0juni",
-"Cell type": "Punt slag",
-"Copy row": "Avrita ra\u00f0",
-"Row properties": "Ra\u00f0 eginleikar",
-"Table properties": "Talvu eginleikar",
-"Bottom": "Ni\u00f0ast",
-"V Align": "Loddr\u00e6tt stilla",
-"Header": "H\u00f8vd",
-"Right": "H\u00f8gra",
-"Insert column after": "Innset teig aftan\u00e1",
-"Cols": "Teigar",
-"Insert row after": "Innset ra\u00f0 aftan\u00e1",
-"Width": "Breidd",
-"Cell properties": "Punt eginleikar",
-"Left": "Vinstra",
-"Cut row": "Klipp ra\u00f0",
-"Delete column": "Strika teig",
-"Center": "Mi\u00f0a",
-"Merge cells": "Fl\u00e6tta puntar",
-"Insert template": "Innset form",
-"Templates": "Formur",
-"Background color": "Bakgrundslitur",
-"Custom...": "Laga til...",
-"Custom color": "Tillaga lit",
-"No color": "Eingin litur",
-"Text color": "Tekst litur",
-"Show blocks": "V\u00eds blokkar",
-"Show invisible characters": "V\u00eds \u00f3sj\u00f3nlig tekn",
-"Words: {0}": "Or\u00f0: {0}",
-"Insert": "Innset",
-"File": "F\u00edla",
-"Edit": "Ritstj\u00f3rna",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "R\u00edkt Tekst \u00d8ki. Tr\u00fdst ALT-F9 fyri valmynd. Tr\u00fdst ALT-F10 fyri ambo\u00f0slinju. Tr\u00fdst ALT-0 fyri hj\u00e1lp",
-"Tools": "Ambo\u00f0",
-"View": "V\u00eds",
-"Table": "Talva",
-"Format": "Sni\u00f0"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/fr_CH.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('fr_CH',{
-"Cut": "Couper",
-"Heading 5": "Rubrique 5",
-"Header 2": "Titre 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Votre navigateur ne supporte pas la copie directe. Merci d'utiliser les touches Ctrl+X\/C\/V.",
-"Heading 4": "Rubrique 4",
-"Div": "Div",
-"Heading 2": "Rubrique 2",
-"Paste": "Coller",
-"Close": "Fermer",
-"Font Family": "Polices de caract\u00e8res",
-"Pre": "Pre",
-"Align right": "Aligner \u00e0 droite",
-"New document": "Nouveau document",
-"Blockquote": "Citation",
-"Numbered list": "Num\u00e9rotation",
-"Heading 1": "Rubrique 1",
-"Headings": "Rubriques",
-"Increase indent": "Augmenter le retrait",
-"Formats": "Formats",
-"Headers": "Titres",
-"Select all": "Tout s\u00e9lectionner",
-"Header 3": "Titre 3",
-"Blocks": "Blocs",
-"Undo": "Annuler",
-"Strikethrough": "Barr\u00e9",
-"Bullet list": "Puces",
-"Header 1": "Titre 1",
-"Superscript": "Exposant",
-"Clear formatting": "Effacer la mise en forme",
-"Font Sizes": "Tailles de la police",
-"Subscript": "Indice",
-"Header 6": "Titre 6",
-"Redo": "R\u00e9tablir",
-"Paragraph": "Paragraphe",
-"Ok": "Ok",
-"Bold": "Gras",
-"Code": "Code",
-"Italic": "Italique",
-"Align center": "Aligner au centre",
-"Header 5": "Titre 5",
-"Heading 6": "Rubrique 6",
-"Heading 3": "Rubrique 3",
-"Decrease indent": "Diminuer le retrait",
-"Header 4": "Titre 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.",
-"Underline": "Souligner",
-"Cancel": "Annuler",
-"Justify": "Justifier",
-"Inline": "En ligne",
-"Copy": "Copier",
-"Align left": "Aligner \u00e0 gauche",
-"Visual aids": "Aides visuelles",
-"Lower Greek": "Grecque inf\u00e9rieur",
-"Square": "Carr\u00e9",
-"Default": "D\u00e9faut",
-"Lower Alpha": "Alpha inf\u00e9rieur",
-"Circle": "Cercle",
-"Disc": "Disque",
-"Upper Alpha": "Alpha sup\u00e9rieur",
-"Upper Roman": "Romain sup\u00e9rieur",
-"Lower Roman": "Romain inf\u00e9rieur",
-"Name": "Nom",
-"Anchor": "Ancre",
-"You have unsaved changes are you sure you want to navigate away?": "Vous avez des modifications non enregistr\u00e9es, \u00eates-vous s\u00fbr de quitter la page?",
-"Restore last draft": "Restaurer le dernier brouillon",
-"Special character": "Caract\u00e8re sp\u00e9cial",
-"Source code": "Code source",
-"B": "B",
-"R": "R",
-"G": "V",
-"Color": "Couleur",
-"Right to left": "Droite \u00e0 gauche",
-"Left to right": "Gauche \u00e0 droite",
-"Emoticons": "\u00c9motic\u00f4nes",
-"Robots": "Robots",
-"Document properties": "Propri\u00e9t\u00e9s du document",
-"Title": "Titre",
-"Keywords": "Mots cl\u00e9s",
-"Encoding": "Encodage",
-"Description": "Description",
-"Author": "Auteur",
-"Fullscreen": "Plein \u00e9cran",
-"Horizontal line": "Ligne horizontale",
-"Horizontal space": "Espacement horizontal",
-"Insert\/edit image": "Ins\u00e9rer\/\u00e9diter image",
-"General": "G\u00e9n\u00e9ral",
-"Advanced": "Avanc\u00e9",
-"Source": "Source",
-"Border": "Bordure",
-"Constrain proportions": "Conserver les proportions",
-"Vertical space": "Espacement vertical",
-"Image description": "Description de l'image",
-"Style": "Style",
-"Dimensions": "Dimensions",
-"Insert image": "Ins\u00e9rer une image",
-"Zoom in": "Zoomer",
-"Contrast": "Contraste",
-"Back": "Retour",
-"Gamma": "Gamma",
-"Flip horizontally": "Miroir horizontal",
-"Resize": "Redimensionner",
-"Sharpen": "Nettet\u00e9",
-"Zoom out": "D\u00e9zoomer",
-"Image options": "Options de l'image",
-"Apply": "Appliquer",
-"Brightness": "Luminosit\u00e9",
-"Rotate clockwise": "Tourner dans le sens inverse des aiguilles",
-"Rotate counterclockwise": "Tourner dans le sens des aiguilles",
-"Edit image": "Modifier l'image",
-"Color levels": "Niveau de couleurs",
-"Crop": "Recadrer",
-"Orientation": "Orientation",
-"Flip vertically": "Miroir vertical",
-"Invert": "Inverser",
-"Insert date\/time": "Ins\u00e9rer date\/heure",
-"Remove link": "Supprimer le lien",
-"Url": "Url",
-"Text to display": "Texte \u00e0 afficher",
-"Anchors": "Ancres",
-"Insert link": "Ins\u00e9rer un lien",
-"New window": "Nouvelle fen\u00eatre",
-"None": "n\/a",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
-"Target": "Cible",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
-"Insert\/edit link": "Ins\u00e9rer\/\u00e9diter lien",
-"Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
-"Poster": "Publier",
-"Alternative source": "Source alternative",
-"Paste your embed code below:": "Collez votre code d'int\u00e9gration ci-dessous :",
-"Insert video": "Ins\u00e9rer une vid\u00e9o",
-"Embed": "Int\u00e9grer",
-"Nonbreaking space": "Espace ins\u00e9cable",
-"Page break": "Saut de page",
-"Paste as text": "Coller comme texte",
-"Preview": "Pr\u00e9visualiser",
-"Print": "Imprimer",
-"Save": "Enregistrer",
-"Could not find the specified string.": "Impossible de trouver la cha\u00eene sp\u00e9cifi\u00e9e.",
-"Replace": "Remplacer",
-"Next": "Suiv",
-"Whole words": "Mots entiers",
-"Find and replace": "Trouver et remplacer",
-"Replace with": "Remplacer par",
-"Find": "Chercher",
-"Replace all": "Remplacer tout",
-"Match case": "Respecter la casse",
-"Prev": "Pr\u00e9c",
-"Spellcheck": "V\u00e9rification orthographique",
-"Finish": "Finie",
-"Ignore all": "Tout ignorer",
-"Ignore": "Ignorer",
-"Add to Dictionary": "Ajouter au dictionnaire",
-"Insert row before": "Ins\u00e9rer une ligne avant",
-"Rows": "Lignes",
-"Height": "Hauteur",
-"Paste row after": "Coller la ligne apr\u00e8s",
-"Alignment": "Alignement",
-"Border color": "Couleur de la bordure",
-"Column group": "Groupe de colonnes",
-"Row": "Ligne",
-"Insert column before": "Ins\u00e9rer une colonne avant",
-"Split cell": "Diviser la cellule",
-"Cell padding": "Espacement interne cellule",
-"Cell spacing": "Espacement inter-cellulles",
-"Row type": "Type de ligne",
-"Insert table": "Ins\u00e9rer un tableau",
-"Body": "Corps",
-"Caption": "Titre",
-"Footer": "Pied",
-"Delete row": "Effacer la ligne",
-"Paste row before": "Coller la ligne avant",
-"Scope": "Etendue",
-"Delete table": "Supprimer le tableau",
-"H Align": "Alignement H",
-"Top": "Haut",
-"Header cell": "Cellule d'en-t\u00eate",
-"Column": "Colonne",
-"Row group": "Groupe de lignes",
-"Cell": "Cellule",
-"Middle": "Milieu",
-"Cell type": "Type de cellule",
-"Copy row": "Copier la ligne",
-"Row properties": "Propri\u00e9t\u00e9s de la ligne",
-"Table properties": "Propri\u00e9t\u00e9s du tableau",
-"Bottom": "Bas",
-"V Align": "Alignement V",
-"Header": "En-t\u00eate",
-"Right": "Droite",
-"Insert column after": "Ins\u00e9rer une colonne apr\u00e8s",
-"Cols": "Colonnes",
-"Insert row after": "Ins\u00e9rer une ligne apr\u00e8s",
-"Width": "Largeur",
-"Cell properties": "Propri\u00e9t\u00e9s de la cellule",
-"Left": "Gauche",
-"Cut row": "Couper la ligne",
-"Delete column": "Effacer la colonne",
-"Center": "Centr\u00e9",
-"Merge cells": "Fusionner les cellules",
-"Insert template": "Ajouter un th\u00e8me",
-"Templates": "Th\u00e8mes",
-"Background color": "Couleur d'arri\u00e8re-plan",
-"Custom...": "Personnalis\u00e9...",
-"Custom color": "Couleur personnalis\u00e9e",
-"No color": "Aucune couleur",
-"Text color": "Couleur du texte",
-"Show blocks": "Afficher les blocs",
-"Show invisible characters": "Afficher les caract\u00e8res invisibles",
-"Words: {0}": "Mots : {0}",
-"Insert": "Ins\u00e9rer",
-"File": "Fichier",
-"Edit": "Editer",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide.",
-"Tools": "Outils",
-"View": "Voir",
-"Table": "Tableau",
-"Format": "Format"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/ga.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('ga',{
-"Redo": "Athdh\u00e9an",
-"Undo": "Cealaigh",
-"Cut": "Gearr",
-"Copy": "C\u00f3ipe\u00e1il",
-"Paste": "Greamaigh",
-"Select all": "Roghnaigh uile",
-"New document": "C\u00e1ip\u00e9is nua",
-"Ok": "OK",
-"Cancel": "Cealaigh",
-"Visual aids": "\u00c1iseanna amhairc",
-"Bold": "Trom",
-"Italic": "Iod\u00e1lach",
-"Underline": "Fol\u00edne",
-"Strikethrough": "L\u00edne tr\u00edd",
-"Superscript": "Forscript",
-"Subscript": "Foscript",
-"Clear formatting": "Glan form\u00e1idi\u00fa",
-"Align left": "Ail\u00ednigh ar chl\u00e9",
-"Align center": "Ail\u00ednigh sa l\u00e1r",
-"Align right": "Ail\u00ednigh ar dheis",
-"Justify": "Comhfhadaigh",
-"Bullet list": "Liosta Urchar",
-"Numbered list": "Liosta Uimhrithe",
-"Decrease indent": "Laghdaigh eang",
-"Increase indent": "M\u00e9adaigh eang",
-"Close": "D\u00fan",
-"Formats": "Form\u00e1id\u00ed",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "N\u00ed f\u00e9idir le do bhrabhs\u00e1la\u00ed teacht go d\u00edreach ar an ngearrthaisce. Bain \u00fas\u00e1id as na haicearra\u00ed Ctrl+X\/C\/V. ",
-"Headers": "Ceannt\u00e1sca",
-"Header 1": "Ceannt\u00e1sc 1",
-"Header 2": "Ceannt\u00e1sc 2",
-"Header 3": "Ceannt\u00e1sc 3",
-"Header 4": "Ceannt\u00e1sc 4",
-"Header 5": "Ceannt\u00e1sc 5",
-"Header 6": "Ceannt\u00e1sc 6",
-"Headings": "Ceannteidil",
-"Heading 1": "Ceannteideal 1",
-"Heading 2": "Ceannteideal 2",
-"Heading 3": "Ceannteideal 3",
-"Heading 4": "Ceannteideal 4",
-"Heading 5": "Ceannteideal 5",
-"Heading 6": "Ceannteideal 6",
-"Preformatted": "R\u00e9amhfhorm\u00e1idithe",
-"Div": "Deighilt",
-"Pre": "R\u00e9amh",
-"Code": "C\u00f3d",
-"Paragraph": "Alt",
-"Blockquote": "Athfhriotal",
-"Inline": "Inl\u00edne",
-"Blocks": "Blocanna",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Sa m\u00f3d gn\u00e1th-th\u00e9acs anois. Gream\u00f3far \u00e1bhar mar ghn\u00e1th-th\u00e9acs go dt\u00ed go m\u00fachfaidh t\u00fa an rogha seo.",
-"Font Family": "Cl\u00f3fhoireann",
-"Font Sizes": "Cl\u00f3mh\u00e9ideanna",
-"Class": "Aicme",
-"Browse for an image": "Brabhs\u00e1il le haghaidh \u00edomh\u00e1",
-"OR": "N\u00d3",
-"Drop an image here": "Scaoil \u00edomh\u00e1 anseo",
-"Upload": "Uasl\u00f3d\u00e1il",
-"Block": "Bloc",
-"Align": "Ail\u00ednigh",
-"Default": "R\u00e9amhshocr\u00fa",
-"Circle": "Ciorcal",
-"Disc": "Diosca",
-"Square": "Cearn\u00f3g",
-"Lower Alpha": "Alfa Beag",
-"Lower Greek": "Litir Bheag Ghr\u00e9agach",
-"Lower Roman": "Litir Bheag R\u00f3mh\u00e1nach",
-"Upper Alpha": "Alfa M\u00f3r",
-"Upper Roman": "Litir Mh\u00f3r R\u00f3mh\u00e1nach",
-"Anchor": "Ancaire",
-"Name": "Ainm",
-"Id": "Aitheantas",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "N\u00ed m\u00f3r don aitheantas tos\u00fa le litir, agus gan ach litreacha, uimhreacha, daiseanna, poncanna, idirstadanna, n\u00f3 fostr\u00edoca ina dhiaidh sin.",
-"You have unsaved changes are you sure you want to navigate away?": "T\u00e1 athruithe gan s\u00e1bh\u00e1il ann. An bhfuil t\u00fa cinnte gur mhaith leat imeacht amach as seo?",
-"Restore last draft": "Oscail an dr\u00e9acht is d\u00e9ana\u00ed",
-"Special character": "Carachtar speisialta",
-"Source code": "C\u00f3d foinseach",
-"Insert\/Edit code sample": "Cuir sampla c\u00f3id isteach\/in eagar",
-"Language": "Teanga",
-"Code sample": "Sampla c\u00f3id",
-"Color": "Dath",
-"R": "D",
-"G": "U",
-"B": "G",
-"Left to right": "Cl\u00e9-go-deas",
-"Right to left": "Deas-go-cl\u00e9",
-"Emoticons": "Straoiseoga",
-"Document properties": "Air\u00edonna na C\u00e1ip\u00e9ise",
-"Title": "Teideal",
-"Keywords": "Lorgfhocail",
-"Description": "Cur S\u00edos",
-"Robots": "R\u00f3bait",
-"Author": "\u00dadar",
-"Encoding": "Ionch\u00f3d\u00fa",
-"Fullscreen": "L\u00e1nsc\u00e1ile\u00e1n",
-"Action": "Gn\u00edomh",
-"Shortcut": "Aicearra",
-"Help": "Cabhair",
-"Address": "Seoladh",
-"Focus to menubar": "F\u00f3cas sa bharra roghchl\u00e1ir",
-"Focus to toolbar": "F\u00f3cas sa bharra uirlis\u00ed",
-"Focus to element path": "F\u00f3cas sa chonair eiliminte",
-"Focus to contextual toolbar": "F\u00f3cas sa bharra uirlis\u00ed comhth\u00e9acs\u00fail",
-"Insert link (if link plugin activated)": "Cuir nasc isteach (m\u00e1 t\u00e1 an breise\u00e1n naisc ar si\u00fal)",
-"Save (if save plugin activated)": "S\u00e1bh\u00e1il (m\u00e1 t\u00e1 an breise\u00e1n s\u00e1bh\u00e1la ar si\u00fal)",
-"Find (if searchreplace plugin activated)": "Aimsigh (m\u00e1 t\u00e1 an breise\u00e1n cuardaigh ar si\u00fal)",
-"Plugins installed ({0}):": "Breise\u00e1in shuite\u00e1ilte ({0}):",
-"Premium plugins:": "Scothbhreise\u00e1in:",
-"Learn more...": "Tuilleadh eolais...",
-"You are using {0}": "T\u00e1 t\u00fa ag \u00fas\u00e1id {0}",
-"Plugins": "Breise\u00e1in",
-"Handy Shortcuts": "Aicearra\u00ed \u00das\u00e1ideacha",
-"Horizontal line": "L\u00edne chothrom\u00e1nach",
-"Insert\/edit image": "Cuir \u00edomh\u00e1 isteach\/in eagar",
-"Image description": "Cur s\u00edos ar an \u00edomh\u00e1",
-"Source": "Foinse",
-"Dimensions": "Tois\u00ed",
-"Constrain proportions": "Comhr\u00e9ir faoi ghlas",
-"General": "Ginear\u00e1lta",
-"Advanced": "Casta",
-"Style": "St\u00edl",
-"Vertical space": "Sp\u00e1s ingearach",
-"Horizontal space": "Sp\u00e1s cothrom\u00e1nach",
-"Border": "Iml\u00edne",
-"Insert image": "Cuir \u00edomh\u00e1 isteach",
-"Image": "\u00cdomh\u00e1",
-"Image list": "Liosta \u00edomh\u00e1nna",
-"Rotate counterclockwise": "Rothlaigh ar tuathal",
-"Rotate clockwise": "Rothlaigh ar deiseal",
-"Flip vertically": "Cas go hingearach",
-"Flip horizontally": "Cas go cothrom\u00e1nach",
-"Edit image": "Cuir an \u00edomh\u00e1 in eagar",
-"Image options": "Roghanna \u00edomh\u00e1",
-"Zoom in": "Z\u00fam\u00e1il isteach",
-"Zoom out": "Z\u00fam\u00e1il amach",
-"Crop": "Bear",
-"Resize": "Athraigh m\u00e9id",
-"Orientation": "Treoshu\u00edomh",
-"Brightness": "Gile",
-"Sharpen": "G\u00e9araigh",
-"Contrast": "Codarsnacht",
-"Color levels": "Leibh\u00e9il datha",
-"Gamma": "G\u00e1ma",
-"Invert": "Inbh\u00e9artaigh",
-"Apply": "Cuir i bhfeidhm",
-"Back": "Siar",
-"Insert date\/time": "Cuir d\u00e1ta\/am isteach",
-"Date\/time": "D\u00e1ta\/am",
-"Insert link": "Cuir nasc isteach",
-"Insert\/edit link": "Cuir nasc isteach\/in eagar",
-"Text to display": "T\u00e9acs le taispe\u00e1int",
-"Url": "URL",
-"Target": "Sprioc",
-"None": "Dada",
-"New window": "Fuinneog nua",
-"Remove link": "Bain an nasc",
-"Anchors": "Ancair\u00ed",
-"Link": "Nasc",
-"Paste or type a link": "Greamaigh n\u00f3 cl\u00f3scr\u00edobh nasc",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Is seoladh r\u00edomhphoist \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach mailto: a chur leis?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Is nasc seachtrach \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach http:\/\/ a chur leis?",
-"Link list": "Liosta nascanna",
-"Insert video": "Cuir f\u00edse\u00e1n isteach",
-"Insert\/edit video": "Cuir f\u00edse\u00e1n isteach\/in eagar",
-"Insert\/edit media": "Cuir me\u00e1n isteach\/in eagar",
-"Alternative source": "Foinse mhalartach",
-"Poster": "P\u00f3staer",
-"Paste your embed code below:": "Greamaigh do ch\u00f3d leabaithe th\u00edos:",
-"Embed": "Leabaigh",
-"Media": "Me\u00e1in",
-"Nonbreaking space": "Sp\u00e1s neamhbhristeach",
-"Page break": "Briseadh leathanaigh",
-"Paste as text": "Greamaigh mar th\u00e9acs",
-"Preview": "R\u00e9amhamharc",
-"Print": "Priont\u00e1il",
-"Save": "S\u00e1bh\u00e1il",
-"Find": "Aimsigh",
-"Replace with": "Ionadaigh le",
-"Replace": "Ionadaigh",
-"Replace all": "Ionadaigh uile",
-"Prev": "Siar",
-"Next": "Ar aghaidh",
-"Find and replace": "Aimsigh agus ionadaigh",
-"Could not find the specified string.": "N\u00edor aims\u00edodh an teaghr\u00e1n.",
-"Match case": "C\u00e1s-\u00edogair",
-"Whole words": "Focail ioml\u00e1na",
-"Spellcheck": "Seice\u00e1il an litri\u00fa",
-"Ignore": "D\u00e9an neamhaird air",
-"Ignore all": "D\u00e9an neamhaird orthu go l\u00e9ir",
-"Finish": "Cr\u00edochnaigh",
-"Add to Dictionary": "Cuir leis an bhFocl\u00f3ir \u00e9",
-"Insert table": "Ions\u00e1igh t\u00e1bla",
-"Table properties": "Air\u00edonna an t\u00e1bla",
-"Delete table": "Scrios an t\u00e1bla",
-"Cell": "Cill",
-"Row": "R\u00f3",
-"Column": "Col\u00fan",
-"Cell properties": "Air\u00edonna na cille",
-"Merge cells": "Cumaisc cealla",
-"Split cell": "Roinn cill",
-"Insert row before": "Ions\u00e1igh r\u00f3 os a chionn",
-"Insert row after": "Ions\u00e1igh r\u00f3 faoi",
-"Delete row": "Scrios an r\u00f3",
-"Row properties": "Air\u00edonna an r\u00f3",
-"Cut row": "Gearr an r\u00f3",
-"Copy row": "C\u00f3ipe\u00e1il an r\u00f3",
-"Paste row before": "Greamaigh r\u00f3 os a chionn",
-"Paste row after": "Greamaigh r\u00f3 faoi",
-"Insert column before": "Ions\u00e1igh col\u00fan ar chl\u00e9",
-"Insert column after": "Ions\u00e1igh col\u00fan ar dheis",
-"Delete column": "Scrios an col\u00fan",
-"Cols": "Col\u00fain",
-"Rows": "R\u00f3nna",
-"Width": "Leithead",
-"Height": "Airde",
-"Cell spacing": "Sp\u00e1s\u00e1il ceall",
-"Cell padding": "Stu\u00e1il ceall",
-"Caption": "Fotheideal",
-"Left": "Ar Chl\u00e9",
-"Center": "Sa L\u00e1r",
-"Right": "Ar Dheis",
-"Cell type": "Cine\u00e1l na cille",
-"Scope": "Sc\u00f3ip",
-"Alignment": "Ail\u00edni\u00fa",
-"H Align": "Ail\u00edni\u00fa C.",
-"V Align": "Ail\u00edni\u00fa I.",
-"Top": "Barr",
-"Middle": "L\u00e1r",
-"Bottom": "Bun",
-"Header cell": "Cill cheannt\u00e1isc",
-"Row group": "Gr\u00fapa r\u00f3nna",
-"Column group": "Gr\u00fapa col\u00fan",
-"Row type": "Cine\u00e1l an r\u00f3",
-"Header": "Ceannt\u00e1sc",
-"Body": "Corp",
-"Footer": "Bunt\u00e1sc",
-"Border color": "Dath na himl\u00edne",
-"Insert template": "Ions\u00e1igh teimpl\u00e9ad",
-"Templates": "Teimpl\u00e9id",
-"Template": "Teimpl\u00e9ad",
-"Text color": "Dath an t\u00e9acs",
-"Background color": "Dath an ch\u00falra",
-"Custom...": "Saincheap...",
-"Custom color": "Dath saincheaptha",
-"No color": "Gan dath",
-"Table of Contents": "Cl\u00e1r na n\u00c1bhar",
-"Show blocks": "Taispe\u00e1in blocanna",
-"Show invisible characters": "Taispe\u00e1in carachtair dhofheicthe",
-"Words: {0}": "Focail: {0}",
-"{0} words": "{0} focal",
-"File": "Comhad",
-"Edit": "Eagar",
-"Insert": "Ions\u00e1ig",
-"View": "Amharc",
-"Format": "Form\u00e1id",
-"Table": "T\u00e1bla",
-"Tools": "Uirlis\u00ed",
-"Powered by {0}": "\u00c1 chumhacht\u00fa ag {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Limist\u00e9ar M\u00e9ith-Th\u00e9acs. Br\u00faigh ALT-F9 le haghaidh roghchl\u00e1ir, ALT-F10 le haghaidh barra uirlis\u00ed, agus ALT-0 le c\u00fanamh a fh\u00e1il"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/gd.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('gd',{
-"Cut": "Gearr \u00e0s",
-"Heading 5": "Ceann-sgr\u00ecobhadh 5",
-"Header 2": "Bann-cinn 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Chan eil am brabhsair agad a' cur taic ri inntrigeadh d\u00ecreach dhan st\u00f2r-bh\u00f2rd. Cleachd ath-ghoiridean a' mheur-chl\u00e0ir, Ctrl+X\/V\/V 'nan \u00e0ite.",
-"Heading 4": "Ceann-sgr\u00ecobhadh 4",
-"Div": "Div",
-"Heading 2": "Ceann-sgr\u00ecobhadh 2",
-"Paste": "Cuir ann",
-"Close": "D\u00f9in",
-"Font Family": "Teaghlach a' chrutha-chl\u00f2",
-"Pre": "Pre",
-"Align right": "Co-thaobhaich ris an l\u00e0imh dheas",
-"New document": "Sgr\u00ecobhainn \u00f9r",
-"Blockquote": "Bloc-luaidh",
-"Numbered list": "Liosta \u00e0ireamhaichte",
-"Heading 1": "Ceann-sgr\u00ecobhadh 1",
-"Headings": "Ceann-sgr\u00ecobhaidhean",
-"Increase indent": "Meudaich an eag",
-"Formats": "F\u00f2rmatan",
-"Headers": "Bannan-cinn",
-"Select all": "Tagh na h-uile",
-"Header 3": "Bann-cinn 3",
-"Blocks": "Blocaichean",
-"Undo": "Neo-dh\u00e8an",
-"Strikethrough": "Loidhne troimhe",
-"Bullet list": "Liosta pheilearaichte",
-"Header 1": "Bann-cinn 1",
-"Superscript": "Os-sgr\u00ecobhte",
-"Clear formatting": "Falamhaich am f\u00f2rmatadh",
-"Font Sizes": "Meudan nan cruthan-chl\u00f2",
-"Subscript": "Bun-sgr\u00ecobhte",
-"Header 6": "Bann-cinn 6",
-"Redo": "Ath-dh\u00e8an",
-"Paragraph": "Paragraf",
-"Ok": "Ceart ma-th\u00e0",
-"Bold": "Trom",
-"Code": "C\u00f2d",
-"Italic": "Eadailteach",
-"Align center": "Co-thaobhaich ris a' mheadhan",
-"Header 5": "Bann-cinn 5",
-"Heading 6": "Ceann-sgr\u00ecobhadh 6",
-"Heading 3": "Ceann-sgr\u00ecobhadh 3",
-"Decrease indent": "Lughdaich an eag",
-"Header 4": "Bann-cinn 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Ma chuireas tu rud ann a-nis, th\u00e8id an t-susbaint a chur ann mar theacsa lom gus an cuir thu dheth an roghainn seo a-rithist.",
-"Underline": "Fo-loidhne",
-"Cancel": "Sguir dheth",
-"Justify": "Blocaich",
-"Inline": "Taobh a-staigh na loidhne",
-"Copy": "D\u00e8an lethbhreac",
-"Align left": "Co-thaobhaich ris an l\u00e0imh chl\u00ec",
-"Visual aids": "Taic l\u00e8irsinne",
-"Lower Greek": "Litrichean Greugach beaga",
-"Square": "Ce\u00e0rnag",
-"Default": "Bun-roghainn",
-"Lower Alpha": "Aibidileach is beag",
-"Circle": "Cearcall",
-"Disc": "Diosga",
-"Upper Alpha": "Aibidileach is m\u00f2r",
-"Upper Roman": "\u00c0ireamhan R\u00f2manach is m\u00f2r",
-"Lower Roman": "\u00c0ireamhan R\u00f2manach is beag",
-"Name": "Ainm",
-"Anchor": "Acair",
-"You have unsaved changes are you sure you want to navigate away?": "Tha atharraichean gun s\u00e0bhaladh agad, a bheil thu cinnteach gu bheil thu airson gluasad air falbh?",
-"Restore last draft": "Aisig an dreach mu dheireadh",
-"Special character": "Caractar s\u00f2nraichte",
-"Source code": "An c\u00f2d t\u00f9sail",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Dath",
-"Right to left": "Deas gu cl\u00ec",
-"Left to right": "Cl\u00ec gu deas",
-"Emoticons": "Samhlaidhean-gn\u00f9ise",
-"Robots": "Robotairean",
-"Document properties": "Roghainnean na sgr\u00ecobhainne",
-"Title": "Tiotal",
-"Keywords": "Faclan-luirg",
-"Encoding": "C\u00f2dachadh",
-"Description": "Tuairisgeul",
-"Author": "\u00d9ghdar",
-"Fullscreen": "L\u00e0n-sgr\u00ecn",
-"Horizontal line": "Loidhne ch\u00f2mhnard",
-"Horizontal space": "\u00c0ite c\u00f2mhnard",
-"Insert\/edit image": "Cuir a-steach\/Deasaich an dealbh",
-"General": "Coitcheann",
-"Advanced": "Adhartach",
-"Source": "T\u00f9s",
-"Border": "Iomall",
-"Constrain proportions": "Cuingich na co-r\u00e8irean",
-"Vertical space": "\u00c0ite inghearach",
-"Image description": "Tuairisgeul an deilbh",
-"Style": "Stoidhle",
-"Dimensions": "Meudachd",
-"Insert image": "Cuir a-steach dealbh",
-"Zoom in": "S\u00f9m a-steach",
-"Contrast": "Iomsgaradh",
-"Back": "Air ais",
-"Gamma": "Gamma",
-"Flip horizontally": "Thoir flip air a\u2019 ch\u00f2mhnard",
-"Resize": "Atharraich am meud",
-"Sharpen": "Geuraich",
-"Zoom out": "S\u00f9m a-mach",
-"Image options": "Roghainnean an deilbh",
-"Apply": "Cuir an s\u00e0s",
-"Brightness": "Soilleireachd",
-"Rotate clockwise": "Cuairtich gu deiseil",
-"Rotate counterclockwise": "Cuairtich gu tuathail",
-"Edit image": "Deasaich an dealbh",
-"Color levels": "\u00ccrean nan dathan",
-"Crop": "Bearr",
-"Orientation": "Comhair",
-"Flip vertically": "Thoir flip gu inghearach",
-"Invert": "Ais-thionndaidh",
-"Insert date\/time": "Cuir a-steach ceann-l\u00e0\/\u00e0m",
-"Remove link": "Thoir air falbh an ceangal",
-"Url": "URL",
-"Text to display": "An teacsa a th\u00e8id a shealltainn",
-"Anchors": "Acraichean",
-"Insert link": "Cuir a-steach ceangal",
-"New window": "Uinneag \u00f9r",
-"None": "Chan eil gin",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Tha coltas gu bheil an URL a chuir thu a-steach 'na cheangal ris an taobh a-muigh. A bheil thu airson an ro-leasachan http:\/\/ a chur ris? Tha feum air.",
-"Target": "Targaid",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Tha coltas gu bheil an URL a chuir thu a-steach 'na she\u00f2ladh puist-d. A bheil thu airson an ro-leasachan mailto: a chur ris? Tha feum air.",
-"Insert\/edit link": "Cuir a-steach\/Deasaich an ceangal",
-"Insert\/edit video": "Cuir a-steach\/Deasaich a' video",
-"Poster": "P\u00f2stair",
-"Alternative source": "Roghainn eile de th\u00f9s",
-"Paste your embed code below:": "Cuir an c\u00f2d leabachaidh agad a-steach gu h-\u00ecosal:",
-"Insert video": "Cuir a-steach video",
-"Embed": "Leabaich",
-"Nonbreaking space": "Be\u00e0rn neo-bhristidh",
-"Page break": "Briseadh-duilleige",
-"Paste as text": "Cuir ann mar theacsa",
-"Preview": "Ro-shealladh",
-"Print": "Cl\u00f2-bhuail",
-"Save": "S\u00e0bhail",
-"Could not find the specified string.": "Cha b' urrainn dhuinn na dh'iarr thu a lorg.",
-"Replace": "Cuir 'na \u00e0ite",
-"Next": "Air adhart",
-"Whole words": "Faclan sl\u00e0na",
-"Find and replace": "Lorg is cuir 'na \u00e0ite",
-"Replace with": "Cuir na leanas 'na \u00e0ite",
-"Find": "Lorg",
-"Replace all": "Cuir an \u00e0ite na h-uile",
-"Match case": "Maids litrichean m\u00f2ra 's beaga",
-"Prev": "Air ais",
-"Spellcheck": "Dearbhaich an litreachadh",
-"Finish": "Cr\u00ecochnaich",
-"Ignore all": "Leig seachad na h-uile",
-"Ignore": "Leig seachad",
-"Add to Dictionary": "Cuir ris an fhaclair",
-"Insert row before": "Cuir a-steach r\u00e0gh roimhe",
-"Rows": "R\u00e0ghan",
-"Height": "\u00c0irde",
-"Paste row after": "Cuir ann r\u00e0gh 'na dh\u00e8idh",
-"Alignment": "Co-thaobhadh",
-"Border color": "Dath an iomaill",
-"Column group": "Buidheann cholbhan",
-"Row": "R\u00e0gh",
-"Insert column before": "Cuir a-steach colbh roimhe",
-"Split cell": "Sgoilt an cealla",
-"Cell padding": "Padadh nan ceallan",
-"Cell spacing": "Be\u00e0rnadh nan ceallan",
-"Row type": "Se\u00f2rsa an r\u00e0igh",
-"Insert table": "Cuir a-steach cl\u00e0r",
-"Body": "Bodhaig",
-"Caption": "Caipsean",
-"Footer": "Bann-coise",
-"Delete row": "Sguab \u00e0s an r\u00e0gh",
-"Paste row before": "Cuir ann r\u00e0gh roimhe",
-"Scope": "Sg\u00f2p",
-"Delete table": "Sguab \u00e0s an cl\u00e0r",
-"H Align": "Co-thaobhadh c\u00f2mhnard",
-"Top": "Barr",
-"Header cell": "Cealla a' bhanna-chinn",
-"Column": "Colbh",
-"Row group": "Buidheann r\u00e0ghan",
-"Cell": "Cealla",
-"Middle": "Meadhan",
-"Cell type": "Se\u00f2rsa a' chealla",
-"Copy row": "D\u00e8an lethbhreac dhen r\u00e0gh",
-"Row properties": "Roghainnean an r\u00e0igh",
-"Table properties": "Roghainnean a' chl\u00e0ir",
-"Bottom": "Bonn",
-"V Align": "Co-thaobhadh inghearach",
-"Header": "Bann-cinn",
-"Right": "Deas",
-"Insert column after": "Cuir a-steach colbh 'na dh\u00e8idh",
-"Cols": "Colbhan",
-"Insert row after": "Cuir a-steach r\u00e0gh 'na dh\u00e8idh",
-"Width": "Leud",
-"Cell properties": "Roghainnean a' chealla",
-"Left": "Cl\u00ec",
-"Cut row": "Gearr \u00e0s an r\u00e0gh",
-"Delete column": "Sguab \u00e0s an colbh",
-"Center": "Meadhan",
-"Merge cells": "Co-aonaich na ceallan",
-"Insert template": "Cuir a-steach teamplaid",
-"Templates": "Teamplaidean",
-"Background color": "Dath a\u2019 ch\u00f9laibh",
-"Custom...": "Gn\u00e0thaichte...",
-"Custom color": "Dath gn\u00e0thaichte",
-"No color": "Gun dath",
-"Text color": "Dath an teacsa",
-"Show blocks": "Seall na blocaichean",
-"Show invisible characters": "Seall na caractaran do-fhaicsinneach",
-"Words: {0}": "Faclan: {0}",
-"Insert": "Cuir a-steach",
-"File": "Faidhle",
-"Edit": "Deasaich",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Raon Rich Text. Br\u00f9th ALT-F9 airson a' chl\u00e0ir-thaice. Br\u00f9th ALT-F10 airson a' bh\u00e0r-inneal. Br\u00f9th ALT-0 airson na cobharach.",
-"Tools": "Innealan",
-"View": "Sealladh",
-"Table": "Cl\u00e0r",
-"Format": "F\u00f2rmat"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/gl.js Deleted

@@ -1,388 +0,0 @@
-tinymce.addI18n('gl',{
-"Redo": "Refacer",
-"Undo": "Desfacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Novo documento",
-"Ok": "Aceptar",
-"Cancel": "Cancelar",
-"Visual aids": "Axudas visuais",
-"Bold": "Negra",
-"Italic": "Cursiva",
-"Underline": "Subli\u00f1ado",
-"Strikethrough": "Riscado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Limpar o formato",
-"Align left": "Ali\u00f1ar \u00e1 esquerda",
-"Align center": "Ali\u00f1ar ao centro",
-"Align right": "Ali\u00f1ar \u00e1 dereita",
-"Justify": "Xustificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Reducir a sangr\u00eda",
-"Increase indent": "Aumentar a sangr\u00eda",
-"Close": "Pechar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador non admite o acceso directo ao portapapeis. Empregue os atallos de teclado Ctrl+X\/C\/V no seu canto.",
-"Headers": "Cabeceiras",
-"Header 1": "Cabeceira 1",
-"Header 2": "Cabeceira 2",
-"Header 3": "Cabeceira 3",
-"Header 4": "Cabeceira 4",
-"Header 5": "Cabeceira 5",
-"Header 6": "Cabeceira 6",
-"Headings": "T\u00edtulo",
-"Heading 1": "T\u00edtulo 1",
-"Heading 2": "T\u00edtulo 2",
-"Heading 3": "T\u00edtulo 3",
-"Heading 4": "T\u00edtulo 4",
-"Heading 5": "T\u00edtulo 5",
-"Heading 6": "T\u00edtulo 6",
-"Preformatted": "Preformatado",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "Par\u00e1grafo",
-"Blockquote": "Bloque entre comi\u00f1as",
-"Inline": "En li\u00f1a",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Neste momento o pegado est\u00e1 definido en modo de texto simple. Os contidos p\u00e9garanse como texto sen formato ata que se active esta opci\u00f3n.",
-"Fonts": "Tipos de letra",
-"Font Sizes": "Tama\u00f1o da letra",
-"Class": "Clase",
-"Browse for an image": "Buscar unha imaxe",
-"OR": "OU",
-"Drop an image here": "Soltar unha imaxe",
-"Upload": "Cargar",
-"Block": "Bloque",
-"Align": "Ali\u00f1amento",
-"Default": "Predeterminada",
-"Circle": "Circulo",
-"Disc": "Disco",
-"Square": "Cadrado",
-"Lower Alpha": "Alfa min\u00fascula",
-"Lower Greek": "Grega min\u00fascula",
-"Lower Roman": "Romana min\u00fascula",
-"Upper Alpha": "Alfa mai\u00fascula",
-"Upper Roman": "Romana mai\u00fascula",
-"Anchor...": "Ancoraxe...",
-"Name": "Nome",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "O ID debe comezar cunha letra, seguida s\u00f3 por letras, n\u00fameros, gui\u00f3ns, puntos, dos puntos ou gui\u00f3ns baixos.",
-"You have unsaved changes are you sure you want to navigate away?": "Ten cambios sen gardar. Confirma que quere sa\u00edr?",
-"Restore last draft": "Restaurar o \u00faltimo borrador",
-"Special characters...": "Caracteres especiais...",
-"Source code": "C\u00f3digo fonte",
-"Insert\/Edit code sample": "Inserir\/editar mostra de c\u00f3digo",
-"Language": "Idioma",
-"Code sample...": "Mostra de c\u00f3digo...",
-"Color Picker": "Selector de cor",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "De esquerda a dereita",
-"Right to left": "De dereita a esquerda",
-"Emoticons...": "Emoticonas...",
-"Metadata and Document Properties": "Metadatos e propiedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descrici\u00f3n",
-"Robots": "Robots",
-"Author": "Autor",
-"Encoding": "Codificaci\u00f3n",
-"Fullscreen": "Pantalla completa",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Engadidos",
-"Handy Shortcuts": "Atallos \u00fatiles",
-"Horizontal line": "Li\u00f1a horizontal",
-"Insert\/edit image": "Inserir\/editar imaxe",
-"Image description": "Descrici\u00f3n da imaxe",
-"Source": "Orixe",
-"Dimensions": "Dimensi\u00f3ns",
-"Constrain proportions": "Restrinxir as proporci\u00f3ns",
-"General": "Xeral",
-"Advanced": "Avanzado",
-"Style": "Estilo",
-"Vertical space": "Espazo vertical",
-"Horizontal space": "Espazo horizontal",
-"Border": "Bordo",
-"Insert image": "Inserir imaxe",
-"Image...": "Imaxe...",
-"Image list": "Lista de imaxes",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Color levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "Inserir data\/hora",
-"Date\/time": "Data\/hora",
-"Insert\/Edit Link": "Inserir\/editar ligaz\u00f3n",
-"Insert\/edit link": "Inserir\/editar ligaz\u00f3n",
-"Text to display": "Texto que amosar",
-"Url": "URL",
-"Open link in...": "Abrir a ligaz\u00f3n en...",
-"Current window": "Xanela actual",
-"None": "Ning\u00fan",
-"New window": "Nova xanela",
-"Remove link": "Retirar a ligaz\u00f3n",
-"Anchors": "Ancoraxes",
-"Link...": "Ligaz\u00f3n...",
-"Paste or type a link": "Pegue ou escriba unha ligaz\u00f3n",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "O URL que introduciu semella seren un enderezo de correo. Quere engadirlle o prefixo mailto: requirido?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "O URL que introduciu semella seren unha ligaz\u00f3n externa. Quere engadirlle o prefixo http:\/\/ requirido?",
-"Link list": "Lista de ligaz\u00f3ns",
-"Insert video": "Inserir v\u00eddeo",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Insert\/edit media": "Inserir\/editar medios",
-"Alternative source": "Orixe alternativa",
-"Alternative source URL": "URL da orixe alternativa",
-"Media poster (Image URL)": "Cartel multimedia (URL da imaxe)",
-"Paste your embed code below:": "Pegue embaixo o c\u00f3digo integrado:",
-"Embed": "Integrado",
-"Media...": "Multimedia...",
-"Nonbreaking space": "Espazo irromp\u00edbel",
-"Page break": "Quebra de p\u00e1xina",
-"Paste as text": "Pegar como texto",
-"Preview": "Vista previa",
-"Print...": "Imprimir...",
-"Save": "Gardar",
-"Find": "Buscar",
-"Replace with": "Substitu\u00edr con",
-"Replace": "Substitu\u00edr",
-"Replace all": "Substitu\u00edr todo",
-"Previous": "Anterior",
-"Next": "Seguinte",
-"Find and replace...": "Atopar e substitu\u00edr...",
-"Could not find the specified string.": "Non foi pos\u00edbel atopar a cadea de texto especificada.",
-"Match case": "Distinguir mai\u00fasculas",
-"Find whole words only": "Atopar unicamente as palabras enteiras",
-"Spell check": "Corrector ortogr\u00e1fico",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todo",
-"Finish": "Rematar",
-"Add to Dictionary": "Engadir ao dicionario",
-"Insert table": "Inserir t\u00e1boa",
-"Table properties": "Propiedades da t\u00e1boa",
-"Delete table": "Eliminar t\u00e1boa",
-"Cell": "Cela",
-"Row": "Fila",
-"Column": "Columna",
-"Cell properties": "Propiedades da cela",
-"Merge cells": "Combinar celas",
-"Split cell": "Dividir celas",
-"Insert row before": "Inserir unha fila enriba",
-"Insert row after": "Inserir unha fila embaixo",
-"Delete row": "Eliminar fila",
-"Row properties": "Propiedades das filas",
-"Cut row": "Cortar fila",
-"Copy row": "Copiar fila",
-"Paste row before": "Pegar fila embaixo",
-"Paste row after": "Pegar fila enriba",
-"Insert column before": "Inserir columna \u00e1 esquerda",
-"Insert column after": "Inserir columna \u00e1 dereita",
-"Delete column": "Eliminar columna",
-"Cols": "Cols.",
-"Rows": "Filas",
-"Width": "Largo",
-"Height": "Alto",
-"Cell spacing": "Marxe entre celas",
-"Cell padding": "Marxe interior da cela",
-"Show caption": "Amosar subt\u00edtulo",
-"Left": "Esquerda",
-"Center": "Centro",
-"Right": "Dereita",
-"Cell type": "Tipo de cela",
-"Scope": "\u00c1mbito",
-"Alignment": "Ali\u00f1amento",
-"H Align": "Ali\u00f1amento H",
-"V Align": "Ali\u00f1amento V",
-"Top": "Arriba",
-"Middle": "Medio",
-"Bottom": "Abaixo",
-"Header cell": "Cela de cabeceira",
-"Row group": "Grupo de filas",
-"Column group": "Grupo de columnas",
-"Row type": "Tipo de fila",
-"Header": "Cabeceira",
-"Body": "Corpo",
-"Footer": "Rodap\u00e9",
-"Border color": "Cor do bordo",
-"Insert template...": "Inserir modelo...",
-"Templates": "Modelos",
-"Template": "Modelo",
-"Text color": "Cor do texto",
-"Background color": "Cor do fondo",
-"Custom...": "Personalizado...",
-"Custom color": "Cor personalizado",
-"No color": "Sen cor",
-"Remove color": "Retirar a cor",
-"Table of Contents": "\u00cdndice de contidos",
-"Show blocks": "Amosar os bloques",
-"Show invisible characters": "Amosar caracteres invis\u00edbeis",
-"Word count": "Reconto de palabras",
-"Words: {0}": "Palabras: {0}",
-"{0} words": "{0} palabras",
-"File": "Ficheiro",
-"Edit": "Editar",
-"Insert": "Inserir",
-"View": "Ver",
-"Format": "Formato",
-"Table": "T\u00e1boa",
-"Tools": "Ferramentas",
-"Powered by {0}": "Coa tecnolox\u00eda de {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto mellorado. Prema ALT-F9 para o men\u00fa. Prema ALT-F10 para a barra de ferramentas. Prema ALT-0 para a axuda",
-"Image title": "T\u00edtulo da imaxe",
-"Border width": "Largo do bordo",
-"Border style": "Estilo do bordo",
-"Error": "Erro",
-"Warn": "Aviso",
-"Valid": "V\u00e1lido",
-"To open the popup, press Shift+Enter": "Para abrir a xanela emerxente, prema Mai\u00fas+Intro",
-"Rich Text Area. Press ALT-0 for help.": "\u00c1rea de texto mellorado. PremaALT-0 para obter axuda.",
-"System Font": "Tipo de letra do sistema",
-"Failed to upload image: {0}": "Produciuse un fallo ao cargar a imaxe: {0}",
-"Failed to load plugin: {0} from url {1}": "Produciuse un fallo ao cargar a o engadido: {0} dende o URL {1}",
-"Failed to load plugin url: {0}": "Produciuse un fallo ao cargar a o URL do engadido: {0}",
-"Failed to initialize plugin: {0}": "Produciuse un fallo ao iniciar o engadido: {0}",
-"example": "exemplo",
-"Search": "Buscar",
-"All": "Todo",
-"Currency": "Moeda",
-"Text": "Texto",
-"Quotations": "Citas",
-"Mathematical": "Matem\u00e1tico",
-"Extended Latin": "Latino extendido",
-"Symbols": "S\u00edmbolos",
-"Arrows": "Frechas",
-"User Defined": "Definido polo usuario",
-"dollar sign": "S\u00edmbolo do dolar",
-"currency sign": "S\u00edmbolo de moeda",
-"euro-currency sign": "S\u00edmbolo do euro",
-"colon sign": "S\u00edmbolo do col\u00f3n",
-"cruzeiro sign": "S\u00edmbolo do cruzeiro",
-"french franc sign": "S\u00edmbolo do franco franc\u00e9s",
-"lira sign": "S\u00edmbolo da lira",
-"mill sign": "S\u00edmbolo do mill",
-"naira sign": "S\u00edmbolo da naira",
-"peseta sign": "S\u00edmbolo da peseta",
-"rupee sign": "S\u00edmbolo da rupia",
-"won sign": "S\u00edmbolo do won",
-"new sheqel sign": "S\u00edmbolo do novo s\u00e9quel",
-"dong sign": "S\u00edmbolo do dong",
-"kip sign": "S\u00edmbolo do kip",
-"tugrik sign": "S\u00edmbolo do tugrik",
-"drachma sign": "S\u00edmbolo do dracma",
-"german penny symbol": "S\u00edmbolo do penique alem\u00e1n",
-"peso sign": "S\u00edmbolo do peso",
-"guarani sign": "S\u00edmbolo do guaran\u00ed",
-"austral sign": "S\u00edmbolo do austral",
-"hryvnia sign": "S\u00edmbolo do grivna",
-"cedi sign": "S\u00edmbolo do cedi",
-"livre tournois sign": "S\u00edmbolo da libre tournois",
-"spesmilo sign": "S\u00edmbolo do spesmilo",
-"tenge sign": "S\u00edmbolo do tengue",
-"indian rupee sign": "S\u00edmbolo da rupia india",
-"turkish lira sign": "S\u00edmbolo da lira turca",
-"nordic mark sign": "S\u00edmbolo do marco n\u00f3rdico",
-"manat sign": "S\u00edmbolo do manat",
-"ruble sign": "S\u00edmbolo do rublo",
-"yen character": "Car\u00e1cter do ien",
-"yuan character": "Car\u00e1cter do yuan",
-"yuan character, in hong kong and taiwan": "Car\u00e1cter do yuan, en Hong Kong e Taiwan",
-"yen\/yuan character variant one": "Variante  1 do car\u00e1cter do ien\/yuan",
-"Loading emoticons...": "Cargando emoticonas...",
-"Could not load emoticons": "Non foi pos\u00edbel cargar as emoticonas",
-"People": "Xente",
-"Animals and Nature": "Animais e natureza",
-"Food and Drink": "Comida e bebida",
-"Activity": "Actividade",
-"Travel and Places": "Viaxes e lugares",
-"Objects": "Obxectos",
-"Flags": "Bandeiras",
-"Characters": "Caracteres",
-"Characters (no spaces)": "Caracteres (sen espazos)",
-"Error: Form submit field collision.": "Erro: conflito de campo ao enviar o formulario ",
-"Error: No form element found.": "Erro: non se atopou ning\u00fan elemento de formulario",
-"Update": "Actualizar",
-"Color swatch": "Mostra de cores",
-"Turquoise": "Turquesa",
-"Green": "Verde",
-"Blue": "Azul",
-"Purple": "P\u00farpura",
-"Navy Blue": "Azul mari\u00f1o",
-"Dark Turquoise": "Turquesa escuro",
-"Dark Green": "Verde escuro",
-"Medium Blue": "Azul medio",
-"Medium Purple": "P\u00farpura medio",
-"Midnight Blue": "Azul noite",
-"Yellow": "Amarelo",
-"Orange": "Laranxa",
-"Red": "Vermello",
-"Light Gray": "Gris claro",
-"Gray": "Gris",
-"Dark Yellow": "Amarelo escuro",
-"Dark Orange": "Laranxa escuro",
-"Dark Red": "Vermello escuro",
-"Medium Gray": "Gris medio",
-"Dark Gray": "Gris escuro",
-"Black": "Negro",
-"White": "Branco",
-"Switch to or from fullscreen mode": "Activar ou desactivar o modo de pantalla completa",
-"Open help dialog": "Abrir o di\u00e1logo de axuda",
-"history": "historial",
-"styles": "estilos",
-"formatting": "formatado",
-"alignment": "ali\u00f1amento",
-"indentation": "sangrado",
-"permanent pen": "rotulador permanente",
-"comments": "comentarios",
-"Anchor": "Ancoraxe",
-"Special character": "Car\u00e1cter especial",
-"Color": "Cor",
-"Emoticons": "Emoticonas",
-"Document properties": "Propiedades do documento",
-"Image": "Imaxe",
-"Insert link": "Inserir ligaz\u00f3n",
-"Target": "Destino",
-"Link": "Ligaz\u00f3n",
-"Poster": "Cartel",
-"Media": "Medios",
-"Print": "Imprimir",
-"Prev": "Anterior",
-"Find and replace": "Buscar e substitu\u00edr",
-"Whole words": "Palabras completas",
-"Spellcheck": "Corrector ortogr\u00e1fico",
-"Caption": "Subt\u00edtulo",
-"Insert template": "Inserir modelo"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/hi_IN.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('hi_IN',{
-"Cut": "\u0915\u093e\u091f\u0947\u0902",
-"Heading 5": "\u0936\u0940\u0930\u094d\u0937\u0915 5",
-"Header 2": "\u0936\u0940\u0930\u094d\u0937\u0915 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0906\u092a\u0915\u093e \u091c\u093e\u0932 \u0935\u093f\u091a\u093e\u0930\u0915 \u0938\u0940\u0927\u0947 \u0938\u092e\u0930\u094d\u0925\u0928 \u0928\u0939\u0940\u0902 \u0915\u0930 \u0930\u0939\u093e \u0939\u0948\u0964 \u0915\u0943\u092a\u092f\u093e \u0915\u0941\u0902\u091c\u0940\u092a\u091f\u0932 \u0915\u0947 \u0926\u094d\u0935\u093e\u0930\u093e Ctrl+X\/C\/V \u0915\u093e \u0909\u092a\u092f\u094b\u0917 \u0915\u0930\u0947\u0902\u0964",
-"Heading 4": "\u0936\u0940\u0930\u094d\u0937\u0915 4",
-"Div": "\u0921\u093f\u0935",
-"Heading 2": "\u0936\u0940\u0930\u094d\u0937\u0915 2",
-"Paste": "\u091a\u093f\u092a\u0915\u093e\u090f\u0901",
-"Close": "\u092c\u0902\u0926",
-"Font Family": "\u092b\u093c\u0949\u0928\u094d\u091f \u092a\u0930\u093f\u0935\u093e\u0930",
-"Pre": "\u092a\u0942\u0930\u094d\u0935",
-"Align right": "\u0926\u093e\u090f\u0901 \u0938\u0902\u0930\u0947\u0916\u0923",
-"New document": "\u0928\u092f\u093e \u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c",
-"Blockquote": "\u0916\u0902\u0921-\u0909\u0926\u094d\u0927\u0930\u0923",
-"Numbered list": "\u0915\u094d\u0930\u092e\u093e\u0902\u0915\u093f\u0924 \u0938\u0942\u091a\u0940",
-"Heading 1": "\u0936\u0940\u0930\u094d\u0937\u0915 1",
-"Headings": "\u0936\u0940\u0930\u094d\u0937\u0915",
-"Increase indent": "\u0916\u0930\u094b\u091c \u092c\u095d\u093e\u090f\u0901",
-"Formats": "\u092a\u094d\u0930\u093e\u0930\u0942\u092a",
-"Headers": "\u0936\u0940\u0930\u094d\u0937\u0915",
-"Select all": "\u0938\u092d\u0940 \u091a\u0941\u0928\u0947\u0902",
-"Header 3": "\u0936\u0940\u0930\u094d\u0937\u0915 3",
-"Blocks": "\u0916\u0902\u0921",
-"Undo": "\u092a\u0940\u091b\u0947",
-"Strikethrough": "\u092e\u0927\u094d\u092f \u0938\u0947 \u0915\u093e\u091f\u0947\u0902",
-"Bullet list": "\u0917\u094b\u0932\u0940 \u0938\u0942\u091a\u0940",
-"Header 1": "\u0936\u0940\u0930\u094d\u0937\u0915 1",
-"Superscript": "\u0909\u092a\u0930\u093f\u0932\u093f\u0916\u093f\u0924",
-"Clear formatting": "\u092a\u094d\u0930\u093e\u0930\u0942\u092a\u0923 \u0939\u091f\u093e\u090f\u0901",
-"Font Sizes": "\u092b\u093c\u0949\u0928\u094d\u091f \u0906\u0915\u093e\u0930",
-"Subscript": "\u0928\u093f\u091a\u0932\u0940\u0932\u093f\u0916\u093f\u0924",
-"Header 6": "\u0936\u0940\u0930\u094d\u0937\u0915 6",
-"Redo": "\u0906\u0917\u0947",
-"Paragraph": "\u0905\u0928\u0941\u091a\u094d\u091b\u0947\u0926",
-"Ok": "\u0920\u0940\u0915 \u0939\u0948",
-"Bold": "\u092e\u094b\u091f\u093e",
-"Code": "\u0938\u0902\u0915\u0947\u0924\u0932\u093f\u092a\u093f",
-"Italic": "\u091f\u0947\u095c\u093e",
-"Align center": "\u092e\u0927\u094d\u092f \u0938\u0902\u0930\u0947\u0916\u0923",
-"Header 5": "\u0936\u0940\u0930\u094d\u0937\u0915 5",
-"Heading 6": "\u0936\u0940\u0930\u094d\u0937\u0915 6",
-"Heading 3": "\u0936\u0940\u0930\u094d\u0937\u0915 3",
-"Decrease indent": "\u0916\u0930\u094b\u091c \u0915\u092e \u0915\u0930\u0947\u0902",
-"Header 4": "\u0936\u0940\u0930\u094d\u0937\u0915 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u091a\u093f\u092a\u0915\u093e\u0928\u0947 \u0915\u093e \u092a\u094d\u0930\u0915\u093e\u0930 \u0905\u092d\u0940 \u0938\u093e\u0926\u093e \u092a\u093e\u0920\u094d\u092f \u0939\u0948\u0964 \u0938\u093e\u092e\u0917\u094d\u0930\u0940 \u091a\u093f\u092a\u0915\u093e\u0928\u0947 \u092a\u0930 \u0935\u0939 \u0938\u093e\u0926\u0947 \u092a\u093e\u0920\u094d\u092f \u092e\u0947\u0902 \u0930\u0939\u0917\u0940 \u091c\u092c \u0924\u0915 \u0906\u092a \u0907\u0938 \u0935\u093f\u0915\u0932\u094d\u092a \u0915\u094b \u092c\u0902\u0926 \u0928\u0939\u0940\u0902 \u0915\u0930 \u0926\u0947\u0924\u0947\u0964",
-"Underline": "\u0905\u0927\u094b\u0930\u0947\u0916\u093e\u0902\u0915\u0928",
-"Cancel": "\u0930\u0926\u094d\u0926",
-"Justify": "\u0938\u092e\u0915\u0930\u0923",
-"Inline": "\u0930\u0947\u0916\u093e \u092e\u0947\u0902",
-"Copy": "\u092a\u094d\u0930\u0924\u093f \u0915\u0930\u0947\u0902",
-"Align left": "\u092c\u093e\u090f\u0901 \u0938\u0902\u0930\u0947\u0916\u0923",
-"Visual aids": "\u0926\u0943\u0936\u094d\u092f \u0938\u093e\u0927\u0928",
-"Lower Greek": "\u0928\u093f\u092e\u094d\u0928 \u0917\u094d\u0930\u0940\u0915",
-"Square": "\u0935\u0930\u094d\u0917",
-"Default": "\u092a\u0939\u0932\u0947 \u0938\u0947 \u091a\u0941\u0928\u093e \u0939\u0941\u0906",
-"Lower Alpha": "\u0928\u093f\u092e\u094d\u0928 \u0905\u0932\u094d\u092b\u093e",
-"Circle": "\u0935\u0943\u0924\u094d\u0924",
-"Disc": "\u092c\u093f\u0902\u092c",
-"Upper Alpha": "\u0909\u091a\u094d\u091a \u0905\u0932\u094d\u092b\u093e",
-"Upper Roman": "\u0909\u091a\u094d\u091a \u0930\u094b\u092e\u0928",
-"Lower Roman": "\u0928\u093f\u092e\u094d\u0928 \u0930\u094b\u092e\u0928",
-"Name": "\u0928\u093e\u092e",
-"Anchor": "\u0932\u0902\u0917\u0930",
-"You have unsaved changes are you sure you want to navigate away?": "\u0906\u092a\u0915\u0947 \u0915\u0941\u091b \u0905\u0938\u0939\u0947\u091c\u0947 \u092c\u0926\u0932\u093e\u0935 \u0939\u0948\u0902, \u0915\u094d\u092f\u093e \u0906\u092a \u0928\u093f\u0936\u094d\u091a\u093f\u0924 \u0930\u0942\u092a \u0938\u0947 \u092f\u0939\u093e\u0901 \u0938\u0947 \u091c\u093e\u0928\u093e \u091a\u093e\u0939\u0924\u0947 \u0939\u094b?",
-"Restore last draft": "\u0906\u0916\u093f\u0930\u0940 \u092e\u0938\u094c\u0926\u093e \u092a\u0941\u0928\u0930\u094d\u0938\u094d\u0925\u093e\u092a\u093f\u0924 \u0915\u0930\u0947\u0902",
-"Special character": "\u0935\u093f\u0936\u0947\u0937 \u0935\u0930\u094d\u0923",
-"Source code": "\u0938\u094d\u0924\u094d\u0930\u094b\u0924 \u0938\u0902\u0915\u0947\u0924\u0932\u093f\u092a\u093f",
-"B": "\u092c\u0940",
-"R": "\u0906\u0930",
-"G": "\u091c\u0940",
-"Color": "\u0930\u0902\u0917",
-"Right to left": "\u0926\u093e\u090f\u0901 \u0938\u0947 \u092c\u093e\u090f\u0901",
-"Left to right": "\u092c\u093e\u090f\u0901 \u0938\u0947 \u0926\u093e\u090f\u0901",
-"Emoticons": "\u092d\u093e\u0935\u0928\u093e-\u092a\u094d\u0930\u0924\u0940\u0915",
-"Robots": "\u092f\u0902\u0924\u094d\u0930\u092e\u093e\u0928\u0935",
-"Document properties": "\u0926\u0938\u094d\u0924\u093e\u0935\u0947\u091c\u093c \u0917\u0941\u0923",
-"Title": "\u0936\u0940\u0930\u094d\u0937\u0915",
-"Keywords": "\u0915\u0941\u0902\u091c\u0940\u0936\u092c\u094d\u0926",
-"Encoding": "\u0938\u0902\u0915\u0947\u0924\u0940\u0915\u0930\u0923",
-"Description": "\u0935\u093f\u0935\u0930\u0923",
-"Author": "\u0932\u0947\u0916\u0915",
-"Fullscreen": "\u092a\u0942\u0930\u094d\u0923 \u0938\u094d\u0915\u094d\u0930\u0940\u0928",
-"Horizontal line": "\u0915\u094d\u0937\u0948\u0924\u093f\u091c \u0930\u0947\u0916\u093e",
-"Horizontal space": "\u0915\u094d\u0937\u0948\u0924\u093f\u091c \u0938\u094d\u0925\u093e\u0928",
-"Insert\/edit image": "\u091b\u0935\u093f \u0921\u093e\u0932\u0947\u0902\/\u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0915\u0930\u0947\u0902",
-"General": "\u0938\u093e\u092e\u093e\u0928\u094d\u092f",
-"Advanced": "\u0909\u0928\u094d\u0928\u0924",
-"Source": "\u0938\u094d\u0924\u094d\u0930\u094b\u0924",
-"Border": "\u0938\u0940\u092e\u093e",
-"Constrain proportions": "\u0905\u0928\u0941\u092a\u093e\u0924 \u0935\u093f\u0935\u0936",
-"Vertical space": "\u090a\u0930\u094d\u0927\u094d\u0935\u093e\u0927\u0930 \u0938\u094d\u0925\u093e\u0928",
-"Image description": "\u091b\u0935\u093f \u0935\u093f\u0935\u0930\u0923",
-"Style": "\u0936\u0948\u0932\u0940",
-"Dimensions": "\u0906\u092f\u093e\u092e",
-"Insert image": "\u091b\u0935\u093f \u0921\u093e\u0932\u0947\u0902",
-"Zoom in": "\u0926\u0942\u0930\u0940 \u0915\u092e \u0915\u0930\u0947\u0902",
-"Contrast": "\u0935\u093f\u0937\u092e\u0924\u093e",
-"Back": "\u092a\u0940\u091b\u0947",
-"Gamma": "\u0917\u093e\u092e\u093e",
-"Flip horizontally": "\u0915\u094d\u0937\u0948\u0924\u093f\u091c \u0915\u0930\u0947\u0902",
-"Resize": "\u0906\u0915\u093e\u0930 \u092c\u0926\u0932\u0947\u0902",
-"Sharpen": "\u0928\u0941\u0915\u0940\u0932\u093e\u092a\u0928",
-"Zoom out": "\u0926\u0942\u0930\u0940 \u092c\u095d\u093e\u090f\u0901",
-"Image options": "\u091b\u0935\u093f \u0915\u0947 \u0935\u093f\u0915\u0932\u094d\u092a",
-"Apply": "\u0932\u093e\u0917\u0942 \u0915\u0930\u0947\u0902",
-"Brightness": "\u091a\u092e\u0915\u0940\u0932\u093e\u092a\u0928",
-"Rotate clockwise": "\u0918\u095c\u0940 \u0915\u0940 \u0926\u093f\u0936\u093e \u092e\u0947\u0902 \u0918\u0941\u092e\u093e\u0913",
-"Rotate counterclockwise": "\u0918\u095c\u0940 \u0915\u0947 \u0935\u093f\u092a\u0930\u0940\u0924 \u0918\u0941\u092e\u093e\u0913",
-"Edit image": "\u091b\u0935\u093f \u0938\u092e\u094d\u092a\u093e\u0926\u0928",
-"Color levels": "\u0930\u0902\u0917 \u0938\u094d\u0924\u0930",
-"Crop": "\u0915\u093e\u091f\u0947\u0902",
-"Orientation": "\u0928\u093f\u0930\u094d\u0926\u0947\u0936\u0915 \u0930\u0947\u0916\u093e",
-"Flip vertically": "\u0916\u095c\u093e \u0915\u0930\u0947\u0902",
-"Invert": "\u0909\u0932\u091f\u0947\u0902",
-"Insert date\/time": "\u0926\u093f\u0928\u093e\u0902\u0915\/\u0938\u092e\u092f \u0921\u093e\u0932\u0947\u0902",
-"Remove link": "\u0915\u095c\u0940 \u0939\u091f\u093e\u090f\u0901",
-"Url": "\u091c\u093e\u0932\u0938\u094d\u0925\u0932 \u092a\u0924\u093e",
-"Text to display": "\u0926\u093f\u0916\u093e\u0928\u0947 \u0939\u0947\u0924\u0941 \u092a\u093e\u0920\u094d\u092f",
-"Anchors": "\u0932\u0902\u0917\u0930",
-"Insert link": "\u0915\u095c\u0940 \u0921\u093e\u0932\u0947\u0902",
-"New window": "\u0928\u0908 \u0916\u093f\u095c\u0915\u0940",
-"None": "\u0915\u094b\u0908 \u0928\u0939\u0940\u0902",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0906\u092a\u0928\u0947 \u091c\u094b \u0915\u095c\u0940 \u0921\u093e\u0932\u0940 \u0939\u0948 \u0935\u0939 \u092c\u093e\u0939\u0930\u0940 \u0915\u095c\u0940 \u0915\u0947 \u091c\u0948\u0938\u0947 \u0926\u093f\u0916 \u0930\u0939\u093e \u0939\u0948\u0964 \u0915\u094d\u092f\u093e \u0906\u092a http:\/\/ \u092a\u0939\u0932\u0947 \u091c\u094b\u095c\u0928\u093e \u091a\u093e\u0939\u0924\u0947 \u0939\u0948?",
-"Target": "\u0932\u0915\u094d\u0937\u094d\u092f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0906\u092a\u0928\u0947 \u091c\u094b \u0915\u095c\u0940 \u0921\u093e\u0932\u0940 \u0939\u0948 \u0935\u0939 \u0908\u092e\u0947\u0932 \u092a\u0924\u093e \u0915\u0947 \u091c\u0948\u0938\u0947 \u0926\u093f\u0916 \u0930\u0939\u093e \u0939\u0948\u0964 \u0915\u094d\u092f\u093e \u0906\u092a mailto: \u092a\u0939\u0932\u0947 \u091c\u094b\u095c\u0928\u093e \u091a\u093e\u0939\u0924\u0947 \u0939\u0948?",
-"Insert\/edit link": "\u0915\u095c\u0940 \u0921\u093e\u0932\u0947\u0902\/\u0938\u0902\u092a\u093e\u0926\u093f\u0924 \u0915\u0930\u0947\u0902",
-"Insert\/edit video": "\u091a\u0932\u091a\u093f\u0924\u094d\u0930 \u0921\u093e\u0932\u0947\u0902\/\u0938\u092e\u094d\u092a\u093e\u0926\u0928 \u0915\u0930\u0947\u0902",
-"Poster": "\u092a\u094b\u0938\u094d\u091f\u0930",
-"Alternative source": "\u0935\u0948\u0915\u0932\u094d\u092a\u093f\u0915 \u0938\u094d\u0930\u094b\u0924",
-"Paste your embed code below:": "\u0926\u093f\u0916\u093e\u0928\u0947 \u0935\u093e\u0932\u0947 \u0938\u0902\u0915\u0947\u0924 \u0915\u094b \u0928\u0940\u091a\u0947 \u0921\u093e\u0932\u0947\u0902:",
-"Insert video": "\u091a\u0932\u091a\u093f\u0924\u094d\u0930 \u0921\u093e\u0932\u0947\u0902",
-"Embed": "\u0926\u093f\u0916\u093e\u0928\u093e",
-"Nonbreaking space": "\u0905\u0935\u093f\u0930\u093e\u092e\u093f\u0924 \u091c\u0917\u0939",
-"Page break": "\u092a\u0943\u0937\u094d\u0920 \u0935\u093f\u0930\u093e\u092e",
-"Paste as text": "\u092a\u093e\u0920\u094d\u092f \u0915\u0947 \u0930\u0942\u092a \u092e\u0947\u0902 \u091a\u093f\u092a\u0915\u093e\u090f\u0901",
-"Preview": "\u092a\u0942\u0930\u094d\u0935\u093e\u0935\u0932\u094b\u0915\u0928",
-"Print": "\u092e\u0941\u0926\u094d\u0930\u0923",
-"Save": "\u0938\u0939\u0947\u091c\u0947\u0902",
-"Could not find the specified string.": "\u0928\u093f\u0930\u094d\u0926\u093f\u0937\u094d\u091f \u092a\u0902\u0915\u094d\u0924\u093f \u0928\u0939\u0940\u0902 \u092e\u093f\u0932 \u0938\u0915\u093e\u0964",
-"Replace": "\u092a\u094d\u0930\u0924\u093f\u0938\u094d\u0925\u093e\u092a\u0928",
-"Next": "\u0905\u0917\u0932\u093e",
-"Whole words": "\u0938\u0902\u092a\u0942\u0930\u094d\u0923 \u0936\u092c\u094d\u0926",
-"Find and replace": "\u0922\u0942\u0901\u0922\u0947\u0902 \u0914\u0930 \u092c\u0926\u0932\u0947\u0902",
-"Replace with": "\u092a\u094d\u0930\u0924\u093f\u0938\u094d\u0925\u093e\u092a\u093f\u0924 \u0915\u0930\u0947\u0902",
-"Find": "\u0916\u094b\u091c",
-"Replace all": "\u0938\u092d\u0940 \u092a\u094d\u0930\u0924\u093f\u0938\u094d\u0925\u093e\u092a\u093f\u0924 \u0915\u0930\u0947\u0902",
-"Match case": "\u092e\u093e\u092e\u0932\u0947 \u092e\u093f\u0932\u093e\u090f\u0901",
-"Prev": "\u092a\u093f\u091b\u0932\u093e",
-"Spellcheck": "\u0935\u0930\u094d\u0924\u0928\u0940\u0936\u094b\u0927\u0915",
-"Finish": "\u0938\u092e\u093e\u092a\u094d\u0924",
-"Ignore all": "\u0938\u092d\u0940 \u0915\u0940 \u0909\u092a\u0947\u0915\u094d\u0937\u093e",
-"Ignore": "\u0909\u092a\u0947\u0915\u094d\u0937\u093e",
-"Add to Dictionary": "\u0936\u092c\u094d\u0926\u0915\u094b\u0936 \u092e\u0947\u0902 \u091c\u094b\u095c\u0947\u0902",
-"Insert row before": "\u092a\u0939\u0932\u0947 \u092a\u0902\u0915\u094d\u0924\u093f \u0921\u093e\u0932\u0947\u0902",
-"Rows": "\u092a\u0902\u0915\u094d\u0924\u093f\u092f\u093e\u0901",
-"Height": "\u090a\u0901\u091a\u093e\u0908",
-"Paste row after": "\u092a\u0902\u0915\u094d\u0924\u093f \u0915\u0947 \u092c\u093e\u0926 \u091a\u093f\u092a\u0915\u093e\u090f\u0901",
-"Alignment": "\u0938\u0902\u0930\u0947\u0916\u0923",
-"Border color": "\u0938\u0940\u092e\u093e \u0930\u0902\u0917",
-"Column group": "\u0938\u094d\u0924\u0902\u092d \u0938\u092e\u0942\u0939",
-"Row": "\u092a\u0902\u0915\u094d\u0924\u093f",
-"Insert column before": "\u092a\u0939\u0932\u0947 \u0938\u094d\u0924\u0902\u092d \u0921\u093e\u0932\u0947\u0902",
-"Split cell": "\u0916\u093e\u0928\u0947\u0902 \u0935\u093f\u092d\u093e\u091c\u093f\u0924 \u0915\u0930\u0947\u0902",
-"Cell padding": "\u0916\u093e\u0928\u094b\u0902 \u092e\u0947\u0902 \u0926\u0942\u0930\u0940",
-"Cell spacing": "\u0916\u093e\u0928\u094b\u0902 \u092e\u0947\u0902 \u0930\u093f\u0915\u094d\u0924\u093f",
-"Row type": "\u092a\u0902\u0915\u094d\u0924\u093f \u092a\u094d\u0930\u0915\u093e\u0930",
-"Insert table": "\u0924\u093e\u0932\u093f\u0915\u093e \u0921\u093e\u0932\u0947\u0902",
-"Body": "\u0936\u0930\u0940\u0930",
-"Caption": "\u0905\u0928\u0941\u0936\u0940\u0930\u094d\u0937\u0915",
-"Footer": "\u092a\u093e\u0926 \u0932\u0947\u0916",
-"Delete row": "\u092a\u0902\u0915\u094d\u0924\u093f \u0939\u091f\u093e\u090f\u0902",
-"Paste row before": "\u092a\u0902\u0915\u094d\u0924\u093f \u0938\u0947 \u092a\u0939\u0932\u0947 \u091a\u093f\u092a\u0915\u093e\u090f\u0901",
-"Scope": "\u0915\u094d\u0937\u0947\u0924\u094d\u0930",
-"Delete table": "\u0924\u093e\u0932\u093f\u0915\u093e \u0939\u091f\u093e\u090f\u0901",
-"H Align": "\u0915\u094d\u0937\u0947\u0924\u093f\u091c \u0938\u0902\u0930\u0947\u0916\u093f\u0924",
-"Top": "\u0936\u0940\u0930\u094d\u0937",
-"Header cell": "\u0936\u0940\u0930\u094d\u0937 \u0916\u093e\u0928\u093e",
-"Column": "\u0938\u094d\u0924\u0902\u092d",
-"Row group": "\u092a\u0902\u0915\u094d\u0924\u093f \u0938\u092e\u0942\u0939",
-"Cell": "\u0915\u094b\u0936\u093f\u0915\u093e",
-"Middle": "\u092e\u0927\u094d\u092f",
-"Cell type": "\u0916\u093e\u0928\u0947 \u0915\u093e \u092a\u094d\u0930\u0915\u093e\u0930",
-"Copy row": "\u092a\u0902\u0915\u094d\u0924\u093f \u0915\u0940 \u092a\u094d\u0930\u0924\u093f\u0932\u093f\u092a\u093f \u0932\u0947\u0902",
-"Row properties": "\u092a\u0902\u0915\u094d\u0924\u093f \u0915\u0947 \u0917\u0941\u0923",
-"Table properties": "\u0924\u093e\u0932\u093f\u0915\u093e \u0915\u0947 \u0917\u0941\u0923",
-"Bottom": "\u0928\u0940\u091a\u0947",
-"V Align": "\u090a\u0930\u094d\u0927\u094d\u0935\u093e\u0927\u0930 \u0938\u0902\u0930\u0947\u0916\u093f\u0924",
-"Header": "\u0936\u0940\u0930\u094d\u0937\u0915",
-"Right": "\u0926\u093e\u092f\u093e\u0901",
-"Insert column after": "\u092c\u093e\u0926 \u0938\u094d\u0924\u0902\u092d \u0921\u093e\u0932\u0947\u0902",
-"Cols": "\u0938\u094d\u0924\u0902\u092d",
-"Insert row after": "\u092c\u093e\u0926 \u092a\u0902\u0915\u094d\u0924\u093f \u0921\u093e\u0932\u0947\u0902",
-"Width": "\u091a\u094c\u0921\u093c\u093e\u0908",
-"Cell properties": "\u0915\u094b\u0936\u093f\u0915\u093e \u0917\u0941\u0923",
-"Left": "\u092c\u093e\u092f\u093e\u0901",
-"Cut row": "\u092a\u0902\u0915\u094d\u0924\u093f \u0915\u093e\u091f\u0947\u0902",
-"Delete column": "\u0938\u094d\u0924\u0902\u092d \u0939\u091f\u093e\u090f\u0901",
-"Center": "\u092e\u0927\u094d\u092f",
-"Merge cells": "\u0916\u093e\u0928\u094b\u0902 \u0915\u094b \u092e\u093f\u0932\u093e\u090f\u0902",
-"Insert template": "\u0938\u093e\u0901\u091a\u093e \u0921\u093e\u0932\u0947\u0902",
-"Templates": "\u0938\u093e\u0901\u091a\u0947",
-"Background color": "\u092a\u0943\u0937\u094d\u0920\u092d\u0942\u092e\u093f \u0915\u093e \u0930\u0902\u0917",
-"Custom...": "\u0905\u0928\u0941\u0915\u0942\u0932\u093f\u0924...",
-"Custom color": "\u0905\u0928\u0941\u0915\u0942\u0932\u093f\u0924 \u0930\u0902\u0917",
-"No color": "\u0930\u0902\u0917\u0939\u0940\u0928",
-"Text color": "\u092a\u093e\u0920\u094d\u092f \u0930\u0902\u0917",
-"Show blocks": "\u0921\u092c\u094d\u092c\u0947 \u0926\u093f\u0916\u093e\u090f\u0901",
-"Show invisible characters": "\u0905\u0926\u0943\u0936\u094d\u092f \u0905\u0915\u094d\u0937\u0930\u094b\u0902 \u0915\u094b \u0926\u093f\u0916\u093e\u090f\u0901",
-"Words: {0}": "\u0936\u092c\u094d\u0926: {0}",
-"Insert": "\u0921\u093e\u0932\u0947\u0902",
-"File": "\u0928\u0924\u094d\u0925\u0940",
-"Edit": "\u0938\u092e\u094d\u092a\u093e\u0926\u0928",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0938\u0902\u092a\u0928\u094d\u0928 \u092a\u093e\u0920 \u0915\u094d\u0937\u0947\u0924\u094d\u0930\u0964 \u092e\u0947\u0928\u0942 \u0915\u0947 \u0932\u093f\u090f ALT-F9 \u0926\u092c\u093e\u090f\u0901\u0964 \u0909\u092a\u0915\u0930\u0923 \u092a\u091f\u094d\u091f\u0940 \u0915\u0947 \u0932\u093f\u090f  ALT-F10 \u0926\u092c\u093e\u090f\u0901\u0964 \u0938\u0939\u093e\u092f\u0924\u093e \u0915\u0947 \u0932\u093f\u090f ALT-0 \u0926\u092c\u093e\u090f\u0901\u0964",
-"Tools": "\u0909\u092a\u0915\u0930\u0923",
-"View": "\u0926\u0947\u0916\u0947\u0902",
-"Table": "\u0924\u093e\u0932\u093f\u0915\u093e",
-"Format": "\u092a\u094d\u0930\u093e\u0930\u0942\u092a"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/hy.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('hy',{
-"Redo": "\u0540\u0561\u057b\u0578\u0580\u0564 \u0584\u0561\u0575\u056c",
-"Undo": "\u0546\u0561\u056d\u0578\u0580\u0564 \u0584\u0561\u0575\u056c",
-"Cut": "\u053f\u057f\u0580\u0565\u056c",
-"Copy": "\u054a\u0561\u057f\u0573\u0565\u0576\u0565\u056c",
-"Paste": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c",
-"Select all": "\u0546\u0577\u0565\u056c \u0562\u0578\u056c\u0578\u0580\u0568",
-"New document": "\u0546\u0578\u0580 \u0583\u0561\u057d\u057f\u0561\u0569\u0578\u0582\u0572\u0569",
-"Ok": "Ok",
-"Cancel": "\u0553\u0561\u056f\u0565\u056c",
-"Visual aids": "\u0551\u0578\u0582\u0581\u0561\u0564\u0580\u0565\u056c \u056f\u0578\u0576\u057f\u0578\u0582\u0580\u0576\u0565\u0580\u0568",
-"Bold": "\u0539\u0561\u057e\u0561\u057f\u0561\u057c",
-"Italic": "\u0547\u0565\u0572\u0561\u057f\u0561\u057c",
-"Underline": "\u0538\u0576\u0564\u0563\u056e\u057e\u0561\u056e",
-"Strikethrough": "\u0531\u0580\u057f\u0561\u0563\u056e\u057e\u0561\u056e",
-"Superscript": "\u054e\u0565\u0580\u056b\u0576 \u056b\u0576\u0564\u0565\u0584\u057d",
-"Subscript": "\u054d\u057f\u0578\u0580\u056b\u0576 \u056b\u0576\u0564\u0565\u0584\u057d",
-"Clear formatting": "\u0544\u0561\u0584\u0580\u0565\u056c \u0586\u0578\u0580\u0574\u0561\u057f\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0568",
-"Align left": "\u0541\u0561\u056d\u0561\u056f\u0578\u0572\u0574\u0575\u0561 \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Align center": "\u053f\u0565\u0576\u057f\u0580\u0578\u0576\u0561\u056f\u0561\u0576 \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Align right": "\u0531\u057b\u0561\u056f\u0578\u0572\u0574\u0575\u0561 \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Justify": "\u0535\u0580\u056f\u056f\u0578\u0572\u0574\u0561\u0576\u056b \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Bullet list": "\u0549\u0570\u0561\u0574\u0561\u0580\u0561\u056f\u0561\u056c\u057e\u0561\u056e \u0581\u0578\u0582\u0581\u0561\u056f",
-"Numbered list": "\u0540\u0561\u0574\u0561\u0580\u0561\u056f\u0561\u056c\u057e\u0561\u056e \u0581\u0578\u0582\u0581\u0561\u056f",
-"Decrease indent": "\u0553\u0578\u0584\u0580\u0561\u0581\u0576\u0565\u056c \u0571\u0561\u056d \u0565\u0566\u0580\u056b \u0570\u0565\u057c\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568",
-"Increase indent": "\u0544\u0565\u056e\u0561\u0581\u0576\u0565\u056c \u0571\u0561\u056d \u0565\u0566\u0580\u056b \u0570\u0565\u057c\u0561\u057e\u0578\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568",
-"Close": "\u0553\u0561\u056f\u0565\u056c",
-"Formats": "\u0556\u0578\u0580\u0574\u0561\u057f\u0576\u0565\u0580",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0541\u0565\u0580 \u0562\u0580\u0561\u0578\u0582\u0566\u0565\u0580\u0568 \u0579\u056b \u0561\u057a\u0561\u0570\u0578\u057e\u0578\u0582\u0574 \u0561\u0576\u0574\u056b\u057b\u0561\u056f\u0561\u0576 \u0565\u056c\u0584 \u0583\u0578\u056d\u0561\u0576\u0561\u056f\u0574\u0561\u0576 \u0562\u0578\u0582\u0586\u0565\u0580\u056b\u0576\u0589 \u053d\u0576\u0564\u0580\u0578\u0582\u0574 \u0565\u0576\u0584 \u0585\u0563\u057f\u057e\u0565\u056c Ctrl+X\/C\/V \u057d\u057f\u0565\u0572\u0576\u0565\u0580\u056b\u0581\u0589",
-"Headers": "\u054e\u0565\u0580\u0576\u0561\u0563\u0580\u0565\u0580",
-"Header 1": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 1",
-"Header 2": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 2",
-"Header 3": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 3",
-"Header 4": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 4",
-"Header 5": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 5",
-"Header 6": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 6",
-"Headings": "\u054e\u0565\u0580\u0576\u0561\u0563\u0580\u0565\u0580",
-"Heading 1": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 1",
-"Heading 2": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 2",
-"Heading 3": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 3",
-"Heading 4": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 4",
-"Heading 5": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 5",
-"Heading 6": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 6",
-"Preformatted": "\u0546\u0561\u056d\u0561\u057a\u0565\u057d \u0571\u0565\u0582\u0561\u057e\u0578\u0580\u057e\u0561\u056e",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u053f\u0578\u0564",
-"Paragraph": "\u054a\u0561\u0580\u0562\u0565\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Blockquote": "\u0544\u0565\u057b\u0562\u0565\u0580\u0578\u0582\u0574",
-"Inline": "\u054f\u0578\u0572\u0561\u0575\u056b\u0576",
-"Blocks": "\u0532\u056c\u0578\u056f\u0576\u0565\u0580",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u054f\u0565\u0584\u057d\u057f\u056b \u057f\u0565\u0572\u0561\u0564\u0580\u0578\u0582\u0574\u0568 \u056f\u0561\u057f\u0561\u0580\u057e\u0565\u056c\u0578\u0582 \u0567 \u0570\u0561\u057d\u0561\u0580\u0561\u056f \u057f\u0565\u0584\u057d\u057f\u056b \u057c\u0565\u056a\u056b\u0574\u0578\u057e\u0589 \u054a\u0561\u057f\u0573\u0565\u0576\u057e\u0561\u056e \u057f\u0565\u0584\u057d\u057f\u0568 \u057f\u0565\u0572\u0561\u0564\u0580\u057e\u0565\u056c\u0578\u0582 \u0567 \u0570\u0561\u057d\u0561\u0580\u0561\u056f \u057f\u0565\u0584\u057d\u057f\u056b \u0571\u0587\u0578\u057e \u0574\u056b\u0576\u0579\u0587 \u0561\u0575\u057d \u057c\u0565\u056a\u056b\u0574\u056b \u0561\u0576\u057b\u0561\u057f\u0578\u0582\u0574\u0568\u0589",
-"Fonts": "\u0556\u0578\u0576\u057f\u0565\u0580",
-"Font Sizes": "\u054f\u0561\u057c\u056b \u0579\u0561\u0583",
-"Class": "\u0534\u0561\u057d",
-"Browse for an image": "\u0538\u0576\u057f\u0580\u0565\u056c \u0576\u056f\u0561\u0580",
-"OR": "\u053f\u0531\u0544",
-"Drop an image here": "\u0546\u056f\u0561\u0580\u0568 \u0563\u0581\u0565\u0584 \u0561\u0575\u057d\u057f\u0565\u0572",
-"Upload": "\u054e\u0565\u0580\u0562\u0565\u057c\u0576\u0565\u056c",
-"Block": "\u0532\u056c\u0578\u056f",
-"Align": "\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0576\u0565\u056c",
-"Default": "\u054d\u057f\u0561\u0576\u0564\u0561\u0580\u057f",
-"Circle": "\u0547\u0580\u057b\u0561\u0576",
-"Disc": "\u053f\u056c\u0578\u0580",
-"Square": "\u0554\u0561\u057c\u0561\u056f\u0578\u0582\u057d\u056b",
-"Lower Alpha": "\u0553\u0578\u0584\u0580\u0561\u057f\u0561\u057c \u056c\u0561\u057f\u056b\u0576\u0561\u056f\u0561\u0576 \u057f\u0561\u057c\u0565\u0580",
-"Lower Greek": "\u0553\u0578\u0584\u0580\u0561\u057f\u0561\u057c \u0570\u0578\u0582\u0576\u0561\u056f\u0561\u0576 \u057f\u0561\u057c\u0565\u0580",
-"Lower Roman": "\u0553\u0578\u0584\u0580\u0561\u057f\u0561\u057c \u0570\u057c\u0578\u0574\u0565\u0561\u056f\u0561\u0576 \u0569\u057e\u0565\u0580",
-"Upper Alpha": "\u0544\u0565\u056e\u0561\u057f\u0561\u057c \u056c\u0561\u057f\u056b\u0576\u0565\u0580\u0565\u0576 \u057f\u0561\u057c\u0565\u0580",
-"Upper Roman": "\u0544\u0565\u056e\u0561\u057f\u0561\u057c \u0570\u057c\u0578\u0574\u0565\u0561\u056f\u0561\u0576 \u0569\u057e\u0565\u0580",
-"Anchor...": "\u053d\u0561\u0580\u056b\u057d\u056d...",
-"Name": "\u0531\u0576\u0578\u0582\u0576",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id-\u0576 \u057a\u0565\u057f\u0584 \u0567 \u057d\u056f\u057d\u057e\u056b \u057f\u0561\u057c\u0578\u057e \u0587 \u056f\u0561\u0580\u0578\u0572 \u0567 \u057a\u0561\u0580\u0578\u0582\u0576\u0561\u056f\u0565\u056c \u057f\u0561\u057c\u0565\u0580, \u0569\u057e\u0565\u0580, \u0563\u056e\u056b\u056f, \u056f\u0565\u057f, \u057e\u0565\u0580\u057b\u0561\u056f\u0565\u0565\u057f \u056f\u0561\u0574 \u057f\u0578\u0572\u0561\u057f\u0561\u056f\u056b \u0563\u056e\u056b\u056f",
-"You have unsaved changes are you sure you want to navigate away?": "\u053f\u0561\u0576 \u0579\u057a\u0561\u0570\u057a\u0561\u0576\u057e\u0561\u056e \u0583\u0578\u0583\u0578\u056d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0589 \u0534\u0578\u0582\u0584 \u056b\u0580\u0578\u055e\u0584 \u0578\u0582\u0566\u0578\u0582\u0574 \u0565\u0584 \u0564\u0578\u0582\u0580\u057d \u0563\u0561\u056c",
-"Restore last draft": "\u054e\u0565\u0580\u0561\u056f\u0561\u0576\u0563\u0576\u0565\u056c \u057e\u0565\u0580\u057b\u056b\u0576 \u0576\u0561\u056d\u0561\u0563\u056b\u056e\u0568",
-"Special character...": "\u0540\u0561\u057f\u0578\u0582\u056f \u057d\u056b\u0574\u057e\u0578\u056c\u0576\u0565\u0580...",
-"Source code": "\u053e\u0580\u0561\u0563\u0580\u0561\u0575\u056b\u0576 \u056f\u0578\u0564",
-"Insert\/Edit code sample": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c\/\u056d\u0574\u0562\u0561\u0563\u0580\u0565\u056c \u056f\u0578\u0564\u0568",
-"Language": "\u053c\u0565\u0566\u0578\u0582",
-"Code sample...": "\u053f\u0578\u0564\u056b \u0585\u0580\u0576\u0561\u056f",
-"Color Picker": "\u0533\u0578\u0582\u0576\u0561\u057a\u0576\u0561\u056f",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0541\u0561\u056d\u056b\u0581 \u0561\u057b",
-"Right to left": "\u0531\u057b\u056b\u0581 \u0571\u0561\u056d",
-"Emoticons...": "\u054d\u0574\u0561\u0575\u056c\u056b\u056f\u0576\u0565\u0580...",
-"Metadata and Document Properties": "\u0553\u0561\u057d\u057f\u0561\u0569\u0572\u0569\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568",
-"Title": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580",
-"Keywords": "\u0548\u0580\u0578\u0576\u0578\u0572\u0561\u056f\u0561\u0576 \u0562\u0561\u057c\u0565\u0580",
-"Description": "\u0546\u056f\u0561\u0580\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Robots": "Robots",
-"Author": "\u0540\u0565\u0572\u056b\u0576\u0561\u056f",
-"Encoding": "\u053f\u0578\u0564\u0561\u057e\u0578\u0580\u0578\u0582\u0574",
-"Fullscreen": "\u0531\u0574\u0562\u0578\u0572\u057b \u0567\u056f\u0580\u0561\u0576\u0578\u057e",
-"Action": "\u0533\u0578\u0580\u056e\u0578\u0572\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Shortcut": "\u053f\u0561\u0580\u0573\u0578\u0582\u0572\u056b",
-"Help": "\u0555\u0563\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Address": "\u0540\u0561\u057d\u0581\u0565",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0570\u0572\u0578\u0582\u0574 (\u0565\u0569\u0565 \u0570\u0572\u0578\u0582\u0574 \u0568\u0576\u0564\u056c\u0561\u0575\u0576\u0578\u0582\u0574\u0568 \u0561\u057e\u057f\u056b\u057e \u0567)",
-"Save (if save plugin activated)": "\u054a\u0561\u0570\u057a\u0561\u0576\u0565\u056c (\u0565\u0569\u0565 save \u0568\u0576\u0564\u056c\u0561\u0575\u0576\u0578\u0582\u0574\u0568 \u0561\u056f\u057f\u056b\u057e \u0567)",
-"Find (if searchreplace plugin activated)": "\u0553\u0576\u057f\u0580\u0565\u056c (\u0565\u0569\u0565 searchreplace \u0568\u0576\u0564\u056c\u0561\u0575\u0576\u0578\u0582\u0574\u0568 \u0561\u056f\u057f\u056b\u057e \u0567)",
-"Plugins installed ({0}):": "\u054f\u0565\u0572\u0561\u0564\u0580\u057e\u0561\u056e \u0583\u056c\u0561\u0563\u056b\u0576\u0576\u0565\u0580 ({0}):",
-"Premium plugins:": "\u054e\u0573\u0561\u0580\u0578\u057e\u056b \u0568\u0576\u0564\u056c\u0561\u0575\u0576\u0578\u0582\u0574\u0576\u0565\u0580",
-"Learn more...": "\u053b\u0574\u0561\u0576\u0561\u056c \u0561\u057e\u0565\u056c\u056b\u0576 \u2024\u2024\u2024",
-"You are using {0}": "\u0534\u0578\u0582\u0584 \u0585\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0578\u0582\u0574 \u0565\u0584 {0}",
-"Plugins": "\u0538\u0576\u0564\u056c\u0561\u0575\u0576\u0578\u0582\u0574\u0576\u0565\u0580",
-"Handy Shortcuts": "\u0555\u0563\u057f\u0561\u056f\u0561\u0580 \u056f\u0561\u0580\u0573\u0578\u0582\u0572\u056b\u0576\u0565\u0580",
-"Horizontal line": "\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u0563\u056b\u056e",
-"Insert\/edit image": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c\/\u056d\u0574\u0562\u0561\u0563\u0580\u0565\u056c \u0576\u056f\u0561\u0580",
-"Image description": "\u0546\u056f\u0561\u0580\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Source": "\u0546\u056f\u0561\u0580\u056b \u0570\u0561\u057d\u0581\u0565",
-"Dimensions": "\u0549\u0561\u0583\u0565\u0580",
-"Constrain proportions": "\u054a\u0561\u0570\u057a\u0561\u0576\u0565\u056c \u0574\u0561\u0577\u057f\u0561\u0562\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0568",
-"General": "\u0533\u056c\u056d\u0561\u057e\u0578\u0580",
-"Advanced": "\u053c\u0580\u0561\u0581\u0578\u0582\u0581\u056b\u0579",
-"Style": "\u0548\u0573",
-"Vertical space": "\u0548\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581 \u057f\u0561\u0580\u0561\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Horizontal space": "\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u057f\u0561\u0580\u0561\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Border": "\u0535\u0566\u0580\u0561\u0563\u056b\u056e",
-"Insert image": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0576\u056f\u0561\u0580",
-"Image...": "\u0546\u056f\u0561\u0580",
-"Image list": "Image list",
-"Rotate counterclockwise": "\u054a\u057f\u057f\u0565\u056c \u056a\u0561\u0574\u057d\u056c\u0561\u0584\u056b\u0576 \u0570\u0561\u056f\u0561\u057c\u0561\u056f",
-"Rotate clockwise": "\u054a\u057f\u057f\u0565\u056c \u056a\u0561\u0574\u057d\u056c\u0561\u0584\u056b \u0578\u0582\u0572\u0572\u0578\u0582\u0569\u0575\u0561\u0574\u0562",
-"Flip vertically": "\u0548\u0582\u0572\u0572\u0561\u0570\u0561\u0575\u0561\u0581 \u0561\u0580\u057f\u0561\u0581\u0578\u056c\u0578\u0582\u0574",
-"Flip horizontally": "\u0540\u0578\u0580\u056b\u0566\u0578\u0576\u0561\u056f\u0561\u0576 \u0561\u0580\u057f\u0561\u0581\u0578\u056c\u0578\u0582\u0574",
-"Edit image": "\u053d\u0562\u0574\u0562\u0561\u0563\u0580\u0565\u056c \u0576\u056f\u0561\u0580\u0568",
-"Image options": "\u0546\u056f\u0561\u0580\u056b \u056f\u0561\u0580\u0563\u0561\u057e\u0578\u0580\u0578\u0582\u0574\u0576\u0565\u0580\u0568",
-"Zoom in": "\u0544\u0565\u056e\u0561\u0581\u0576\u0565\u056c",
-"Zoom out": "\u0553\u0578\u0584\u0580\u0561\u0581\u0576\u0565\u056c",
-"Crop": "\u053f\u057f\u0580\u0565\u056c",
-"Resize": "\u0553\u0578\u056d\u0565\u056c \u0579\u0561\u0583\u0568",
-"Orientation": "\u053f\u0578\u0572\u0574\u0576\u0578\u0580\u0578\u0577\u0578\u0582\u0574",
-"Brightness": "\u054a\u0561\u0575\u056e\u0561\u057c\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Sharpen": "Sharpen",
-"Contrast": "\u053f\u0578\u0576\u057f\u0580\u0561\u057d\u057f",
-"Color levels": "Color levels",
-"Gamma": "\u0533\u0561\u0574\u0574\u0561",
-"Invert": "\u0553\u0578\u056d\u0561\u057f\u0565\u0572\u0565\u056c",
-"Apply": "\u0540\u0561\u057d\u057f\u0561\u057f\u0565\u056c",
-"Back": "\u0540\u0565\u057f",
-"Insert date\/time": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0561\u0574\u057d\u0561\u0569\u056b\u057e\/\u056a\u0561\u0574\u0561\u0576\u0561\u056f",
-"Date\/time": "\u0531\u0574\u057d\u0561\u0569\u056b\u057e\/\u056a\u0561\u0574\u0561\u0576\u0561\u056f",
-"Insert\/Edit Link": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c\/\u0553\u0578\u0583\u0578\u056d\u0565\u056c \u0540\u0572\u0578\u0582\u0574\u0568",
-"Insert\/edit link": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c\/\u056d\u0574\u0562\u0561\u0563\u0580\u0565\u056c \u0570\u0572\u0578\u0582\u0574",
-"Text to display": "\u0540\u0572\u0574\u0561\u0576 \u057f\u0565\u0584\u057d\u057f",
-"Url": "Url",
-"Open link in...": "\u0532\u0561\u0581\u0565\u056c \u0570\u0572\u0578\u0582\u0574\u0568",
-"Current window": "\u0538\u0576\u0569\u0561\u0581\u056b\u056f \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576\u0568",
-"None": "\u0548\u0579\u056b\u0576\u0579",
-"New window": "\u0546\u0578\u0580 \u057a\u0561\u057f\u0578\u0582\u0570\u0561\u0576",
-"Remove link": "\u054b\u0576\u057b\u0565\u056c \u0570\u0572\u0578\u0582\u0574\u0568",
-"Anchors": "\u053d\u0561\u0580\u056b\u057d\u056d\u0576\u0565\u0580",
-"Link...": "\u0540\u0572\u0578\u0582\u0574",
-"Paste or type a link": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u0584 \u056f\u0561\u0574 \u0563\u0580\u0565\u0584 \u0570\u0572\u0578\u0582\u0574\u0568",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u057e\u0561\u056e \u0570\u0572\u0578\u0582\u0574\u0568 \u056f\u0561\u0580\u056e\u0565\u057d \u0537\u056c. \u0583\u0578\u057d\u057f\u056b \u0570\u0561\u057d\u0581\u0565 \u0567: \u0534\u0578\u0582\u0584 \u056f\u0581\u0561\u0576\u056f\u0561\u0576\u0561\u0584 \u0561\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u056c mailto: \u0570\u0572\u0574\u0561\u0576 \u057d\u056f\u0566\u0562\u0578\u0582\u0574",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0544\u0578\u0582\u057f\u0584\u0561\u0563\u0580\u057e\u0561\u056e \u0570\u0572\u0578\u0582\u0574\u0568 \u056f\u0561\u0580\u056e\u0565\u057d \u0561\u0580\u057f\u0561\u0584\u056b\u0576 \u0570\u0572\u0578\u0582\u0574 \u0567: \u0534\u0578\u0582\u0584 \u056f\u0581\u0561\u0576\u056f\u0561\u0576\u0561\u0584 \u0561\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u056c http:\/\/ \u0570\u0572\u0574\u0561\u0576 \u057d\u056f\u0566\u0562\u0578\u0582\u0574",
-"Link list": "\u0540\u0572\u0578\u0582\u0574\u0576\u0565\u0580\u056b \u0581\u0578\u0582\u0581\u0561\u056f",
-"Insert video": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u057e\u056b\u0564\u0565\u0578",
-"Insert\/edit video": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c\/\u056d\u0574\u0562\u0561\u0563\u0580\u0565\u056c \u057e\u056b\u0564\u0565\u0578",
-"Insert\/edit media": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c\/\u056d\u0574\u0562\u0561\u0563\u0580\u0565\u056c \u0574\u0565\u0564\u056b\u0561",
-"Alternative source": "\u0531\u0575\u056c\u0568\u0576\u057f\u0580\u0561\u0576\u0584\u0561\u0575\u056b\u0576 \u056f\u0578\u0564",
-"Alternative source URL": "\u0531\u0575\u056c\u0568\u0576\u057f\u0580\u0561\u0576\u0584\u0561\u0575\u056b\u0576 \u0561\u0572\u0562\u0575\u0578\u0582\u0580\u056b \u0570\u0572\u0578\u0582\u0574",
-"Media poster (Image URL)": "\u0544\u0565\u0564\u056b\u0561 \u057a\u0561\u057d\u057f\u0561\u057c (\u0546\u056f\u0561\u0580\u056b \u0570\u0572\u0578\u0582\u0574)",
-"Paste your embed code below:": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u0584 \u0541\u0565\u0580 \u056f\u0578\u0564\u0568 \u0561\u0575\u057d\u057f\u0565\u0572\u055d",
-"Embed": "\u054f\u0565\u0572\u0561\u0564\u0580\u057e\u0578\u0572 \u056f\u0578\u0564",
-"Media...": "\u0544\u0565\u0564\u056b\u0561",
-"Nonbreaking space": "\u0531\u057c\u0561\u0576\u0581 \u0576\u0578\u0580 \u057f\u0578\u0572\u056b \u0562\u0561\u0581\u0561\u057f",
-"Page break": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0567\u057b\u056b \u0561\u0576\u057b\u0561\u057f\u056b\u0579",
-"Paste as text": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0578\u0580\u057a\u0565\u057d \u057f\u0565\u0584\u057d\u057f",
-"Preview": "\u0546\u0561\u056d\u0576\u0561\u056f\u0561\u0576 \u0564\u056b\u057f\u0578\u0582\u0574",
-"Print...": "\u054f\u057a\u0565\u056c",
-"Save": "\u054a\u0561\u0570\u057a\u0561\u0576\u0565\u056c",
-"Find": "\u0553\u0576\u057f\u0580\u0565\u056c",
-"Replace with": "\u0553\u0578\u056d\u0561\u0580\u056b\u0576\u0565\u056c",
-"Replace": "\u0553\u0578\u056d\u0561\u0580\u056b\u0576\u0565\u056c",
-"Replace all": "\u0553\u0578\u056d\u0561\u0580\u056b\u0576\u0565\u056c \u0562\u0578\u056c\u0578\u0580\u0568",
-"Previous": "\u0546\u0561\u056d\u0578\u0580\u0564",
-"Next": "\u0540\u0561\u057b\u0578\u0580\u0564",
-"Find and replace...": "\u0553\u0576\u057f\u0580\u0565\u056c \u0587 \u0583\u0578\u056d\u0561\u0580\u056b\u0576\u0565\u056c",
-"Could not find the specified string.": "\u0546\u0577\u057e\u0561\u056e \u057f\u0565\u0584\u057d\u057f\u0568 \u0579\u056b \u0563\u057f\u0576\u057e\u0565\u056c",
-"Match case": "\u0540\u0561\u0577\u057e\u056b \u0561\u057c\u0576\u0565\u056c \u057c\u0565\u0563\u056b\u057d\u057f\u0578\u0580\u0568",
-"Find whole words only": "\u0533\u057f\u0576\u0565\u056c \u0574\u056b\u0561\u0575\u0576 \u0561\u0574\u0562\u0578\u0572\u057b \u0562\u0561\u057c\u0565\u0580\u0568",
-"Spell check": "\u0548\u0582\u0572\u0572\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0561\u0576 \u057d\u057f\u0578\u0582\u0563\u0578\u0582\u0574",
-"Ignore": "\u0531\u0576\u057f\u0565\u057d\u0565\u056c",
-"Ignore all": "\u0531\u0576\u057f\u0565\u057d\u0565\u056c \u0562\u0578\u056c\u0578\u0580\u0568",
-"Finish": "\u0531\u057e\u0561\u0580\u057f\u0565\u056c",
-"Add to Dictionary": "\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u056c \u0562\u0561\u057c\u0561\u0580\u0561\u0576\u0578\u0582\u0574",
-"Insert table": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f",
-"Table properties": "\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568",
-"Delete table": "\u054b\u0576\u057b\u0565\u056c \u0561\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u0568",
-"Cell": "\u054e\u0561\u0576\u0564\u0561\u056f",
-"Row": "\u054f\u0578\u0572",
-"Column": "\u054d\u0575\u0578\u0582\u0576\u0575\u0561\u056f",
-"Cell properties": "\u054e\u0561\u0576\u0564\u0561\u056f\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568",
-"Merge cells": "\u0544\u056b\u0561\u057e\u0578\u0580\u0565\u056c \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580\u0568",
-"Split cell": "\u0532\u0561\u056a\u0561\u0576\u0565\u056c \u057e\u0561\u0576\u0564\u0561\u056f\u0568",
-"Insert row before": "\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u056c \u057f\u0578\u0572 \u057e\u0565\u0580\u0587\u0578\u0582\u0574",
-"Insert row after": "\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u056c \u057f\u0578\u0572 \u0576\u0565\u0580\u0584\u0587\u0578\u0582\u0574",
-"Delete row": "\u054b\u0576\u057b\u0565\u056c \u057f\u0578\u0572\u0568",
-"Row properties": "\u054f\u0578\u0572\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568",
-"Cut row": "\u053f\u057f\u0580\u0565\u056c \u057f\u0578\u0572\u0568",
-"Copy row": "\u054a\u0561\u057f\u0573\u0565\u0576\u0565\u056c \u057f\u0578\u0572\u0568",
-"Paste row before": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u057f\u0578\u0572\u0568 \u057e\u0565\u0580\u0587\u0578\u0582\u0574",
-"Paste row after": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u057f\u0578\u0572\u0568 \u0576\u0565\u0580\u0584\u0587\u0578\u0582\u0574",
-"Insert column before": "\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u056c \u0576\u0578\u0580 \u057d\u0575\u0578\u0582\u0576 \u0571\u0561\u056d\u056b\u0581",
-"Insert column after": "\u0531\u057e\u0565\u056c\u0561\u0581\u0576\u0565\u056c \u0576\u0578\u0580 \u057d\u0575\u0578\u0582\u0576 \u0561\u057b\u056b\u0581",
-"Delete column": "\u0541\u0576\u057b\u0565\u056c \u057d\u0575\u0578\u0582\u0576\u0568",
-"Cols": "\u054d\u0575\u0578\u0582\u0576\u0575\u0561\u056f\u0576\u0565\u0580",
-"Rows": "\u054f\u0578\u0572\u0565\u0580",
-"Width": "\u053c\u0561\u0575\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Height": "\u0532\u0561\u0580\u0571\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Cell spacing": "\u0531\u0580\u057f\u0561\u0584\u056b\u0576 \u057f\u0561\u0580\u0561\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Cell padding": "\u0546\u0565\u0580\u0584\u056b\u0576 \u057f\u0561\u0580\u0561\u056e\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Show caption": "\u0551\u0578\u0582\u0581\u0561\u0564\u0580\u0565\u056c \u057e\u0565\u0580\u0576\u0561\u0563\u056b\u0580\u0568",
-"Left": "\u0541\u0561\u056d",
-"Center": "\u053f\u0565\u0576\u057f\u0580\u0578\u0576",
-"Right": "\u0531\u057b",
-"Cell type": "\u054e\u0561\u0576\u0564\u0561\u056f\u056b \u057f\u056b\u057a",
-"Scope": "Scope",
-"Alignment": "\u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0578\u0582\u0574",
-"H Align": "\u0540. \u0540\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0578\u0582\u0574",
-"V Align": "\u0548\u0582. \u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0578\u0582\u0574",
-"Top": "\u054e\u0565\u0580\u0587",
-"Middle": "\u0544\u0565\u057b\u057f\u0565\u0572",
-"Bottom": "\u0546\u0565\u0580\u0584\u0587",
-"Header cell": "\u054e\u0565\u0580\u0576\u0561\u0563\u0580\u056b \u057e\u0561\u0576\u0564\u0561\u056f\u0576\u0565\u0580",
-"Row group": "\u054f\u0578\u0572\u0565\u0580\u056b \u056d\u0578\u0582\u0574\u0562",
-"Column group": "\u054d\u0575\u0578\u0582\u0576\u0575\u0561\u056f\u0576\u0565\u0580\u056b \u056d\u0578\u0582\u0574\u0562",
-"Row type": "\u054f\u0578\u0572\u056b \u057f\u056b\u057a",
-"Header": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580",
-"Body": "\u054a\u0561\u0580\u0578\u0582\u0576\u0561\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Footer": "\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f\u056b \u057d\u057f\u0578\u0580\u056b\u0576 \u0570\u0561\u057f\u057e\u0561\u056e",
-"Border color": "\u0535\u0566\u0580\u0561\u0563\u056b\u056e",
-"Insert template...": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u0584 \u0571\u0587\u0561\u0576\u0574\u0578\u0582\u0577",
-"Templates": "\u0541\u0587\u0561\u0576\u0574\u0578\u0582\u0577\u0576\u0565\u0580",
-"Template": "\u0541\u0587\u0561\u0576\u0574\u0578\u0582\u0577",
-"Text color": "\u054f\u0561\u057c\u056b \u0563\u0578\u0582\u0575\u0576",
-"Background color": "\u0556\u0578\u0576\u056b \u0563\u0578\u0582\u0575\u0576",
-"Custom...": "\u0531\u0575\u056c...",
-"Custom color": "\u0531\u0575\u056c \u0563\u0578\u0582\u0575\u0576",
-"No color": "\u0531\u0576\u0563\u0578\u0582\u0575\u0576",
-"Remove color": "\u054b\u0576\u057b\u0565\u056c \u0563\u0578\u0582\u0575\u0576\u0568",
-"Table of Contents": "\u0551\u0561\u0576\u056f",
-"Show blocks": "\u0551\u0578\u0582\u0581\u0561\u0564\u0580\u0565\u056c \u0562\u056c\u0578\u056f\u0576\u0565\u0580\u0568",
-"Show invisible characters": "\u0551\u0578\u0582\u0575\u0581 \u057f\u0561\u056c \u0561\u0576\u057f\u0565\u057d\u0561\u0576\u0565\u056c\u056b \u057d\u056b\u0574\u057e\u0578\u056c\u0576\u0565\u0580\u0568",
-"Word count": "\u0532\u0561\u057c\u056b \u0584\u0561\u0576\u0561\u056f",
-"Count": "\u0554\u0561\u0576\u0561\u056f\u0568",
-"Document": "\u0553\u0561\u057d\u057f\u0561\u0569\u0578\u0582\u0572\u0569",
-"Selection": "\u0538\u0576\u057f\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Words": "\u0532\u0561\u057c\u0565\u0580",
-"Words: {0}": "\u0532\u0561\u057c\u0565\u0580\u056b \u0584\u0561\u0576\u0561\u056f: {0}",
-"{0} words": "{0} \u0562\u0561\u057c",
-"File": "\u0556\u0561\u0575\u056c",
-"Edit": "\u053d\u0574\u0562\u0561\u0563\u0580\u0565\u056c",
-"Insert": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c",
-"View": "\u054f\u0565\u057d\u0584",
-"Format": "\u0556\u0578\u0580\u0574\u0561\u057f",
-"Table": "\u0531\u0572\u0575\u0578\u0582\u057d\u0561\u056f",
-"Tools": "\u0533\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u054f\u0565\u0584\u057d\u057f\u0561\u0575\u056b\u0576 \u0564\u0561\u0577\u057f\u0589 \u054d\u0565\u0572\u0574\u0565\u0584 ALT-F9 \u0574\u0565\u0576\u0575\u0578\u0582\u056b \u0570\u0561\u0574\u0561\u0580\u0589 ALT-F10 \u0563\u0578\u0580\u056e\u056b\u0584\u0576\u0565\u0580\u056b \u057e\u0561\u0570\u0561\u0576\u0561\u056f\u0589 \u054d\u0565\u0572\u0574\u0565\u0584 ALT-0 \u0585\u0563\u0576\u0578\u0582\u0569\u0575\u0561\u0576 \u0570\u0561\u0574\u0561\u0580",
-"Image title": "\u0546\u056f\u0561\u0580\u056b \u057e\u0565\u0580\u0576\u0561\u0563\u056b\u0580",
-"Border width": "\u054d\u0561\u0570\u0574\u0561\u0576\u056b \u056c\u0561\u0575\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568",
-"Border style": "\u054d\u0561\u0570\u0574\u0561\u0576\u056b \u0578\u0573\u0568",
-"Error": "\u054d\u056d\u0561\u056c",
-"Warn": "\u0536\u0563\u0578\u0582\u0577\u0561\u0581\u0578\u0582\u0574",
-"Valid": "\u054e\u0561\u057e\u0565\u0580 \u0567",
-"To open the popup, press Shift+Enter": "\u0539\u057c\u0578\u0582\u0581\u056b\u056f\u0568 \u0562\u0561\u0581\u0565\u056c\u0578\u0582 \u0570\u0561\u0574\u0561\u0580 \u057d\u0565\u0572\u0574\u0565\u0584 Shift + Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u0540\u0561\u0580\u0578\u0582\u057d\u057f \u057f\u0565\u0584\u057d\u057f\u0561\u0575\u056b\u0576 \u057f\u0561\u0580\u0561\u056e\u0584: \u0555\u0563\u0576\u0578\u0582\u0569\u0575\u0561\u0576 \u0570\u0561\u0574\u0561\u0580 \u057d\u0565\u0572\u0574\u0565\u0584 ALT-0:",
-"System Font": "\u0540\u0561\u0574\u0561\u056f\u0561\u0580\u0563\u056b \u057f\u0561\u057c\u0561\u057f\u0565\u057d\u0561\u056f",
-"Failed to upload image: {0}": "\u0549\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581 \u057e\u0565\u0580\u0562\u0565\u057c\u0576\u0565\u056c \u057a\u0561\u057f\u056f\u0565\u0580\u0568: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0549\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581 \u0562\u0565\u057c\u0576\u0565\u056c \u057a\u056c\u0561\u0563\u056b\u0576\u0568\u0589 {0} \u0570\u0572\u0578\u0582\u0574\u056b\u0581 {1}",
-"Failed to load plugin url: {0}": "\u0549\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581 \u0562\u0565\u057c\u0576\u0565\u056c \u057a\u056c\u0561\u0563\u056b\u0576\u0568 \u0570\u0572\u0578\u0582\u0574\u056b\u0581\u0589 {0}",
-"Failed to initialize plugin: {0}": "\u0549\u0570\u0561\u057b\u0578\u0572\u057e\u0565\u0581 \u0574\u056b\u0561\u0581\u0576\u0565\u056c \u057a\u056c\u0561\u0563\u056b\u0576\u0568\u0589 {0}",
-"example": "\u0585\u0580\u056b\u0576\u0561\u056f",
-"Search": "\u0553\u0576\u057f\u0580\u0565\u056c",
-"All": "\u0532\u0578\u056c\u0578\u0580\u0568",
-"Currency": "\u0531\u0580\u056a\u0578\u0582\u0575\u0569",
-"Text": "\u054f\u0565\u0584\u057d\u057f",
-"Quotations": "\u0544\u0565\u057b\u0562\u0565\u0580\u0578\u0582\u0574\u0576\u0565\u0580",
-"Mathematical": "\u0544\u0561\u0569\u0565\u0574\u0561\u057f\u056b\u056f\u0561\u056f\u0561\u0576",
-"Extended Latin": "\u0538\u0576\u0564\u0561\u0580\u0571\u0561\u056f \u056c\u0561\u057f\u056b\u0576\u0565\u0580\u0565\u0576",
-"Symbols": "\u054d\u056b\u0574\u057e\u0578\u056c\u0576\u0565\u0580",
-"Arrows": "\u054d\u056c\u0561\u0584\u0576\u0565\u0580",
-"User Defined": "\u0555\u0563\u057f\u0561\u0563\u0578\u0580\u056e\u0578\u0572\u056b \u056f\u0578\u0572\u0574\u056b\u0581 \u054d\u0561\u0570\u0574\u0561\u0576\u057e\u0561\u056e",
-"dollar sign": "\u0564\u0578\u056c\u056c\u0561\u0580\u056b \u0576\u0577\u0561\u0576",
-"currency sign": "\u0561\u0580\u056a\u0578\u0582\u0575\u0569\u056b \u0576\u0577\u0561\u0576",
-"euro-currency sign": "\u0565\u057e\u0580\u0578-\u0561\u0580\u056a\u0578\u0582\u0575\u0569\u056b \u0576\u0577\u0561\u0576",
-"colon sign": "\u056f\u0580\u056f\u0576\u0561\u056f\u0565\u057f \u0576\u0577\u0561\u0576",
-"cruzeiro sign": "\u0576\u0561\u057e\u0561\u0580\u056f\u0578\u0582\u0569\u0575\u0561\u0576 \u0576\u0577\u0561\u0576",
-"french franc sign": "\u0586\u0580\u0561\u0576\u057d\u056b\u0561\u056f\u0561\u0576 \u0586\u0580\u0561\u0576\u056f\u056b \u0576\u0577\u0561\u0576",
-"lira sign": "\u056c\u056b\u0580\u056b \u0576\u0577\u0561\u0576",
-"mill sign": "\u057b\u0580\u0561\u0572\u0561\u0581\u056b \u0576\u0577\u0561\u0576",
-"naira sign": "\u0576\u0561\u056b\u0580\u0561\u0575\u056b \u0576\u0577\u0561\u0576",
-"peseta sign": "\u057a\u0565\u057d\u0565\u057f\u0561\u0575\u056b \u0576\u0577\u0561\u0576",
-"rupee sign": "\u057c\u0578\u0582\u0583\u056b\u056b \u0576\u0577\u0561\u0576",
-"won sign": "\u0577\u0561\u0570\u0565\u056c\u0578\u0582 \u0576\u0577\u0561\u0576\u0568",
-"new sheqel sign": "\u0576\u0578\u0580 \u0577\u0565\u056f\u0565\u056c \u0576\u0577\u0561\u0576",
-"dong sign": "\u0564\u0578\u0576\u0563\u056b \u0576\u0577\u0561\u0576",
-"kip sign": "\u056f\u056b\u057a \u0576\u0577\u0561\u0576",
-"tugrik sign": "\u057f\u0578\u0582\u0563\u0580\u056b\u056f\u056b \u0576\u0577\u0561\u0576",
-"drachma sign": "\u0564\u0580\u0561\u0574\u0561\u056d\u0574\u0561\u0575\u056b \u0576\u0577\u0561\u0576",
-"german penny symbol": "\u0563\u0565\u0580\u0574\u0561\u0576\u0561\u056f\u0561\u0576 \u057a\u0565\u0576\u056b\u0575\u056b \u056d\u0578\u0580\u0570\u0580\u0564\u0561\u0576\u056b\u0577",
-"peso sign": "\u057a\u0565\u057d\u0578\u0575\u056b \u0576\u0577\u0561\u0576",
-"guarani sign": "\u0563\u0578\u0582\u0561\u0580\u0561\u0576\u056b \u0576\u0577\u0561\u0576",
-"austral sign": "\u0561\u057e\u057d\u057f\u0580\u0561\u056c\u056b \u0576\u0577\u0561\u0576",
-"hryvnia sign": "\u0563\u0580\u056b\u057e\u0576\u0561\u0575\u056b \u0576\u0577\u0561\u0576",
-"cedi sign": "\u0584\u0565\u0564\u056b \u0576\u0577\u0561\u0576",
-"livre tournois sign": "\u056c\u056b\u057e\u0580\u0565 \u0569\u0578\u0582\u0580\u0576\u0578\u056b\u057d \u0576\u0577\u0561\u0576",
-"spesmilo sign": "\u057d\u057a\u0565\u057d\u0574\u056b\u056c\u0578 \u0576\u0577\u0561\u0576",
-"tenge sign": "\u057f\u0565\u0576\u0563\u0565 \u0576\u0577\u0561\u0576",
-"indian rupee sign": "\u0570\u0576\u0564\u056f\u0561\u056f\u0561\u0576 \u057c\u0578\u0582\u0583\u056b \u0576\u0577\u0561\u0576",
-"turkish lira sign": "\u0569\u0578\u0582\u0580\u0584\u0561\u056f\u0561\u0576 \u056c\u056b\u0580\u0561\u0575\u056b \u0576\u0577\u0561\u0576",
-"nordic mark sign": "\u0570\u0575\u0578\u0582\u057d\u056b\u057d\u0561\u0575\u056b\u0576 \u0576\u0577\u0561\u0576\u056b \u0576\u0577\u0561\u0576",
-"manat sign": "\u0574\u0561\u0576\u0561\u0569\u056b \u0576\u0577\u0561\u0576",
-"ruble sign": "\u057c\u0578\u0582\u0562\u056c\u0578\u0582 \u0576\u0577\u0561\u0576",
-"yen character": "\u056b\u0565\u0576\u056b \u0576\u0577\u0561\u0576",
-"yuan character": "\u0575\u0578\u0582\u0561\u0576\u056b \u0576\u0577\u0561\u0576",
-"yuan character, in hong kong and taiwan": "\u0575\u0578\u0582\u0561\u0576\u056b \u0576\u0577\u0561\u0576 \u0570\u0578\u0576\u0563\u056f\u0578\u0576\u0563\u0578\u0582\u0574 \u0587 \u0569\u0561\u0575\u057e\u0561\u0576\u0578\u0582\u0574",
-"yen\/yuan character variant one": "\u0575\u0565\u0576\u056b\/\u0575\u0578\u0582\u0561\u0576\u056b \u0576\u0577\u0561\u0576 \u057f\u0561\u0580\u0562\u0565\u0580\u0561\u056f \u0561\u057c\u0561\u057b\u056b\u0576",
-"Loading emoticons...": "\u054d\u0574\u0561\u0575\u056c\u056b\u056f\u0576\u0565\u0580\u056b \u0562\u0565\u057c\u0576\u0578\u0582\u0574\u0568\u2024\u2024\u2024",
-"Could not load emoticons": "\u0549\u056f\u0561\u0580\u0578\u0572\u0561\u0581\u0561\u0576 \u0562\u0565\u057c\u0576\u057e\u0565\u056c \u057d\u0574\u0561\u0575\u056c\u056b\u056f\u0576\u0565\u0580\u0568",
-"People": "\u0544\u0561\u0580\u0564\u056b\u0584",
-"Animals and Nature": "\u053f\u0565\u0576\u0564\u0561\u0576\u056b\u0576\u0565\u0580 \u0587 \u0532\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Food and Drink": "\u054d\u0576\u0578\u0582\u0576\u0564 \u0587 \u056d\u0574\u056b\u0579\u0584",
-"Activity": "\u0533\u0578\u0580\u056e\u0578\u0582\u0576\u0565\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Travel and Places": "\u0543\u0561\u0576\u0561\u057a\u0561\u0580\u0570\u0578\u0580\u0564\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580 \u0587 \u057e\u0561\u0575\u0580\u0565\u0580",
-"Objects": "\u0555\u0562\u0575\u0565\u056f\u057f\u0576\u0565\u0580",
-"Flags": "\u0534\u0580\u0578\u0577\u0576\u0565\u0580",
-"Characters": "\u0546\u056b\u0577\u0565\u0580",
-"Characters (no spaces)": "\u0546\u056b\u0577\u0565\u0580 (\u0562\u0561\u0581\u0561\u057f\u0576\u0565\u0580)",
-"{0} characters": "{0} \u0576\u056b\u0577\u0565\u0580",
-"Error: Form submit field collision.": "\u054d\u056d\u0561\u056c\u0589 \u0541\u0587\u0568 \u0570\u0561\u057d\u057f\u0561\u057f\u0565\u056c\u0578\u0582\u0581 \u0564\u0561\u0577\u057f\u056b \u0562\u0561\u056d\u0578\u0582\u0574:",
-"Error: No form element found.": "\u054d\u056d\u0561\u056c\u0589 \u0541\u0587\u056b \u0578\u0579 \u0574\u056b \u057f\u0561\u0580\u0580 \u0579\u056b \u0563\u057f\u0576\u057e\u0565\u056c:",
-"Update": "\u0539\u0561\u0580\u0574\u0561\u0581\u0576\u0565\u056c",
-"Color swatch": "\u0533\u0578\u0582\u0575\u0576\u056b \u0583\u0578\u056d\u0561\u0576\u0561\u056f\u0578\u0582\u0574",
-"Turquoise": "\u0553\u056b\u0580\u0578\u0582\u0566\u0561\u0563\u0578\u0582\u0575\u0576",
-"Green": "\u053f\u0561\u0576\u0561\u0579",
-"Blue": "\u053f\u0561\u057a\u0578\u0582\u0575\u057f",
-"Purple": "\u0544\u0561\u0576\u0578\u0582\u0577\u0561\u056f\u0561\u0563\u0578\u0582\u0575\u0576",
-"Navy Blue": "\u0544\u0578\u0582\u0563 \u056f\u0561\u057a\u0578\u0582\u0575\u057f",
-"Dark Turquoise": "\u0544\u0578\u0582\u0563 \u0583\u056b\u0580\u0578\u0582\u0566\u0561\u0563\u0578\u0582\u0575\u0576",
-"Dark Green": "\u0544\u0578\u0582\u0563 \u056f\u0561\u0576\u0561\u0579",
-"Medium Blue": "\u0544\u056b\u057b\u056b\u0576 \u056f\u0561\u057a\u0578\u0582\u0575\u057f",
-"Medium Purple": "\u0544\u056b\u057b\u056b\u0576 \u0574\u0561\u0576\u0578\u0582\u0577\u0561\u056f\u0561\u0563\u0578\u0582\u0575\u0576",
-"Midnight Blue": "\u053f\u0565\u057d\u0563\u056b\u0577\u0565\u0580\u0561\u0575\u056b\u0576 \u056f\u0561\u057a\u0578\u0582\u0575\u057f",
-"Yellow": "\u0534\u0565\u0572\u056b\u0576",
-"Orange": "\u0546\u0561\u0580\u0576\u057b\u0561\u0563\u0578\u0582\u0575\u0576",
-"Red": "\u053f\u0561\u0580\u0574\u056b\u0580",
-"Light Gray": "\u0532\u0561\u0581 \u0574\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576",
-"Gray": "\u0544\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576",
-"Dark Yellow": "\u0544\u0578\u0582\u0563 \u0564\u0565\u0572\u056b\u0576",
-"Dark Orange": "\u0544\u0578\u0582\u0563 \u0576\u0561\u0580\u0576\u057b\u0561\u0563\u0578\u0582\u0575\u0576",
-"Dark Red": "\u0544\u0578\u0582\u0563 \u056f\u0561\u0580\u0574\u056b\u0580",
-"Medium Gray": "\u0544\u056b\u057b\u056b\u0576 \u0574\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576",
-"Dark Gray": "\u0544\u0578\u0582\u0563 \u0574\u0578\u056d\u0580\u0561\u0563\u0578\u0582\u0575\u0576",
-"Light Green": "\u0532\u0561\u0581 \u056f\u0561\u0576\u0561\u0579",
-"Light Yellow": "\u0532\u0561\u0581 \u0564\u0565\u0572\u056b\u0576",
-"Light Red": "\u0532\u0561\u0581 \u056f\u0561\u0580\u0574\u056b\u0580",
-"Light Purple": "\u0532\u0561\u0581 \u0574\u0561\u0576\u0578\u0582\u0577\u0561\u056f\u0561\u0563\u0578\u0582\u0575\u0576",
-"Light Blue": "\u0532\u0561\u0581 \u056f\u0561\u057a\u0578\u0582\u0575\u057f",
-"Dark Purple": "\u0544\u0578\u0582\u0563 \u0574\u0561\u0576\u0578\u0582\u0577\u0561\u056f\u0561\u0563\u0578\u0582\u0575\u0576",
-"Dark Blue": "\u0544\u0578\u0582\u0563 \u056f\u0561\u057a\u0578\u0582\u0575\u057f",
-"Black": "\u054d\u0587",
-"White": "\u054d\u057a\u056b\u057f\u0561\u056f",
-"Switch to or from fullscreen mode": "\u0531\u0576\u0581\u0565\u0584 \u0561\u0574\u0562\u0578\u0572\u057b \u0567\u056f\u0580\u0561\u0576\u056b\u0576 \u057c\u0565\u056a\u056b\u0574\u056b\u0581 \u056f\u0561\u0574 \u0561\u0574\u0562\u0578\u0572\u057b \u057c\u0565\u056a\u056b\u0574\u056b\u0581",
-"Open help dialog": "\u0532\u0561\u0581\u0565\u056c \u0585\u0563\u0576\u0578\u0582\u0569\u0575\u0561\u0576 \u0565\u0580\u056f\u056d\u0578\u057d\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0568",
-"history": "\u054a\u0561\u057f\u0574\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"styles": "\u0578\u0573\u0565\u0580\u0568",
-"formatting": "\u0579\u0561\u0583\u0561\u0576\u0577\u0578\u0582\u0574",
-"alignment": "\u0570\u0561\u057e\u0561\u057d\u0561\u0580\u0565\u0581\u0578\u0582\u0574",
-"indentation": "\u056d\u0561\u0575\u0569\u0578\u0581",
-"permanent pen": "\u0574\u0577\u057f\u0561\u056f\u0561\u0576 \u0563\u0580\u056b\u0579",
-"comments": "\u0574\u0565\u056f\u0576\u0561\u0562\u0561\u0576\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580",
-"Format Painter": "\u0541\u0587\u0561\u0579\u0561\u0583\u056b \u0576\u056f\u0561\u0580\u056b\u0579",
-"Insert\/edit iframe": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u0584\/\u056d\u0574\u0562\u0561\u0563\u0580\u0565\u0584 iframe- \u0568",
-"Capitalization": "\u0544\u0565\u056e\u0561\u057f\u0561\u057c",
-"lowercase": "\u0553\u0578\u0584\u0580\u0561\u057f\u0561\u057c",
-"UPPERCASE": "\u0544\u0535\u053e\u0531\u054f\u0531\u054c",
-"Title Case": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580 \u0533\u0578\u0580\u056e",
-"Permanent Pen Properties": "\u0544\u0577\u057f\u0561\u056f\u0561\u0576 \u0563\u0580\u056b\u0579\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568",
-"Permanent pen properties...": "\u0544\u0577\u057f\u0561\u056f\u0561\u0576 \u0563\u0580\u056b\u0579\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568\u2024\u2024\u2024",
-"Font": "\u054f\u0561\u057c\u0561\u057f\u0565\u057d\u0561\u056f",
-"Size": "\u0549\u0561\u0583\u057d",
-"More...": "\u0531\u057e\u0565\u056c\u056b\u0576\u2024\u2024\u2024",
-"Spellcheck Language": "\u0548\u0582\u0572\u0572\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0561\u0576 \u057d\u057f\u0578\u0582\u0563\u0574\u0561\u0576 \u056c\u0565\u0566\u0578\u0582",
-"Select...": "\u0538\u0576\u057f\u0580\u0565\u056c\u2024\u2024\u2024",
-"Preferences": "\u0546\u0561\u056d\u0561\u057a\u0561\u057f\u057e\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580",
-"Yes": "\u0531\u0575\u0578",
-"No": "\u0548\u0579",
-"Keyboard Navigation": "\u054d\u057f\u0565\u0572\u0576\u0561\u0577\u0561\u0580\u056b \u0546\u0561\u057e\u056b\u0563\u0561\u0581\u056b\u0561",
-"Version": "\u054f\u0561\u0580\u0562\u0565\u0580\u0561\u056f",
-"Anchor": "\u053d\u0561\u0580\u056b\u057d\u056d",
-"Special character": "\u0540\u0561\u057f\u0578\u0582\u056f \u057d\u056b\u0574\u057e\u0578\u056c\u0576\u0565\u0580",
-"Code sample": "\u053f\u0578\u0564\u056b \u0585\u0580\u056b\u0576\u0561\u056f",
-"Color": "\u0533\u0578\u0582\u0575\u0576",
-"Emoticons": "\u054d\u0574\u0561\u0575\u056c\u056b\u056f\u0576\u0565\u0580",
-"Document properties": "\u0553\u0561\u057d\u057f\u0561\u0569\u0572\u0569\u056b \u0570\u0561\u057f\u056f\u0578\u0582\u0569\u0575\u0578\u0582\u0576\u0576\u0565\u0580\u0568",
-"Image": "\u0546\u056f\u0561\u0580",
-"Insert link": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0570\u0572\u0578\u0582\u0574",
-"Target": "\u0539\u056b\u0580\u0561\u056d",
-"Link": "\u0540\u0572\u0578\u0582\u0574",
-"Poster": "\u054a\u0561\u057d\u057f\u0561\u057c",
-"Media": "\u0544\u0565\u0564\u056b\u0561",
-"Print": "\u054f\u057a\u0565\u056c",
-"Prev": "\u0546\u0561\u056d\u0578\u0580\u0564",
-"Find and replace": "\u0553\u0576\u057f\u0580\u0565\u056c \u0587 \u0583\u0578\u056d\u0561\u0580\u056b\u0576\u0565\u056c",
-"Whole words": "\u0532\u0561\u057c\u0565\u0580\u0568 \u0561\u0574\u0562\u0578\u0572\u057b\u0578\u0582\u0569\u0575\u0561\u0574\u0562",
-"Spellcheck": "\u0548\u0582\u0572\u0572\u0561\u0563\u0580\u0578\u0582\u0569\u0575\u0578\u0582\u0576",
-"Caption": "\u054e\u0565\u0580\u0576\u0561\u0563\u056b\u0580",
-"Insert template": "\u054f\u0565\u0572\u0561\u0564\u0580\u0565\u056c \u0571\u0587\u0561\u0576\u0574\u0578\u0582\u0577"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/is_IS.js Deleted

@@ -1,415 +0,0 @@
-tinymce.addI18n('is_IS',{
-"Redo": "Endurkalla",
-"Undo": "Afturkalla",
-"Cut": "Skera",
-"Copy": "Afrita",
-"Paste": "L\u00edma",
-"Select all": "Velja allt",
-"New document": "N\u00fdtt skjal",
-"Ok": "Sta\u00f0festa",
-"Cancel": "H\u00e6tta vi\u00f0",
-"Visual aids": "Sj\u00f3nr\u00e6n hj\u00e1lp",
-"Bold": "Feitletra\u00f0",
-"Italic": "Skr\u00e1letra\u00f0",
-"Underline": "Undirstrika\u00f0",
-"Strikethrough": "Yfirstrika\u00f0",
-"Superscript": "Uppskrift",
-"Subscript": "Ni\u00f0urskrifa\u00f0",
-"Clear formatting": "Hreinsa sni\u00f0",
-"Align left": "Vinstrijafna",
-"Align center": "Mi\u00f0jujafna",
-"Align right": "H\u00e6grijafna",
-"Justify": "Jafna",
-"Bullet list": "K\u00falu listi",
-"Numbered list": "N\u00famera\u00f0ur listi",
-"Decrease indent": "Minnka inndr\u00e1tt",
-"Increase indent": "Auka inndr\u00e1tt",
-"Close": "Loka",
-"Formats": "Sni\u00f0m\u00e1t",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Vafrinn \u00feinn sty\u00f0ur ekki beinann a\u00f0gang a\u00f0 klippibor\u00f0inu.  Nota\u00f0u Ctrl-X\/C\/V \u00e1 lyklabor\u00f0inu \u00ed sta\u00f0inn.",
-"Headers": "Fyrirsagnir",
-"Header 1": "Fyrirs\u00f6gn 1",
-"Header 2": "Fyrirs\u00f6gn 2",
-"Header 3": "Fyrirs\u00f6gn 3",
-"Header 4": "Fyrirs\u00f6gn 4",
-"Header 5": "Fyrirs\u00f6gn 5",
-"Header 6": "Fyrirs\u00f6gn 6",
-"Headings": "Fyrirsagnir",
-"Heading 1": "Fyrirs\u00f6gn 1",
-"Heading 2": "Fyrirs\u00f6gn 2",
-"Heading 3": "Fyrirs\u00f6gn 3",
-"Heading 4": "Fyrirs\u00f6gn 4",
-"Heading 5": "Fyrirs\u00f6gn 5",
-"Heading 6": "Fyrirs\u00f6gn 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "\u00d3st\u00edla\u00f0",
-"Code": "K\u00f3\u00f0i",
-"Paragraph": "M\u00e1lsgrein",
-"Blockquote": "Blokk",
-"Inline": "Inndregi\u00f0",
-"Blocks": "Blokkir",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "L\u00edming er \u00ed l\u00e1tlausum ham.  Innihald ver\u00f0ur l\u00edmt sem l\u00e1tlaus texti \u00feanga\u00f0 til \u00fe\u00fa afvirkjar \u00feennan m\u00f6guleika.",
-"Fonts": "Leturger\u00f0ir",
-"Font Sizes": "Leturst\u00e6r\u00f0",
-"Class": "Tegund",
-"Browse for an image": "Finna mynd \u00ed t\u00f6lvunni",
-"OR": "E\u00d0A",
-"Drop an image here": "Settu inn mynd h\u00e9r",
-"Upload": "Hla\u00f0a upp",
-"Block": "Blokka",
-"Align": "Stilla",
-"Default": "Sj\u00e1lfgefi\u00f0",
-"Circle": "Hringur",
-"Disc": "Diskur",
-"Square": "Ferningur",
-"Lower Alpha": "L\u00e1gstafir Alpha",
-"Lower Greek": "L\u00e1gstafir Gr\u00edskir",
-"Lower Roman": "L\u00e1gstafir R\u00f3mverskir",
-"Upper Alpha": "H\u00e1stafir Alpha",
-"Upper Roman": "H\u00e1stafir R\u00f3mverskir",
-"Anchor...": "Anchor...",
-"Name": "Nafn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u00e6tti a\u00f0 byrja \u00e1 b\u00f3kstaf, og skal einungis innihalda b\u00f3kstafi, t\u00f6lustafi, bandstrik, punkta, kommur e\u00f0a strik ni\u00f0ri.",
-"You have unsaved changes are you sure you want to navigate away?": "\u00dea\u00f0 eru \u00f3vista\u00f0ar breytingar, ertu viss um a\u00f0 \u00fe\u00fa viljir vafra \u00ed burtu?",
-"Restore last draft": "Endurkalla s\u00ed\u00f0asta uppkast",
-"Special character...": "S\u00e9rstakur stafur...",
-"Source code": "Frumk\u00f3\u00f0i",
-"Insert\/Edit code sample": "Setja inn\/breyta k\u00f3\u00f0ad\u00e6mi",
-"Language": "Tungum\u00e1l",
-"Code sample...": "K\u00f3\u00f0ad\u00e6mi...",
-"Color Picker": "Litaval",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Vinstri til h\u00e6gri",
-"Right to left": "H\u00e6gri til vinstri",
-"Emoticons...": "Tilfinningat\u00e1kn...",
-"Metadata and Document Properties": "Metadata- og skjaleiginleikar",
-"Title": "Titill",
-"Keywords": "Lykilor\u00f0",
-"Description": "L\u00fdsing",
-"Robots": "Leitarv\u00e9lar",
-"Author": "H\u00f6fundur",
-"Encoding": "Umbreyting",
-"Fullscreen": "Fylla skj\u00e1",
-"Action": "A\u00f0ger\u00f0",
-"Shortcut": "Fl\u00fdtilei\u00f0",
-"Help": "Hj\u00e1lp",
-"Address": "Address",
-"Focus to menubar": "F\u00f3kus \u00e1 menubar",
-"Focus to toolbar": "F\u00f3kus \u00e1 t\u00e6kjastiku",
-"Focus to element path": "F\u00f3kus \u00e1 element path",
-"Focus to contextual toolbar": "F\u00f3kus \u00e1 contextual toolbar",
-"Insert link (if link plugin activated)": "Setja inn hlekk (ef link vi\u00f0b\u00f3t er virk)",
-"Save (if save plugin activated)": "Vista (ef vistunar vi\u00f0b\u00f3t er virk)",
-"Find (if searchreplace plugin activated)": "Leita (ef searchreplace vi\u00f0b\u00f3t er virk)",
-"Plugins installed ({0}):": "Uppsettar vi\u00f0b\u00f3tir ({0}):",
-"Premium plugins:": "Premium vi\u00f0b\u00e6tur:",
-"Learn more...": "Sj\u00e1 meira...",
-"You are using {0}": "\u00de\u00fa ert a\u00f0 nota {0}",
-"Plugins": "Vi\u00f0b\u00e6tur",
-"Handy Shortcuts": "Sni\u00f0ugar fl\u00fdtilei\u00f0ir",
-"Horizontal line": "L\u00e1r\u00e9tt l\u00edna",
-"Insert\/edit image": "Setja inn\/breyta mynd",
-"Image description": "L\u00fdsing myndar",
-"Source": "Sl\u00f3\u00f0i",
-"Dimensions": "Hlutf\u00f6ll",
-"Constrain proportions": "Halda hlutf\u00f6llum",
-"General": "Almennt",
-"Advanced": "\u00cdtarlegt",
-"Style": "St\u00edll",
-"Vertical space": "L\u00f3\u00f0r\u00e9tt bil",
-"Horizontal space": "L\u00e1r\u00e9tt bil",
-"Border": "Rammi",
-"Insert image": "Setja inn mynd",
-"Image...": "Mynd...",
-"Image list": "Myndalisti",
-"Rotate counterclockwise": "Sn\u00faa rangs\u00e6lis",
-"Rotate clockwise": "Sn\u00faa r\u00e9tts\u00e6lis",
-"Flip vertically": "Sn\u00faa l\u00f3\u00f0r\u00e9tt",
-"Flip horizontally": "Sn\u00faa l\u00f3\u00f0r\u00e9tt",
-"Edit image": "Breyta mynd",
-"Image options": "Valm\u00f6guleikar myndar",
-"Zoom in": "\u00deysja inn",
-"Zoom out": "\u00deysja \u00fat",
-"Crop": "Crop",
-"Resize": "Breyta st\u00e6r\u00f0",
-"Orientation": "Orientation",
-"Brightness": "Birtustig",
-"Sharpen": "Skerpa",
-"Contrast": "Contrast",
-"Color levels": "Litastu\u00f0lar",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Sta\u00f0festa",
-"Back": "Til baka",
-"Insert date\/time": "Setja inn dagsetningu\/t\u00edma",
-"Date\/time": "Dagur\/t\u00edmi",
-"Insert\/Edit Link": "Setja inn\/Breyta hlekk",
-"Insert\/edit link": "Setja inn\/breyta hlekk",
-"Text to display": "Texti til a\u00f0 s\u00fdna",
-"Url": "Veffang",
-"Open link in...": "Opna hlekk \u00ed...",
-"Current window": "N\u00faverandi gluggi",
-"None": "Ekkert",
-"New window": "N\u00fdr gluggi",
-"Remove link": "Fjarl\u00e6gja hlekk",
-"Anchors": "Akkeri",
-"Link...": "Hlekkur...",
-"Paste or type a link": "L\u00edma e\u00f0a sl\u00e1 inn hlekk",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Hlekkurinn sem \u00fe\u00fa rita\u00f0ir inn l\u00fdtur \u00fat fyrir a\u00f0 vera netfang. Viltu b\u00e6ta vi\u00f0 forskeytinu mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Hlekkurinn sem \u00fe\u00fa rita\u00f0ir inn l\u00fdtur \u00fat fyrir a\u00f0 vera ytri hlekkur. Viltu b\u00e6ta vi\u00f0 forskeytinu http:\/\/ ?",
-"Link list": "Listi hlekkja",
-"Insert video": "Setja inn myndband",
-"Insert\/edit video": "Setja inn\/fjarl\u00e6gja myndband",
-"Insert\/edit media": "Setja inn\/breyta myndefni",
-"Alternative source": "Valkv\u00e6\u00f0ur frumk\u00f3\u00f0i",
-"Alternative source URL": "Alternative source URL",
-"Media poster (Image URL)": "Media poster (mynd URL)",
-"Paste your embed code below:": "L\u00edma frumk\u00f3\u00f0a fyrir ne\u00f0an:",
-"Embed": "Hengja vi\u00f0",
-"Media...": "Media...",
-"Nonbreaking space": "Bil sem brotnar ekki",
-"Page break": "S\u00ed\u00f0ubrot",
-"Paste as text": "L\u00edma sem texta",
-"Preview": "Forsko\u00f0un",
-"Print...": "Prenta...",
-"Save": "Vista",
-"Find": "Finna",
-"Replace with": "Skipta \u00fat me\u00f0",
-"Replace": "Skipta \u00fat",
-"Replace all": "Skipta \u00f6llum \u00fat",
-"Previous": "Fyrri",
-"Next": "N\u00e6sti",
-"Find and replace...": "Find and replace...",
-"Could not find the specified string.": "Fann ekki umbe\u00f0inn streng.",
-"Match case": "Samanbur\u00f0ur",
-"Find whole words only": "Finna einungis heil or\u00f0",
-"Spell check": "Stafsetning",
-"Ignore": "Hunsa",
-"Ignore all": "Hunsa allt",
-"Finish": "Lj\u00faka",
-"Add to Dictionary": "B\u00e6ta vi\u00f0 or\u00f0ab\u00f3k",
-"Insert table": "Setja inn t\u00f6flu",
-"Table properties": "Stillingar t\u00f6flu",
-"Delete table": "Ey\u00f0a t\u00f6flu",
-"Cell": "Reitur",
-"Row": "R\u00f6\u00f0",
-"Column": "D\u00e1lkur",
-"Cell properties": "Stillingar reits",
-"Merge cells": "Sameina reiti",
-"Split cell": "Deila reiti",
-"Insert row before": "Setja inn r\u00f6\u00f0 fyrir framan",
-"Insert row after": "Setja inn r\u00f6\u00f0 fyrir aftan",
-"Delete row": "Ey\u00f0a r\u00f6\u00f0",
-"Row properties": "Stillingar ra\u00f0ar",
-"Cut row": "Klippa r\u00f6\u00f0",
-"Copy row": "Afrita r\u00f6\u00f0",
-"Paste row before": "L\u00edma r\u00f6\u00f0 fyrir framan",
-"Paste row after": "L\u00edma r\u00f6\u00f0 fyrir aftan",
-"Insert column before": "Setja inn d\u00e1lk fyrir framan",
-"Insert column after": "Setja inn d\u00e1lk fyrir aftan",
-"Delete column": "Ey\u00f0a d\u00e1lki",
-"Cols": "D\u00e1lkar",
-"Rows": "Ra\u00f0ir",
-"Width": "Breidd",
-"Height": "H\u00e6\u00f0",
-"Cell spacing": "Bil \u00ed reit",
-"Cell padding": "R\u00fdmi reits",
-"Show caption": "S\u00fdna myndatexta",
-"Left": "Vinstri",
-"Center": "Mi\u00f0ja",
-"Right": "H\u00e6gri",
-"Cell type": "Tegund reits",
-"Scope": "Gildissvi\u00f0",
-"Alignment": "J\u00f6fnun",
-"H Align": "L\u00e1r\u00e9tt j\u00f6fnun",
-"V Align": "L\u00f3\u00f0r\u00e9tt j\u00f6fnun",
-"Top": "Efst",
-"Middle": "Mi\u00f0ja",
-"Bottom": "Ne\u00f0st",
-"Header cell": "Reitarhaus",
-"Row group": "H\u00f3pur ra\u00f0ar",
-"Column group": "H\u00f3pur d\u00e1lks",
-"Row type": "Tegund ra\u00f0ar",
-"Header": "Fyrirs\u00f6gn",
-"Body": "Innihald",
-"Footer": "Ne\u00f0anm\u00e1l",
-"Border color": "Litur \u00e1 ramma",
-"Insert template...": "Setja inn sni\u00f0m\u00e1t...",
-"Templates": "Sni\u00f0m\u00e1t",
-"Template": "Sni\u00f0m\u00e1t",
-"Text color": "Litur texta",
-"Background color": "Bakgrunnslitur",
-"Custom...": "S\u00e9rsni\u00f0i\u00f0...",
-"Custom color": "S\u00e9rsni\u00f0in litur",
-"No color": "Enginn litur",
-"Remove color": "Fjarl\u00e6gja lit",
-"Table of Contents": "Efnisyfirlit",
-"Show blocks": "S\u00fdna kubba",
-"Show invisible characters": "S\u00fdna \u00f3s\u00fdnilega stafi",
-"Word count": "Or\u00f0afj\u00f6ldi",
-"Count": "Fj\u00f6ldi",
-"Document": "Skjal",
-"Selection": "Val",
-"Words": "Or\u00f0",
-"Words: {0}": "Or\u00f0:  {0}",
-"{0} words": "{0} or\u00f0",
-"File": "Skjal",
-"Edit": "Breyta",
-"Insert": "Setja inn",
-"View": "Sko\u00f0a",
-"Format": "Sni\u00f0",
-"Table": "Tafla",
-"Tools": "T\u00f3l",
-"Powered by {0}": "Keyrt af {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textasv\u00e6\u00f0i \u00ed \u00edtarham.  \u00ddttu \u00e1 ALT-F9 fyrir valmynd.  \u00ddttu \u00e1 ALT-F10 fyrir t\u00f3lastiku.  \u00ddttu \u00e1 ALT-0 fyrir a\u00f0sto\u00f0.",
-"Image title": "Titill myndar",
-"Border width": "Border width",
-"Border style": "Border style",
-"Error": "Villa",
-"Warn": "A\u00f0vara",
-"Valid": "Gilt",
-"To open the popup, press Shift+Enter": "\u00ddttu \u00e1 Shift+Enter til a\u00f0 opna sprettiglugga",
-"Rich Text Area. Press ALT-0 for help.": "Rich Text sv\u00e6\u00f0i. Smelltu \u00e1 Alt-0 fyrir hj\u00e1lp",
-"System Font": "Kerfis leturger\u00f0",
-"Failed to upload image: {0}": "Gat ekki hala\u00f0 upp mynd: {0}",
-"Failed to load plugin: {0} from url {1}": "Gat ekki hla\u00f0i\u00f0 vi\u00f0b\u00f3t: {0} fr\u00e1 urli {1}",
-"Failed to load plugin url: {0}": "Gat ekki hla\u00f0i\u00f0 vi\u00f0b\u00f3t url: {0}",
-"Failed to initialize plugin: {0}": "Val",
-"example": "d\u00e6mi",
-"Search": "Leita",
-"All": "Allt",
-"Currency": "Gjaldmi\u00f0ill",
-"Text": "Texti",
-"Quotations": "Tilvitnanir",
-"Mathematical": "St\u00e6r\u00f0fr\u00e6\u00f0i",
-"Extended Latin": "Extended Latin",
-"Symbols": "T\u00e1kn",
-"Arrows": "\u00d6rvar",
-"User Defined": "Stillt af notanda",
-"dollar sign": "dollar t\u00e1kn",
-"currency sign": "gjaldmi\u00f0ils t\u00e1kn",
-"euro-currency sign": "evru-gjaldmi\u00f0ils t\u00e1kn",
-"colon sign": "kommu t\u00e1kn",
-"cruzeiro sign": "cruzeiro t\u00e1kn",
-"french franc sign": "franskur franki t\u00e1kn",
-"lira sign": "lira t\u00e1kn",
-"mill sign": "mill t\u00e1kn",
-"naira sign": "naira t\u00e1kn",
-"peseta sign": "peseta t\u00e1kn",
-"rupee sign": "rupee t\u00e1kn",
-"won sign": "won t\u00e1kn",
-"new sheqel sign": "new sheqel t\u00e1kn",
-"dong sign": "dong t\u00e1kn",
-"kip sign": "kip t\u00e1kn",
-"tugrik sign": "tugrik t\u00e1kn",
-"drachma sign": "drachma t\u00e1kn",
-"german penny symbol": "german penny t\u00e1kn",
-"peso sign": "peso t\u00e1kn",
-"guarani sign": "guarani t\u00e1kn",
-"austral sign": "austral t\u00e1kn",
-"hryvnia sign": "hryvnia t\u00e1kn",
-"cedi sign": "cedi t\u00e1kn",
-"livre tournois sign": "livre tournois t\u00e1kn",
-"spesmilo sign": "spesmilo t\u00e1kn",
-"tenge sign": "tenge t\u00e1kn",
-"indian rupee sign": "indverskt rupee t\u00e1kn",
-"turkish lira sign": "tyrknesk l\u00edra t\u00e1kn",
-"nordic mark sign": "nordic mark t\u00e1kn",
-"manat sign": "manat t\u00e1kn",
-"ruble sign": "ruble t\u00e1kn",
-"yen character": "yen stafur",
-"yuan character": "yuan stafur",
-"yuan character, in hong kong and taiwan": "yuan stafur, \u00ed Hong Kong og Ta\u00edvan",
-"yen\/yuan character variant one": "yen\/yuan t\u00e1kn afbrig\u00f0i eitt",
-"Loading emoticons...": "Hle\u00f0 tilfinningat\u00e1kn...",
-"Could not load emoticons": "Gat ekki hla\u00f0i\u00f0 tilfinningat\u00e1kn",
-"People": "F\u00f3lk",
-"Animals and Nature": "D\u00fdr og n\u00e1tt\u00fara",
-"Food and Drink": "Matur og drykkur",
-"Activity": "Virkni",
-"Travel and Places": "Fer\u00f0al\u00f6g og sta\u00f0ir",
-"Objects": "Hlutir",
-"Flags": "F\u00e1nar",
-"Characters": "Stafabil",
-"Characters (no spaces)": "Stafabil (engin bil)",
-"{0} characters": "{0} stafabil",
-"Error: Form submit field collision.": "Villa: Form submit field collision.",
-"Error: No form element found.": "Villa: Ekkert form element fannst.",
-"Update": "Uppf\u00e6ra",
-"Color swatch": "Litaval",
-"Turquoise": "Gr\u00e6nbl\u00e1r",
-"Green": "Gr\u00e6nn",
-"Blue": "Bl\u00e1r",
-"Purple": "Fj\u00f3lubl\u00e1r",
-"Navy Blue": "D\u00f6kkbl\u00e1r",
-"Dark Turquoise": "D\u00f6kk gr\u00e6nbl\u00e1r",
-"Dark Green": "D\u00f6kkgr\u00e6nn",
-"Medium Blue": "Mi\u00f0lungs bl\u00e1r",
-"Medium Purple": "Mi\u00f0lungs fj\u00f3lubl\u00e1r",
-"Midnight Blue": "N\u00e6turbl\u00e1r",
-"Yellow": "Gulur",
-"Orange": "Appels\u00ednugulur",
-"Red": "Rau\u00f0ur",
-"Light Gray": "Lj\u00f3sgr\u00e1r",
-"Gray": "Gr\u00e1r",
-"Dark Yellow": "D\u00f6kkgulur",
-"Dark Orange": "D\u00f6kk appels\u00ednugulur",
-"Dark Red": "D\u00f6kkrau\u00f0ur",
-"Medium Gray": "Mi\u00f0lungs gr\u00e1r",
-"Dark Gray": "D\u00f6kkgr\u00e1r",
-"Light Green": "Lj\u00f3sgr\u00e6nn",
-"Light Yellow": "Lj\u00f3sgulur",
-"Light Red": "Lj\u00f3srau\u00f0ur",
-"Light Purple": "Lj\u00f3s fj\u00f3lubl\u00e1r",
-"Light Blue": "Lj\u00f3sbl\u00e1r",
-"Dark Purple": "D\u00f6kk fj\u00f3lubl\u00e1r",
-"Dark Blue": "D\u00f6kkbl\u00e1r",
-"Black": "Svartur",
-"White": "Hv\u00edtur",
-"Switch to or from fullscreen mode": "Skipta \u00ed e\u00f0a \u00far fullum skj\u00e1",
-"Open help dialog": "Opna hj\u00e1lparkassa",
-"history": "saga",
-"styles": "st\u00edlar",
-"formatting": "formatting",
-"alignment": "textastilling",
-"indentation": "inndr\u00e1ttur",
-"permanent pen": "varanlegur penni",
-"comments": "umm\u00e6li",
-"Format Painter": "Format Painter",
-"Insert\/edit iframe": "Setja inn\/breyta iframe",
-"Capitalization": "H\u00e1stafir",
-"lowercase": "l\u00e1gstafir",
-"UPPERCASE": "H\u00c1STAFIR",
-"Title Case": "Title Case",
-"Permanent Pen Properties": "Varanlegur penni stillingar",
-"Permanent pen properties...": "Varanlegur penni stillingar...",
-"Font": "Leturger\u00f0",
-"Size": "St\u00e6r\u00f0",
-"More...": "Meira...",
-"Spellcheck Language": "Stafsetning tungum\u00e1ls",
-"Select...": "Velja...",
-"Preferences": "Stillingar",
-"Yes": "J\u00e1",
-"No": "Nei",
-"Keyboard Navigation": "Lyklabor\u00f0 Navigation",
-"Version": "\u00datg\u00e1fa",
-"Anchor": "Akkeri",
-"Special character": "S\u00e9rstakir stafir",
-"Color": "Litur",
-"Emoticons": "Tilfinningar",
-"Document properties": "Eigindi skjals",
-"Insert link": "Setja inn hlekk",
-"Target": "Mi\u00f0",
-"Poster": "Plakat",
-"Print": "Prenta",
-"Whole words": "Heil or\u00f0",
-"Find and replace": "Finna og skipta \u00fat",
-"Prev": "Fyrri",
-"Spellcheck": "Villuleit",
-"Caption": "Titill",
-"Insert template": "Setja inn sni\u00f0m\u00e1t"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/it.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('it',{
-"Redo": "Ripristina",
-"Undo": "Annulla",
-"Cut": "Taglia",
-"Copy": "Copia",
-"Paste": "Incolla",
-"Select all": "Seleziona tutto",
-"New document": "Nuovo documento",
-"Ok": "OK",
-"Cancel": "Annulla",
-"Visual aids": "Aiuti visivi",
-"Bold": "Grassetto",
-"Italic": "Corsivo",
-"Underline": "Sottolineato",
-"Strikethrough": "Barrato",
-"Superscript": "Apice",
-"Subscript": "Pedice",
-"Clear formatting": "Cancella la formattazione",
-"Align left": "Allinea a sinistra",
-"Align center": "Allinea al centro",
-"Align right": "Allinea a destra",
-"Justify": "Giustifica",
-"Bullet list": "Elenco puntato",
-"Numbered list": "Elenco numerato",
-"Decrease indent": "Riduci rientro",
-"Increase indent": "Aumenta rientro",
-"Close": "Chiudi",
-"Formats": "Formati",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Il browser non supporta l'accesso diretto alla cartella degli appunti. Usare i tasti di scelta rapida Ctrl+X\/C\/V.",
-"Headers": "Intestazioni",
-"Header 1": "Intestazione 1",
-"Header 2": "Intestazione 2",
-"Header 3": "Intestazione 3",
-"Header 4": "Intestazione 4",
-"Header 5": "Intestazione 5",
-"Header 6": "Intestazione 6",
-"Headings": "Titoli",
-"Heading 1": "Titolo 1",
-"Heading 2": "Titolo 2",
-"Heading 3": "Titolo 3",
-"Heading 4": "Titolo 4",
-"Heading 5": "Titolo 5",
-"Heading 6": "Titolo 6",
-"Preformatted": "Preformattato",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Codice",
-"Paragraph": "Paragrafo",
-"Blockquote": "Blockquote",
-"Inline": "In linea",
-"Blocks": "Blocchi",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Incolla \u00e8 in modalit\u00e0 testo normale. I contenuti sono incollati come testo normale se non disattivi l'opzione.",
-"Fonts": "Caratteri",
-"Font Sizes": "Dimensioni caratteri",
-"Class": "Classe",
-"Browse for an image": "Cerca un'immagine",
-"OR": "OPPURE",
-"Drop an image here": "Rilasciare un'immagine qui",
-"Upload": "Carica",
-"Block": "Blocco",
-"Align": "Allinea",
-"Default": "Default",
-"Circle": "Cerchio",
-"Disc": "Disco",
-"Square": "Quadrato",
-"Lower Alpha": "Alpha Minore",
-"Lower Greek": "Greek Minore",
-"Lower Roman": "Roman Minore",
-"Upper Alpha": "Alpha Superiore",
-"Upper Roman": "Roman Superiore",
-"Anchor...": "Ancoraggio...",
-"Name": "Nome",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'id dovrebbe cominciare con una lettera, seguito solo da lettere, numeri, linee, punti, virgole.",
-"You have unsaved changes are you sure you want to navigate away?": "Non hai salvato delle modifiche, sei sicuro di andartene?",
-"Restore last draft": "Ripristina l'ultima bozza.",
-"Special character...": "Carattere speciale...",
-"Source code": "Codice Sorgente",
-"Insert\/Edit code sample": "Inserisci\/Modifica esempio di codice",
-"Language": "Lingua",
-"Code sample...": "Esempio di codice...",
-"Color Picker": "Selezione colori",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Da Sinistra a Destra",
-"Right to left": "Da Destra a Sinistra",
-"Emoticons...": "Emoticon...",
-"Metadata and Document Properties": "Metadata e propriet\u00e0 del documento",
-"Title": "Titolo",
-"Keywords": "Parola Chiave",
-"Description": "Descrizione",
-"Robots": "Robot",
-"Author": "Autore",
-"Encoding": "Codifica",
-"Fullscreen": "Schermo Intero",
-"Action": "Azione",
-"Shortcut": "Scorciatoia",
-"Help": "Aiuto",
-"Address": "Indirizzo",
-"Focus to menubar": "Focus sulla barra del menu",
-"Focus to toolbar": "Focus sulla barra degli strumenti",
-"Focus to element path": "Focus sul percorso dell'elemento",
-"Focus to contextual toolbar": "Focus sulla barra degli strumenti contestuale",
-"Insert link (if link plugin activated)": "Inserisci link (se il plugin link \u00e8 attivato)",
-"Save (if save plugin activated)": "Salva (se il plugin save \u00e8 attivato)",
-"Find (if searchreplace plugin activated)": "Trova (se il plugin searchreplace \u00e8 attivato)",
-"Plugins installed ({0}):": "Plugin installati ({0}):",
-"Premium plugins:": "Plugin Premium:",
-"Learn more...": "Per saperne di pi\u00f9...",
-"You are using {0}": "Stai usando {0}",
-"Plugins": "Plugin",
-"Handy Shortcuts": "Scorciatoia pratica",
-"Horizontal line": "Linea Orizzontale",
-"Insert\/edit image": "Aggiungi\/Modifica Immagine",
-"Image description": "Descrizione Immagine",
-"Source": "Fonte",
-"Dimensions": "Dimenzioni",
-"Constrain proportions": "Mantieni Proporzioni",
-"General": "Generale",
-"Advanced": "Avanzato",
-"Style": "Stile",
-"Vertical space": "Spazio Verticale",
-"Horizontal space": "Spazio Orizzontale",
-"Border": "Bordo",
-"Insert image": "Inserisci immagine",
-"Image...": "Immagine...",
-"Image list": "Elenco immagini",
-"Rotate counterclockwise": "Ruota in senso antiorario",
-"Rotate clockwise": "Ruota in senso orario",
-"Flip vertically": "Rifletti verticalmente",
-"Flip horizontally": "Rifletti orizzontalmente",
-"Edit image": "Modifica immagine",
-"Image options": "Opzioni immagine",
-"Zoom in": "Ingrandisci",
-"Zoom out": "Rimpicciolisci",
-"Crop": "Taglia",
-"Resize": "Ridimensiona",
-"Orientation": "Orientamento",
-"Brightness": "Luminosit\u00e0",
-"Sharpen": "Contrasta",
-"Contrast": "Contrasto",
-"Color levels": "Livelli colore",
-"Gamma": "Gamma",
-"Invert": "Inverti",
-"Apply": "Applica",
-"Back": "Indietro",
-"Insert date\/time": "Inserisci Data\/Ora",
-"Date\/time": "Data\/Ora",
-"Insert\/Edit Link": "Inserisci\/modifica collegamento",
-"Insert\/edit link": "Inserisci\/Modifica Link",
-"Text to display": "Testo da Visualizzare",
-"Url": "Url",
-"Open link in...": "Apri collegamento in...",
-"Current window": "Finestra corrente",
-"None": "No",
-"New window": "Nuova Finestra",
-"Remove link": "Rimuovi link",
-"Anchors": "Anchors",
-"Link...": "Collegamento...",
-"Paste or type a link": "Incolla o digita un collegamento",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL inserito sembra essere un indirizzo email. Vuoi aggiungere il prefisso necessario mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Vuoi aggiungere il prefisso necessario http:\/\/?",
-"Link list": "Elenco link",
-"Insert video": "Inserisci Video",
-"Insert\/edit video": "Inserisci\/Modifica Video",
-"Insert\/edit media": "Inserisci\/Modifica Media",
-"Alternative source": "Alternativo",
-"Alternative source URL": "URL sorgente alternativa",
-"Media poster (Image URL)": "Poster dell'oggetto multimediale (URL dell'immagine)",
-"Paste your embed code below:": "Incolla il codice d'incorporamento qui:",
-"Embed": "Incorporare",
-"Media...": "Oggetto multimediale...",
-"Nonbreaking space": "Spazio unificatore",
-"Page break": "Interruzione di pagina",
-"Paste as text": "incolla come testo",
-"Preview": "Anteprima",
-"Print...": "Stampa...",
-"Save": "Salva",
-"Find": "Trova",
-"Replace with": "Sostituisci Con",
-"Replace": "Sostituisci",
-"Replace all": "Sostituisci Tutto",
-"Previous": "Indietro",
-"Next": "Successivo",
-"Find and replace...": "Trova e sostituisci...",
-"Could not find the specified string.": "Impossibile trovare la parola specifica.",
-"Match case": "Maiuscole\/Minuscole ",
-"Find whole words only": "Trova solo parole intere",
-"Spell check": "Controllo ortografia",
-"Ignore": "Ignora",
-"Ignore all": "Ignora Tutto",
-"Finish": "Termina",
-"Add to Dictionary": "Aggiungi al Dizionario",
-"Insert table": "Inserisci Tabella",
-"Table properties": "Propiet\u00e0 della Tabella",
-"Delete table": "Cancella Tabella",
-"Cell": "Cella",
-"Row": "Riga",
-"Column": "Colonna",
-"Cell properties": "Propiet\u00e0 della Cella",
-"Merge cells": "Unisci Cella",
-"Split cell": "Dividi Cella",
-"Insert row before": "Inserisci una Riga Prima",
-"Insert row after": "Inserisci una Riga Dopo",
-"Delete row": "Cancella Riga",
-"Row properties": "Propriet\u00e0 della Riga",
-"Cut row": "Taglia Riga",
-"Copy row": "Copia Riga",
-"Paste row before": "Incolla una Riga Prima",
-"Paste row after": "Incolla una Riga Dopo",
-"Insert column before": "Inserisci una Colonna Prima",
-"Insert column after": "Inserisci una Colonna Dopo",
-"Delete column": "Cancella Colonna",
-"Cols": "Colonne",
-"Rows": "Righe",
-"Width": "Larghezza",
-"Height": "Altezza",
-"Cell spacing": "Spaziatura della Cella",
-"Cell padding": "Padding della Cella",
-"Show caption": "Mostra didascalia",
-"Left": "Sinistra",
-"Center": "Centro",
-"Right": "Destra",
-"Cell type": "Tipo di Cella",
-"Scope": "Campo",
-"Alignment": "Allineamento",
-"H Align": "Allineamento H",
-"V Align": "Allineamento V",
-"Top": "In alto",
-"Middle": "In mezzo",
-"Bottom": "In fondo",
-"Header cell": "cella d'intestazione",
-"Row group": "Gruppo di Righe",
-"Column group": "Gruppo di Colonne",
-"Row type": "Tipo di Riga",
-"Header": "Header",
-"Body": "Body",
-"Footer": "Footer",
-"Border color": "Colore bordo",
-"Insert template...": "Inserisci modello...",
-"Templates": "Template",
-"Template": "Modello",
-"Text color": "Colore Testo",
-"Background color": "Colore Background",
-"Custom...": "Personalizzato...",
-"Custom color": "Colore personalizzato",
-"No color": "Nessun colore",
-"Remove color": "Rimuovi colore",
-"Table of Contents": "Tabella dei contenuti",
-"Show blocks": "Mostra Blocchi",
-"Show invisible characters": "Mostra Caratteri Invisibili",
-"Word count": "Conteggio parole",
-"Count": "Conteggio",
-"Document": "Documento",
-"Selection": "Selezione",
-"Words": "Parole",
-"Words: {0}": "Parole: {0}",
-"{0} words": "{0} parole",
-"File": "File",
-"Edit": "Modifica",
-"Insert": "Inserisci",
-"View": "Visualiza",
-"Format": "Formato",
-"Table": "Tabella",
-"Tools": "Strumenti",
-"Powered by {0}": "Fornito da {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Premi ALT-F9 per il men\u00f9. Premi ALT-F10 per la barra degli strumenti. Premi ALT-0 per l'aiuto.",
-"Image title": "Titolo immagine",
-"Border width": "Larghezza del bordo",
-"Border style": "Stile del bordo",
-"Error": "Errore",
-"Warn": "Avviso",
-"Valid": "Valido",
-"To open the popup, press Shift+Enter": "Per aprire il popup, premere Shift+Invio",
-"Rich Text Area. Press ALT-0 for help.": "Area di testo RTF. Premere ALT-0 per la guida.",
-"System Font": "Carattere di sistema",
-"Failed to upload image: {0}": "Caricamento immagine fallito: {0}",
-"Failed to load plugin: {0} from url {1}": "Caricamento plugin fallito: {0} dall'URL {1}",
-"Failed to load plugin url: {0}": "Caricamento URL plugin fallito: {0}",
-"Failed to initialize plugin: {0}": "Inizializzazione plugin fallita: {0}",
-"example": "esempio",
-"Search": "Cerca",
-"All": "Tutto",
-"Currency": "Valuta",
-"Text": "Testo",
-"Quotations": "Citazioni",
-"Mathematical": "Caratteri matematici",
-"Extended Latin": "Latino esteso",
-"Symbols": "Simboli",
-"Arrows": "Frecce",
-"User Defined": "Definito dall'utente",
-"dollar sign": "simbolo del dollaro",
-"currency sign": "simbolo di valuta",
-"euro-currency sign": "simbolo dell'euro",
-"colon sign": "simbolo del col\u00f3n",
-"cruzeiro sign": "simbolo del cruzeiro",
-"french franc sign": "simbolo del franco francese",
-"lira sign": "simbolo della lira",
-"mill sign": "simbolo del mill",
-"naira sign": "simbolo della naira",
-"peseta sign": "simbolo della peseta",
-"rupee sign": "simbolo della rup\u00eca",
-"won sign": "simbolo del won",
-"new sheqel sign": "simbolo del nuovo shekel",
-"dong sign": "simbolo del dong",
-"kip sign": "simbolo del kip",
-"tugrik sign": "simbolo del tugrik",
-"drachma sign": "simbolo della dracma",
-"german penny symbol": "simbolo del pfennig tedesco",
-"peso sign": "simbolo del peso",
-"guarani sign": "simbolo del guaran\u00ec",
-"austral sign": "simbolo dell'austral",
-"hryvnia sign": "simbolo della hryvnia",
-"cedi sign": "simbolo del cedi",
-"livre tournois sign": "simbolo della lira di Tours",
-"spesmilo sign": "simbolo dello spesmilo",
-"tenge sign": "simbolo del tenge",
-"indian rupee sign": "simbolo della rup\u00eca indiana",
-"turkish lira sign": "simbolo della lira turca",
-"nordic mark sign": "simbolo del marco nordico",
-"manat sign": "simbolo del manat",
-"ruble sign": "simbolo del rublo",
-"yen character": "simbolo dello yen",
-"yuan character": "simbolo dello yuan",
-"yuan character, in hong kong and taiwan": "simbolo dello yuan, Hong Kong e Taiwan",
-"yen\/yuan character variant one": "simbolo yen\/yuan variante uno",
-"Loading emoticons...": "Caricamento emoticon in corso",
-"Could not load emoticons": "Impossibile caricare emoticon",
-"People": "Persone",
-"Animals and Nature": "Animali e natura",
-"Food and Drink": "Cibi e bevande",
-"Activity": "Attivit\u00e0",
-"Travel and Places": "Viaggi e luoghi",
-"Objects": "Oggetti",
-"Flags": "Bandiere",
-"Characters": "Caratteri",
-"Characters (no spaces)": "Caratteri (senza spazi)",
-"{0} characters": "{0} caratteri",
-"Error: Form submit field collision.": "Errore: Conflitto di campi nel modulo inviato.",
-"Error: No form element found.": "Errore: Nessun elemento di modulo trovato.",
-"Update": "Aggiorna",
-"Color swatch": "Campione di colore",
-"Turquoise": "Turchese",
-"Green": "Verde",
-"Blue": "Blu",
-"Purple": "Viola",
-"Navy Blue": "Blu scuro",
-"Dark Turquoise": "Turchese scuro",
-"Dark Green": "Verde scuro",
-"Medium Blue": "Blu medio",
-"Medium Purple": "Viola medio",
-"Midnight Blue": "Blu notte",
-"Yellow": "Giallo",
-"Orange": "Arancio",
-"Red": "Rosso",
-"Light Gray": "Grigio chiaro",
-"Gray": "Grigio",
-"Dark Yellow": "Giallo scuro",
-"Dark Orange": "Arancio scuro",
-"Dark Red": "Rosso scuro",
-"Medium Gray": "Grigio medio",
-"Dark Gray": "Grigio scuro",
-"Light Green": "Verde chiaro",
-"Light Yellow": "Giallo chiaro",
-"Light Red": "Rosso chiaro",
-"Light Purple": "Viola chiaro",
-"Light Blue": "Azzurro",
-"Dark Purple": "Viola scuro",
-"Dark Blue": "Blu scuro",
-"Black": "Nero",
-"White": "Bianco",
-"Switch to or from fullscreen mode": "Attiva\/disattiva la modalit\u00e0 schermo intero",
-"Open help dialog": "Apri la finestra di aiuto",
-"history": "cronologia",
-"styles": "stili",
-"formatting": "formattazione",
-"alignment": "allineamento",
-"indentation": "indentazione",
-"permanent pen": "penna indelebile",
-"comments": "commenti",
-"Format Painter": "Copia formattazione",
-"Insert\/edit iframe": "Inserisci\/modifica iframe",
-"Capitalization": "Maiuscole\/minuscole",
-"lowercase": "minuscole",
-"UPPERCASE": "MAIUSCOLE",
-"Title Case": "Iniziali Maiuscole",
-"Permanent Pen Properties": "Propriet\u00e0 penna indelebile",
-"Permanent pen properties...": "Propriet\u00e0 penna indelebile...",
-"Font": "Carattere",
-"Size": "Dimensione carattere",
-"More...": "Altro\u2026",
-"Spellcheck Language": "Lingua controllo ortografico",
-"Select...": "Seleziona...",
-"Preferences": "Preferenze",
-"Yes": "S\u00ec",
-"No": "No",
-"Keyboard Navigation": "Navigazione tramite tastiera",
-"Version": "Versione",
-"Anchor": "Fissa",
-"Special character": "Carattere Speciale",
-"Code sample": "Esempio di codice",
-"Color": "Colore",
-"Emoticons": "Emoction",
-"Document properties": "Propriet\u00e0 Documento",
-"Image": "Immagine",
-"Insert link": "Inserisci il Link",
-"Target": "Target",
-"Link": "Collegamento",
-"Poster": "Anteprima",
-"Media": "Media",
-"Print": "Stampa",
-"Prev": "Precedente",
-"Find and replace": "Trova e Sostituisci",
-"Whole words": "Parole Sbagliate",
-"Spellcheck": "Controllo ortografico",
-"Caption": "Didascalia",
-"Insert template": "Inserisci Template"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/it_IT.js Added

@@ -0,0 +1,370 @@
+tinymce.addI18n('it_IT',{
+"Redo": "Ripristina",
+"Undo": "Annulla",
+"Cut": "Taglia",
+"Copy": "Copia",
+"Paste": "Incolla",
+"Select all": "Seleziona tutto",
+"New document": "Nuovo documento",
+"Ok": "OK",
+"Cancel": "Annulla",
+"Visual aids": "Aiuti visivi",
+"Bold": "Grassetto",
+"Italic": "Corsivo",
+"Underline": "Sottolineato",
+"Strikethrough": "Barrato",
+"Superscript": "Apice",
+"Subscript": "Pedice",
+"Clear formatting": "Cancella la formattazione",
+"Align left": "Allinea a sinistra",
+"Align center": "Allinea al centro",
+"Align right": "Allinea a destra",
+"Justify": "Giustifica",
+"Bullet list": "Elenco puntato",
+"Numbered list": "Elenco numerato",
+"Decrease indent": "Riduci rientro",
+"Increase indent": "Aumenta rientro",
+"Close": "Chiudi",
+"Formats": "Formati",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Il browser non supporta l'accesso diretto alla cartella degli appunti. Usare i tasti di scelta rapida Ctrl+X\/C\/V.",
+"Headers": "Intestazioni",
+"Header 1": "Intestazione 1",
+"Header 2": "Intestazione 2",
+"Header 3": "Intestazione 3",
+"Header 4": "Intestazione 4",
+"Header 5": "Intestazione 5",
+"Header 6": "Intestazione 6",
+"Headings": "Titoli",
+"Heading 1": "Titolo 1",
+"Heading 2": "Titolo 2",
+"Heading 3": "Titolo 3",
+"Heading 4": "Titolo 4",
+"Heading 5": "Titolo 5",
+"Heading 6": "Titolo 6",
+"Preformatted": "Preformattato",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "Codice",
+"Paragraph": "Paragrafo",
+"Blockquote": "Blockquote",
+"Inline": "In linea",
+"Blocks": "Blocchi",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Incolla \u00e8 in modalit\u00e0 testo normale. I contenuti saranno incollati come testo normale se non viene disattivata questa opzione.",
+"Fonts": "Caratteri",
+"Font Sizes": "Dimensioni caratteri",
+"Class": "Classe",
+"Browse for an image": "Cerca un'immagine",
+"OR": "OPPURE",
+"Drop an image here": "Rilasciare un'immagine qui",
+"Upload": "Carica",
+"Block": "Blocco",
+"Align": "Allinea",
+"Default": "Predefinito",
+"Circle": "Circolo",
+"Disc": "Disco",
+"Square": "Quadrato",
+"Lower Alpha": "Alfabetico minuscolo",
+"Lower Greek": "Greco minuscolo",
+"Lower Roman": "Romano minuscolo",
+"Upper Alpha": "Alfabetico maiuscolo",
+"Upper Roman": "Romano maiuscolo",
+"Anchor...": "Ancoraggio...",
+"Name": "Nome",
+"Id": "ID",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'ID dovrebbe cominciare con una lettera, seguita unicamente da lettere, numeri, linee, punti, due punti o caratteri di sottolineatura.",
+"You have unsaved changes are you sure you want to navigate away?": "Ci sono modifiche non salvate, si \u00e8 sicuro di volere uscire?",
+"Restore last draft": "Ripristina l'ultima bozza",
+"Special characters...": "Caratteri speciali...",
+"Source code": "Codice sorgente",
+"Insert\/Edit code sample": "Inserisci\/modifica esempio di codice",
+"Language": "Lingua",
+"Code sample...": "Esempio di codice...",
+"Color Picker": "Selezione colori",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "Da sinistra a destra",
+"Right to left": "Da destra a sinistra",
+"Emoticons...": "Emoticon...",
+"Metadata and Document Properties": "Metadata e propriet\u00e0 del documento",
+"Title": "Titolo",
+"Keywords": "Parole chiave",
+"Description": "Descrizione",
+"Robots": "Robot",
+"Author": "Autore",
+"Encoding": "Codifica",
+"Fullscreen": "A tutto schermo",
+"Action": "Azione",
+"Shortcut": "Collegamento",
+"Help": "Guida",
+"Address": "Indirizzo",
+"Focus to menubar": "Imposta stato attivo per la barra dei menu",
+"Focus to toolbar": "Imposta stato attivo per la barra degli strumenti",
+"Focus to element path": "Imposta stato attivo per il percorso dell'elemento",
+"Focus to contextual toolbar": "Imposta stato attivo per la barra degli strumenti contestuale",
+"Insert link (if link plugin activated)": "Inserisci un collegamento (se \u00e8 attivato l'apposito plugin)",
+"Save (if save plugin activated)": "Salva (se \u00e8 attivato l'apposito plugin)",
+"Find (if searchreplace plugin activated)": "Trova (se \u00e8 attivato l'apposito plugin)",
+"Plugins installed ({0}):": "Plugin installati ({0}):",
+"Premium plugins:": "Plugin Premium:",
+"Learn more...": "Maggiori informazioni...",
+"You are using {0}": "Si sta utilizzando {0}",
+"Plugins": "Plugin",
+"Handy Shortcuts": "Scorciatoie utili",
+"Horizontal line": "Linea orizzontale",
+"Insert\/edit image": "Inserisci\/modifica immagine",
+"Image description": "Descrizione immagine",
+"Source": "Fonte",
+"Dimensions": "Dimensioni",
+"Constrain proportions": "Mantieni proporzioni",
+"General": "Generali",
+"Advanced": "Avanzate",
+"Style": "Stile",
+"Vertical space": "Spazio verticale",
+"Horizontal space": "Spazio orizzontale",
+"Border": "Bordo",
+"Insert image": "Inserisci immagine",
+"Image...": "Immagine...",
+"Image list": "Elenco immagini",
+"Rotate counterclockwise": "Ruota in senso antiorario",
+"Rotate clockwise": "Ruota in senso orario",
+"Flip vertically": "Rifletti verticalmente",
+"Flip horizontally": "Rifletti orizzontalmente",
+"Edit image": "Modifica immagine",
+"Image options": "Opzioni immagine",
+"Zoom in": "Ingrandisci",
+"Zoom out": "Zoom indietro",
+"Crop": "Ritaglia",
+"Resize": "Ridimensiona",
+"Orientation": "Orientamento",
+"Brightness": "Luminosit\u00e0",
+"Sharpen": "Nitidezza",
+"Contrast": "Contrasto",
+"Color levels": "Livelli di colore",
+"Gamma": "Gamma",
+"Invert": "Inverti",
+"Apply": "Applica",
+"Back": "Indietro",
+"Insert date\/time": "Inserisci data\/ora",
+"Date\/time": "Data\/ora",
+"Insert\/Edit Link": "Inserisci\/modifica collegamento",
+"Insert\/edit link": "Inserisci\/modifica collegamento",
+"Text to display": "Testo da visualizzare",
+"Url": "URL",
+"Open link in...": "Apri collegamento in...",
+"Current window": "Finestra corrente",
+"None": "Nessuno",
+"New window": "Nuova finestra",
+"Remove link": "Rimuovi collegamento",
+"Anchors": "Ancoraggi",
+"Link...": "Collegamento...",
+"Paste or type a link": "Incolla o digita un collegamento",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL inserito sembra essere un indirizzo email. Si vuole aggiungere il necessario prefisso mailto:?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Si vuole aggiungere il necessario prefisso http:\/\/?",
+"Link list": "Elenco collegamenti",
+"Insert video": "Inserisci video",
+"Insert\/edit video": "Inserisci\/modifica video",
+"Insert\/edit media": "Inserisci\/modifica oggetti multimediali",
+"Alternative source": "Sorgente alternativa",
+"Alternative source URL": "URL sorgente alternativa",
+"Media poster (Image URL)": "Poster dell'oggetto multimediale (URL dell'immagine)",
+"Paste your embed code below:": "Incolla il codice d'incorporamento di seguito:",
+"Embed": "Incorpora",
+"Media...": "Oggetto multimediale...",
+"Nonbreaking space": "Spazio indivisibile",
+"Page break": "Interruzione di pagina",
+"Paste as text": "Incolla senza formattazioni",
+"Preview": "Anteprima",
+"Print...": "Stampa...",
+"Save": "Salva",
+"Find": "Trova",
+"Replace with": "Sostituisci con",
+"Replace": "Sostituisci",
+"Replace all": "Sostituisci tutto",
+"Previous": "Indietro",
+"Next": "Avanti",
+"Find and replace...": "Trova e sostituisci...",
+"Could not find the specified string.": "Impossibile trovare la stringa specificata.",
+"Match case": "Maiuscole\/minuscole",
+"Find whole words only": "Trova solo parole intere",
+"Spell check": "Controllo ortografia",
+"Ignore": "Ignora",
+"Ignore all": "Ignora tutto",
+"Finish": "Fine",
+"Add to Dictionary": "Aggiungi al dizionario",
+"Insert table": "Inserisci tabella",
+"Table properties": "Propriet\u00e0 della tabella",
+"Delete table": "Elimina tabella",
+"Cell": "Cella",
+"Row": "Riga",
+"Column": "Colonna",
+"Cell properties": "Propriet\u00e0 cella",
+"Merge cells": "Unisci le celle",
+"Split cell": "Dividi la cella",
+"Insert row before": "Inserisci riga prima",
+"Insert row after": "Inserisci riga dopo",
+"Delete row": "Elimina riga",
+"Row properties": "Propriet\u00e0 della riga",
+"Cut row": "Taglia riga",
+"Copy row": "Copia riga",
+"Paste row before": "Incolla riga prima",
+"Paste row after": "Incolla riga dopo",
+"Insert column before": "Inserisci colonna prima",
+"Insert column after": "Inserisci colonna dopo",
+"Delete column": "Elimina colonna",
+"Cols": "Colonne",
+"Rows": "Righe",
+"Width": "Larghezza",
+"Height": "Altezza",
+"Cell spacing": "Spaziatura tra celle",
+"Cell padding": "Spaziatura interna celle",
+"Show caption": "Mostra didascalia",
+"Left": "Sinistra",
+"Center": "Centro",
+"Right": "Destra",
+"Cell type": "Tipo di cella",
+"Scope": "Ambito",
+"Alignment": "Allineamento",
+"H Align": "Allineamento H",
+"V Align": "Allineamento V",
+"Top": "In alto",
+"Middle": "Centrato",
+"Bottom": "In basso",
+"Header cell": "Cella d'intestazione",
+"Row group": "Gruppo di righe",
+"Column group": "Gruppo di colonne",
+"Row type": "Tipo di riga",
+"Header": "Intestazione",
+"Body": "Corpo",
+"Footer": "Pi\u00e8 di pagina",
+"Border color": "Colore del bordo",
+"Insert template...": "Inserisci modello...",
+"Templates": "Modelli",
+"Template": "Modello",
+"Text color": "Colore testo",
+"Background color": "Colore dello sfondo",
+"Custom...": "Personalizzato...",
+"Custom color": "Colore personalizzato",
+"No color": "Nessun colore",
+"Remove color": "Rimuovi colore",
+"Table of Contents": "Sommario",
+"Show blocks": "Mostra blocchi",
+"Show invisible characters": "Mostra caratteri invisibili",
+"Word count": "Conteggio parole",
+"Words: {0}": "Parole: {0}",
+"{0} words": "{0} parole",
+"File": "File",
+"Edit": "Modifica",
+"Insert": "Inserisci",
+"View": "Visualizza",
+"Format": "Formato",
+"Table": "Tabella",
+"Tools": "Strumenti",
+"Powered by {0}": "Con tecnologia {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Area di testo RTF. Premere ALT-F9 per il menu. Premere ALT-F10 per la barra degli strumenti. Premere ALT-0 per la guida.",
+"Image title": "Titolo immagine",
+"Border width": "Larghezza del bordo",
+"Border style": "Stile del bordo",
+"Error": "Errore",
+"Warn": "Avviso",
+"Valid": "Valido",
+"To open the popup, press Shift+Enter": "Per aprire il popup, premere Shift+Invio",
+"Rich Text Area. Press ALT-0 for help.": "Area di testo RTF. Premere ALT-0 per la guida.",
+"System Font": "Carattere di sistema",
+"Failed to upload image: {0}": "Caricamento immagine fallito: {0}",
+"Failed to load plugin: {0} from url {1}": "Caricamento plugin fallito: {0} dall'URL {1}",
+"Failed to load plugin url: {0}": "Caricamento URL plugin fallito: {0}",
+"Failed to initialize plugin: {0}": "Inizializzazione plugin fallita: {0}",
+"example": "esempio",
+"Search": "Cerca",
+"All": "Tutto",
+"Currency": "Valuta",
+"Text": "Testo",
+"Quotations": "Citazioni",
+"Mathematical": "Caratteri matematici",
+"Extended Latin": "Latino esteso",
+"Symbols": "Simboli",
+"Arrows": "Frecce",
+"User Defined": "Definito dall'utente",
+"dollar sign": "simbolo del dollaro",
+"currency sign": "simbolo di valuta",
+"euro-currency sign": "simbolo dell'euro",
+"colon sign": "simbolo del col\u00f3n",
+"cruzeiro sign": "simbolo del cruzeiro",
+"french franc sign": "simbolo del franco francese",
+"lira sign": "simbolo della lira",
+"mill sign": "simbolo del mill",
+"naira sign": "simbolo della naira",
+"peseta sign": "simbolo della peseta",
+"rupee sign": "simbolo della rup\u00eca",
+"won sign": "simbolo del won",
+"new sheqel sign": "simbolo del nuovo shekel",
+"dong sign": "simbolo del dong",
+"kip sign": "simbolo del kip",
+"tugrik sign": "simbolo del tugrik",
+"drachma sign": "simbolo della dracma",
+"german penny symbol": "simbolo del pfennig tedesco",
+"peso sign": "simbolo del peso",
+"guarani sign": "simbolo del guaran\u00ec",
+"austral sign": "simbolo dell'austral",
+"hryvnia sign": "simbolo della hryvnia",
+"cedi sign": "simbolo del cedi",
+"livre tournois sign": "simbolo della lira di Tours",
+"spesmilo sign": "simbolo dello spesmilo",
+"tenge sign": "simbolo del tenge",
+"indian rupee sign": "simbolo della rup\u00eca indiana",
+"turkish lira sign": "simbolo della lira turca",
+"nordic mark sign": "simbolo del marco nordico",
+"manat sign": "simbolo del manat",
+"ruble sign": "simbolo del rublo",
+"yen character": "simbolo dello yen",
+"yuan character": "simbolo dello yuan",
+"yuan character, in hong kong and taiwan": "simbolo dello yuan, Hong Kong e Taiwan",
+"yen\/yuan character variant one": "simbolo yen\/yuan variante uno",
+"Loading emoticons...": "Caricamento emoticon in corso",
+"Could not load emoticons": "Impossibile caricare emoticon",
+"People": "Persone",
+"Animals and Nature": "Animali e natura",
+"Food and Drink": "Cibi e bevande",
+"Activity": "Attivit\u00e0",
+"Travel and Places": "Viaggi e luoghi",
+"Objects": "Oggetti",
+"Flags": "Bandiere",
+"Characters": "Caratteri",
+"Characters (no spaces)": "Caratteri (senza spazi)",
+"Error: Form submit field collision.": "Errore: Conflitto di campi nel modulo inviato.",
+"Error: No form element found.": "Errore: Nessun elemento di modulo trovato.",
+"Update": "Aggiorna",
+"Color swatch": "Campione di colore",
+"Turquoise": "Turchese",
+"Green": "Verde",
+"Blue": "Blu",
+"Purple": "Viola",
+"Navy Blue": "Blu scuro",
+"Dark Turquoise": "Turchese scuro",
+"Dark Green": "Verde scuro",
+"Medium Blue": "Blu medio",
+"Medium Purple": "Viola medio",
+"Midnight Blue": "Blu notte",
+"Yellow": "Giallo",
+"Orange": "Arancio",
+"Red": "Rosso",
+"Light Gray": "Grigio chiaro",
+"Gray": "Grigio",
+"Dark Yellow": "Giallo scuro",
+"Dark Orange": "Arancio scuro",
+"Dark Red": "Rosso scuro",
+"Medium Gray": "Grigio medio",
+"Dark Gray": "Grigio scuro",
+"Black": "Nero",
+"White": "Bianco",
+"Switch to or from fullscreen mode": "Attiva\/disattiva la modalit\u00e0 schermo intero",
+"Open help dialog": "Apri la finestra di aiuto",
+"history": "cronologia",
+"styles": "stili",
+"formatting": "formattazione",
+"alignment": "allineamento",
+"indentation": "indentazione",
+"permanent pen": "penna indelebile",
+"comments": "commenti"
+});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/ka_GE.js Deleted

@@ -1,230 +0,0 @@
-tinymce.addI18n('ka_GE',{
-"Cut": "\u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
-"Heading 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
-"Header 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d1\u10e0\u10d0\u10e3\u10d6\u10d4\u10e0\u10e1 \u10d0\u10e0 \u10d0\u10e5\u10d5\u10e1 \u10d1\u10e3\u10e4\u10e0\u10e2\u10e8\u10d8 \u10e8\u10d4\u10ee\u10ec\u10d4\u10d5\u10d8\u10e1 \u10db\u10ee\u10d0\u10e0\u10d3\u10d0\u10ed\u10d4\u10e0\u10d0. \u10d2\u10d7\u10ee\u10dd\u10d5\u10d7 \u10e1\u10d0\u10dc\u10d0\u10ea\u10d5\u10da\u10dd\u10d3 \u10d8\u10e1\u10d0\u10e0\u10d2\u10d4\u10d1\u10da\u10dd\u10d7 Ctrl+X\/C\/V \u10db\u10d0\u10da\u10e1\u10d0\u10ee\u10db\u10dd\u10d1\u10d8 \u10d9\u10dd\u10db\u10d1\u10d8\u10dc\u10d0\u10ea\u10d8\u10d4\u10d1\u10d8\u10d7.",
-"Heading 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
-"Div": "\u10d2\u10d0\u10dc\u10d0\u10ec\u10d8\u10da\u10d4\u10d1\u10d0",
-"Heading 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
-"Paste": "\u10e9\u10d0\u10e1\u10db\u10d0",
-"Close": "\u10d3\u10d0\u10ee\u10e3\u10e0\u10d5\u10d0",
-"Font Family": "\u10e4\u10dd\u10dc\u10e2\u10d8",
-"Pre": "\u10de\u10e0\u10d4\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8",
-"Align right": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"New document": "\u10d0\u10ee\u10d0\u10da\u10d8 \u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8",
-"Blockquote": "\u10d1\u10da\u10dd\u10d9\u10d8\u10e0\u10d4\u10d1\u10e3\u10da\u10d8 \u10ea\u10d8\u10e2\u10d0\u10e2\u10d0",
-"Numbered list": "\u10d3\u10d0\u10dc\u10dd\u10db\u10e0\u10d8\u10da\u10d8 \u10e1\u10d8\u10d0",
-"Heading 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
-"Headings": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
-"Increase indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10d2\u10d0\u10d6\u10e0\u10d3\u10d0",
-"Formats": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8",
-"Headers": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d4\u10d1\u10d8",
-"Select all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10db\u10dd\u10e6\u10dc\u10d8\u10e8\u10d5\u10dc\u10d0",
-"Header 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
-"Blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8",
-"Undo": "\u10d3\u10d0\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Strikethrough": "\u10e8\u10e3\u10d0 \u10ee\u10d0\u10d6\u10d8",
-"Bullet list": "\u10d1\u10e3\u10da\u10d4\u10e2 \u10e1\u10d8\u10d0",
-"Header 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
-"Superscript": "\u10d6\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
-"Clear formatting": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10e1\u10e3\u10e4\u10d7\u10d0\u10d5\u10d4\u10d1\u10d0",
-"Font Sizes": "\u10e4\u10dd\u10dc\u10e2\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
-"Subscript": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
-"Header 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
-"Redo": "\u10d2\u10d0\u10db\u10d4\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Paragraph": "\u10de\u10d0\u10e0\u10d0\u10d2\u10e0\u10d0\u10e4\u10d8",
-"Ok": "\u10d9\u10d0\u10e0\u10d2\u10d8",
-"Bold": "\u10db\u10d9\u10d5\u10d4\u10d7\u10e0\u10d8",
-"Code": "\u10d9\u10dd\u10d3\u10d8",
-"Italic": "\u10d3\u10d0\u10ee\u10e0\u10d8\u10da\u10d8",
-"Align center": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
-"Header 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
-"Heading 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
-"Heading 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
-"Decrease indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10e8\u10d4\u10db\u10ea\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Header 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0 \u10e9\u10d5\u10d4\u10e3\u10da\u10d4\u10d1\u10e0\u10d8\u10d5 \u10e0\u10d4\u10df\u10d8\u10db\u10e8\u10d8\u10d0. \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8 \u10e9\u10d0\u10d8\u10e1\u10db\u10d4\u10d5\u10d0 \u10e3\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10dd\u10d7 \u10e1\u10d0\u10dc\u10d0\u10db \u10d0\u10db \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d0\u10e1 \u10d0\u10e0 \u10d2\u10d0\u10d7\u10d8\u10e8\u10d0\u10d5\u10d7.",
-"Underline": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10ee\u10d0\u10d6\u10d8",
-"Cancel": "\u10d2\u10d0\u10e3\u10e5\u10db\u10d4\u10d1\u10d0",
-"Justify": "\u10d2\u10d0\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d8",
-"Inline": "\u10ee\u10d0\u10d6\u10e8\u10d8\u10d3\u10d0",
-"Copy": "\u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Align left": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Visual aids": "\u10d5\u10d8\u10d6\u10e3\u10d0\u10da\u10d8\u10d6\u10d0\u10ea\u10d8\u10d0",
-"Lower Greek": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d1\u10d4\u10e0\u10eb\u10dc\u10e3\u10da\u10d8",
-"Square": "\u10d9\u10d5\u10d0\u10d3\u10e0\u10d0\u10e2\u10d8",
-"Default": "\u10e1\u10e2\u10d0\u10dc\u10d3\u10d0\u10e0\u10e2\u10e3\u10da\u10d8",
-"Lower Alpha": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
-"Circle": "\u10ec\u10e0\u10d4",
-"Disc": "\u10d3\u10d8\u10e1\u10d9\u10d8",
-"Upper Alpha": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
-"Upper Roman": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
-"Lower Roman": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id \u10e3\u10dc\u10d3\u10d0 \u10d8\u10ec\u10e7\u10d4\u10d1\u10dd\u10d3\u10d4\u10e1 \u10d0\u10e1\u10dd\u10d7\u10d8, \u10e0\u10dd\u10db\u10d4\u10da\u10e1\u10d0\u10ea \u10db\u10dd\u10e7\u10d5\u10d4\u10d1\u10d0 \u10db\u10ee\u10dd\u10da\u10dd\u10d3 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8, \u10ea\u10d8\u10e4\u10e0\u10d4\u10d1\u10d8, \u10e2\u10d8\u10e0\u10d4, \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d4\u10d1\u10d8, \u10dd\u10e0\u10d8 \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d8 \u10d0\u10dc \u10e5\u10d5\u10d4\u10d3\u10d0 \u10e2\u10d8\u10e0\u10d4. ",
-"Name": "\u10e1\u10d0\u10ee\u10d4\u10da\u10d8",
-"Anchor": "\u10e6\u10e3\u10d6\u10d0",
-"Id": "id",
-"You have unsaved changes are you sure you want to navigate away?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d2\u10d0\u10e5\u10d5\u10d7 \u10e8\u10d4\u10e3\u10dc\u10d0\u10ee\u10d0\u10d5\u10d8 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10d1\u10d8, \u10d3\u10d0\u10e0\u10ec\u10db\u10e3\u10dc\u10d4\u10d1\u10e3\u10da\u10d8 \u10ee\u10d0\u10d7 \u10e0\u10dd\u10db \u10e1\u10ee\u10d5\u10d0\u10d2\u10d0\u10dc \u10d2\u10d0\u10d3\u10d0\u10e1\u10d5\u10da\u10d0 \u10d2\u10e1\u10e3\u10e0\u10d7?",
-"Restore last draft": "\u10d1\u10dd\u10da\u10dd\u10e1 \u10e8\u10d4\u10dc\u10d0\u10ee\u10e3\u10da\u10d8\u10e1 \u10d0\u10e6\u10d3\u10d2\u10d4\u10dc\u10d0",
-"Special character": "\u10e1\u10de\u10d4\u10ea\u10d8\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd",
-"Source code": "\u10ec\u10e7\u10d0\u10e0\u10dd\u10e1 \u10d9\u10dd\u10d3\u10d8",
-"Language": "\u10d4\u10dc\u10d0",
-"Insert\/Edit code sample": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10d9\u10dd\u10d3\u10d8\u10e1 \u10db\u10d0\u10d2\u10d0\u10da\u10d8\u10d7\u10d8",
-"B": "\u10da",
-"R": "\u10ec",
-"G": "\u10db",
-"Color": "\u10e4\u10d4\u10e0\u10d8",
-"Right to left": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Left to right": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"Emoticons": "\u10e1\u10db\u10d0\u10d8\u10da\u10d8\u10d9\u10d4\u10d1\u10d8",
-"Robots": "\u10e0\u10dd\u10d1\u10dd\u10d4\u10d1\u10d8",
-"Document properties": "\u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Title": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
-"Keywords": "\u10e1\u10d0\u10d9\u10d5\u10d0\u10dc\u10eb\u10dd \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
-"Encoding": "\u10d9\u10dd\u10d3\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Description": "\u10d0\u10ee\u10ec\u10d4\u10e0\u10d0",
-"Author": "\u10d0\u10d5\u10e2\u10dd\u10e0\u10d8",
-"Fullscreen": "\u10e1\u10d0\u10d5\u10e1\u10d4 \u10d4\u10d9\u10e0\u10d0\u10dc\u10d8",
-"Horizontal line": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10ee\u10d0\u10d6\u10d8",
-"Horizontal space": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Insert\/edit image": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10e1\u10e3\u10e0\u10d0\u10d7\u10d8",
-"General": "\u10db\u10d7\u10d0\u10d5\u10d0\u10e0\u10d8",
-"Advanced": "\u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8\u10d7\u10d8",
-"Source": "\u10d1\u10db\u10e3\u10da\u10d8",
-"Border": "\u10e1\u10d0\u10d6\u10e6\u10d5\u10d0\u10e0\u10d8",
-"Constrain proportions": "\u10de\u10e0\u10dd\u10de\u10dd\u10e0\u10ea\u10d8\u10d8\u10e1 \u10d3\u10d0\u10ea\u10d5\u10d0",
-"Vertical space": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Image description": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10d3\u10d0\u10ee\u10d0\u10e1\u10d8\u10d0\u10d7\u10d4\u10d1\u10d0",
-"Style": "\u10e1\u10e2\u10d8\u10da\u10d8",
-"Dimensions": "\u10d2\u10d0\u10dc\u10d6\u10dd\u10db\u10d8\u10da\u10d4\u10d1\u10d0",
-"Insert image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Image": "\u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10ee\u10e3\u10da\u10d4\u10d1\u10d0",
-"Zoom in": "\u10d2\u10d0\u10d3\u10d8\u10d3\u10d8\u10d4\u10d1\u10d0",
-"Contrast": "\u10d9\u10dd\u10dc\u10e2\u10e0\u10d0\u10e1\u10e2\u10d8",
-"Back": "\u10e3\u10d9\u10d0\u10dc",
-"Gamma": "\u10d2\u10d0\u10db\u10d0",
-"Flip horizontally": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10e8\u10d4\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
-"Resize": "\u10d6\u10dd\u10db\u10d8\u10e1 \u10e8\u10d4\u10ea\u10d5\u10da\u10d0",
-"Sharpen": "\u10d2\u10d0\u10da\u10d4\u10e1\u10d5\u10d0",
-"Zoom out": "\u10d3\u10d0\u10de\u10d0\u10e2\u10d0\u10e0\u10d0\u10d5\u10d4\u10d1\u10d0",
-"Image options": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10de\u10d0\u10e0\u10d0\u10db\u10d4\u10e2\u10e0\u10d4\u10d1\u10d8",
-"Apply": "\u10db\u10d8\u10e6\u10d4\u10d1\u10d0",
-"Brightness": "\u10e1\u10d8\u10d9\u10d0\u10e8\u10d9\u10d0\u10e8\u10d4",
-"Rotate clockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10d7 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Rotate counterclockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10e1 \u10e1\u10d0\u10ec\u10d8\u10dc\u10d0\u10d0\u10e6\u10db\u10d3\u10d4\u10d2\u10dd\u10d2 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Edit image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Color levels": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d3\u10dd\u10dc\u10d4",
-"Crop": "\u10db\u10dd\u10ed\u10e0\u10d0",
-"Orientation": "\u10dd\u10e0\u10d8\u10d4\u10dc\u10e2\u10d0\u10ea\u10d8\u10d0",
-"Flip vertically": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10d0\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
-"Invert": "\u10e8\u10d4\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd",
-"Insert date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Remove link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Url": "Url",
-"Text to display": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
-"Anchors": "\u10e6\u10e3\u10d6\u10d0",
-"Insert link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Link": "\u10d1\u10db\u10e3\u10da\u10d8",
-"New window": "\u10d0\u10ee\u10d0\u10da \u10e4\u10d0\u10dc\u10ef\u10d0\u10e0\u10d0\u10e8\u10d8",
-"None": "\u10d0\u10e0\u10ea\u10d4\u10e0\u10d7\u10d8",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc\u10e1 \u10db\u10d8\u10d4\u10e0 \u10db\u10d8\u10d7\u10d8\u10d7\u10d4\u10d1\u10e3\u10da\u10d8 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10ec\u10d0\u10e0\u10db\u10dd\u10d0\u10d3\u10d2\u10d4\u10dc\u10e1 \u10d2\u10d0\u10e0\u10d4 \u10d1\u10db\u10e3\u10da\u10e1. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd http:\/\/ \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
-"Paste or type a link": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d0\u10dc \u10e8\u10d4\u10d8\u10e7\u10d5\u10d0\u10dc\u10d4\u10d7 \u10d1\u10db\u10e3\u10da\u10d8",
-"Target": "\u10d2\u10d0\u10ee\u10e1\u10dc\u10d0",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10db\u10d8\u10e3\u10d7\u10d8\u10d7\u10d4\u10d7 \u10d4\u10da-\u10e4\u10dd\u10e1\u10e2\u10d8\u10e1 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10dc\u10d0\u10ea\u10d5\u10da\u10d0\u10d3 \u10d5\u10d4\u10d1-\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1\u10d0. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd mailto: \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
-"Insert\/edit link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d0",
-"Insert\/edit video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Media": "\u10db\u10d4\u10d3\u10d8\u10d0",
-"Alternative source": "\u10d0\u10da\u10e2\u10d4\u10e0\u10dc\u10d0\u10e2\u10d8\u10e3\u10da\u10d8 \u10ec\u10e7\u10d0\u10e0\u10dd",
-"Paste your embed code below:": "\u10d0\u10e5 \u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d7\u10e5\u10d5\u10d4\u10dc\u10d8 \u10d9\u10dd\u10d3\u10d8:",
-"Insert video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Poster": "\u10de\u10da\u10d0\u10d9\u10d0\u10e2\u10d8",
-"Insert\/edit media": "\u10db\u10d4\u10d3\u10d8\u10d0\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Embed": "\u10e9\u10d0\u10e8\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Nonbreaking space": "\u10e3\u10ec\u10e7\u10d5\u10d4\u10e2\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Page break": "\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1 \u10d2\u10d0\u10ec\u10e7\u10d5\u10d4\u10e2\u10d0",
-"Paste as text": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10e0\u10dd\u10d2\u10dd\u10e0\u10ea \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
-"Preview": "\u10ec\u10d8\u10dc\u10d0\u10e1\u10ec\u10d0\u10e0 \u10dc\u10d0\u10ee\u10d5\u10d0",
-"Print": "\u10d0\u10db\u10dd\u10d1\u10d4\u10ed\u10d5\u10d3\u10d0",
-"Save": "\u10e8\u10d4\u10dc\u10d0\u10ee\u10d5\u10d0",
-"Could not find the specified string.": "\u10db\u10dd\u10ea\u10d4\u10db\u10e3\u10da\u10d8 \u10e9\u10d0\u10dc\u10d0\u10ec\u10d4\u10e0\u10d8 \u10d5\u10d4\u10e0 \u10db\u10dd\u10d8\u10eb\u10d4\u10d1\u10dc\u10d0.",
-"Replace": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Next": "\u10e8\u10d4\u10db\u10d3\u10d4\u10d2\u10d8",
-"Whole words": "\u10e1\u10e0\u10e3\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
-"Find and replace": "\u10db\u10dd\u10eb\u10d4\u10d1\u10dc\u10d4 \u10d3\u10d0 \u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4",
-"Replace with": "\u10e8\u10d4\u10e1\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d0",
-"Find": "\u10eb\u10d4\u10d1\u10dc\u10d0",
-"Replace all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Match case": "\u10d3\u10d0\u10d0\u10db\u10d7\u10ee\u10d5\u10d8\u10d4 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
-"Prev": "\u10ec\u10d8\u10dc\u10d0",
-"Spellcheck": "\u10db\u10d0\u10e0\u10d7\u10da\u10ec\u10d4\u10e0\u10d8\u10e1 \u10e8\u10d4\u10db\u10dd\u10ec\u10db\u10d4\u10d1\u10d0",
-"Finish": "\u10d3\u10d0\u10e1\u10d0\u10e1\u10e0\u10e3\u10da\u10d8",
-"Ignore all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Ignore": "\u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Add to Dictionary": "\u10da\u10d4\u10e5\u10e1\u10d8\u10d9\u10dd\u10dc\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Insert row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Rows": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d4\u10d1\u10d8",
-"Height": "\u10e1\u10d8\u10db\u10d0\u10e6\u10da\u10d4",
-"Paste row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Alignment": "\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Border color": "\u10e1\u10d0\u10d6\u10d0\u10e0\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
-"Column group": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
-"Row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8",
-"Insert column before": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Split cell": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e7\u10dd\u10e4\u10d0",
-"Cell padding": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10dd\u10d1\u10d8",
-"Cell spacing": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d3\u10d0\u10e8\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Row type": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
-"Insert table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Body": "\u10e2\u10d0\u10dc\u10d8",
-"Caption": "\u10ec\u10d0\u10e0\u10ec\u10d4\u10e0\u10d0",
-"Footer": "\u10eb\u10d8\u10e0\u10d8",
-"Delete row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Paste row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Scope": "\u10e9\u10d0\u10e0\u10e9\u10dd",
-"Delete table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"H Align": "H \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
-"Top": "\u10db\u10d0\u10e6\u10da\u10d0",
-"Header cell": "\u10d7\u10d0\u10d5\u10d8\u10e1 \u10e3\u10ef\u10e0\u10d0",
-"Column": "\u10e1\u10d5\u10d4\u10e2\u10d8",
-"Row group": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
-"Cell": "\u10e3\u10ef\u10e0\u10d0",
-"Middle": "\u10e8\u10e3\u10d0",
-"Cell type": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
-"Copy row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Row properties": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Table properties": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Bottom": "\u10e5\u10d5\u10d4\u10d3\u10d0",
-"V Align": "V \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
-"Header": "\u10d7\u10d0\u10d5\u10d8",
-"Right": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"Insert column after": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Cols": "\u10e1\u10d5\u10d4\u10e2\u10d4\u10d1\u10d8",
-"Insert row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Width": "\u10e1\u10d8\u10d2\u10d0\u10dc\u10d4",
-"Cell properties": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Left": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Cut row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
-"Delete column": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Center": "\u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
-"Merge cells": "\u10e3\u10ef\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10d4\u10e0\u10d7\u10d8\u10d0\u10dc\u10d4\u10d1\u10d0",
-"Insert template": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Templates": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d4\u10d1\u10d8",
-"Background color": "\u10e3\u10d9\u10d0\u10dc\u10d0 \u10e4\u10d4\u10e0\u10d8",
-"Custom...": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8",
-"Custom color": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8 \u10e4\u10d4\u10e0\u10d8",
-"No color": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e0\u10d4\u10e8\u10d4",
-"Text color": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
-"Table of Contents": "\u10e1\u10d0\u10e0\u10e9\u10d4\u10d5\u10d8",
-"Show blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Show invisible characters": "\u10e3\u10ee\u10d8\u10da\u10d0\u10d5\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Words: {0}": "\u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8: {0}",
-"Insert": "\u10e9\u10d0\u10e1\u10db\u10d0",
-"File": "\u10e4\u10d0\u10d8\u10da\u10d8",
-"Edit": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10d8. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F9\u10e1 \u10db\u10d4\u10dc\u10d8\u10e3\u10e1 \u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10eb\u10d0\u10ee\u10d4\u10d1\u10da\u10d0\u10d3. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F10\u10e1 \u10de\u10d0\u10dc\u10d4\u10da\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-0\u10e1 \u10d3\u10d0\u10ee\u10db\u10d0\u10e0\u10d4\u10d1\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1",
-"Tools": "\u10d8\u10d0\u10e0\u10d0\u10e6\u10d4\u10d1\u10d8",
-"View": "\u10dc\u10d0\u10ee\u10d5\u10d0",
-"Table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8",
-"Format": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/km_KH.js Deleted

@@ -1,253 +0,0 @@
-tinymce.addI18n('km_KH',{
-"Redo": "\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
-"Undo": "\u1798\u17b7\u1793\u200b\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
-"Cut": "\u1780\u17b6\u178f\u17cb",
-"Copy": "\u1785\u1798\u17d2\u179b\u1784",
-"Paste": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb",
-"Select all": "\u1787\u17d2\u179a\u17be\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"New document": "\u17af\u1780\u179f\u17b6\u179a\u200b\u17a2\u178f\u17d2\u1790\u1794\u1791\u200b\u1790\u17d2\u1798\u17b8",
-"Ok": "\u1796\u17d2\u179a\u1798",
-"Cancel": "\u1794\u17c4\u17c7\u200b\u1794\u1784\u17cb",
-"Visual aids": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796\u200b\u1787\u17c6\u1793\u17bd\u1799",
-"Bold": "\u178a\u17b7\u178f",
-"Italic": "\u1791\u17d2\u179a\u17c1\u178f",
-"Underline": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1798",
-"Strikethrough": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1786\u17bc\u178f",
-"Superscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u179b\u17be",
-"Subscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u1780\u17d2\u179a\u17c4\u1798",
-"Clear formatting": "\u179f\u1798\u17d2\u17a2\u17b6\u178f\u200b\u1791\u1798\u17d2\u179a\u1784\u17cb",
-"Align left": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
-"Align center": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Align right": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
-"Justify": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1796\u17c1\u1789",
-"Bullet list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u1785\u17c6\u178e\u17bb\u1785",
-"Numbered list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u179b\u17c1\u1781",
-"Decrease indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17c1\u1789",
-"Increase indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17bc\u179b",
-"Close": "\u1794\u17b7\u1791",
-"Formats": "\u1791\u17d2\u179a\u1784\u17cb\u1791\u17d2\u179a\u17b6\u1799",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u17a2\u17ca\u17b8\u1793\u1792\u17ba\u178e\u17b7\u178f\u200b\u179a\u1794\u179f\u17cb\u200b\u17a2\u17d2\u1793\u1780\u200b\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u1785\u17bc\u179b\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1791\u17c5\u200b\u1780\u17b6\u1793\u17cb\u200b\u1783\u17d2\u179b\u17b8\u1794\u1794\u178f\u200b\u1791\u17c1\u17d4 \u179f\u17bc\u1798\u200b\u1794\u17d2\u179a\u17be Ctrl+X\/C\/V \u179b\u17be\u200b\u1780\u17d2\u178a\u17b6\u179a\u200b\u1785\u17bb\u1785\u200b\u1787\u17c6\u1793\u17bd\u179f\u200b\u179c\u17b7\u1789\u17d4",
-"Headers": "\u1780\u17d2\u1794\u17b6\u179b",
-"Header 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
-"Header 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
-"Header 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
-"Header 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
-"Header 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
-"Header 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
-"Headings": "\u1780\u17d2\u1794\u17b6\u179b",
-"Heading 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
-"Heading 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
-"Heading 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
-"Heading 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
-"Heading 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
-"Heading 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u1780\u17bc\u178a",
-"Paragraph": "\u1780\u1790\u17b6\u1781\u178e\u17d2\u178c",
-"Blockquote": "\u1794\u17d2\u179b\u17bb\u1780\u200b\u1796\u17b6\u1780\u17d2\u1799\u200b\u179f\u1798\u17d2\u179a\u1784\u17cb",
-"Inline": "\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb",
-"Blocks": "\u1794\u17d2\u179b\u17bb\u1780",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u1780\u17b6\u179a\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1796\u17c1\u179b\u200b\u1793\u17c1\u17c7 \u179f\u17d2\u1790\u17b7\u178f\u200b\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u17c2\u1794\u200b\u1795\u17c2\u1793\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6\u17d4 \u1794\u1785\u17d2\u1785\u17bb\u1794\u17d2\u1794\u1793\u17d2\u1793\u200b\u1793\u17c1\u17c7 \u1798\u17b6\u178f\u17b7\u1780\u17b6\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a1\u17b6\u1799\u200b\u1793\u17b9\u1784\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u17b6\u1793\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6 \u179b\u17bb\u17c7\u178f\u17d2\u179a\u17b6\u200b\u178f\u17c2\u200b\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b7\u1791\u200b\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u1793\u17c1\u17c7\u17d4",
-"Font Family": "\u1782\u17d2\u179a\u17bd\u179f\u17b6\u179a\u200b\u1796\u17bb\u1798\u17d2\u1796\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Font Sizes": "\u1791\u17c6\u17a0\u17c6\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Class": "Class",
-"Browse for an image": "\u179a\u1780\u1798\u17be\u179b\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"OR": "\u17ac",
-"Drop an image here": "\u1791\u1798\u17d2\u179b\u17b6\u1794\u17cb\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796\u200b\u1793\u17c5\u200b\u178f\u17d2\u179a\u1784\u17cb\u200b\u1793\u17c1\u17c7",
-"Upload": "\u1795\u17d2\u1791\u17bb\u1780\u17a1\u17be\u1784",
-"Default": "\u179b\u17c6\u1793\u17b6\u17c6\u200b\u178a\u17be\u1798",
-"Circle": "\u1798\u17bc\u179b",
-"Disc": "\u1790\u17b6\u179f",
-"Square": "\u1787\u17d2\u179a\u17bb\u1784",
-"Lower Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785",
-"Lower Greek": "\u179b\u17c1\u1781\u200b\u1780\u17d2\u179a\u17b7\u1780\u200b\u178f\u17bc\u1785",
-"Lower Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u178f\u17bc\u1785",
-"Upper Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u17c6",
-"Upper Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u1792\u17c6",
-"Anchor": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
-"Name": "\u1788\u17d2\u1798\u17c4\u17c7",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u1782\u17bd\u179a\u178f\u17c2\u200b\u1795\u17d2\u178a\u17be\u1798\u200b\u1787\u17b6\u1798\u17bd\u1799\u200b\u178f\u17bd\u17a2\u1780\u17d2\u179f\u179a \u17a0\u17be\u1799\u200b\u1794\u1793\u17d2\u178f\u200b\u1787\u17b6\u1798\u17bd\u1799\u200b\u178f\u17c2\u200b\u178f\u17bd\u17a2\u1780\u17d2\u179f\u179a \u179b\u17c1\u1781 \u179f\u1789\u17d2\u1789\u17b6\u200b\u178a\u1780 \u179f\u1789\u17d2\u1789\u17b6\u200b\u1785\u17bb\u1785 \u179f\u1789\u17d2\u1789\u17b6\u200b\u1785\u17bb\u1785\u1796\u17b8\u179a \u17ac\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1780\u17d2\u179a\u17c4\u1798\u17d4",
-"You have unsaved changes are you sure you want to navigate away?": "\u1798\u17b6\u1793\u200b\u1794\u1793\u17d2\u179b\u17b6\u179f\u17cb\u200b\u1794\u17d2\u178a\u17bc\u179a\u200b\u1798\u17b7\u1793\u200b\u1791\u17b6\u1793\u17cb\u200b\u1794\u17b6\u1793\u200b\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1796\u17b7\u178f\u200b\u1787\u17b6\u200b\u1785\u1784\u17cb\u200b\u1785\u17b6\u1780\u200b\u1785\u17c1\u1789\u200b\u1796\u17b8\u1791\u17b8\u1793\u17c1\u17c7\u200b\u1798\u17c2\u1793\u1791\u17c1?",
-"Restore last draft": "\u179f\u17d2\u178a\u17b6\u179a\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u1796\u17d2\u179a\u17b6\u1784\u200b\u1796\u17b8\u200b\u1798\u17bb\u1793",
-"Special character": "\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1796\u17b7\u179f\u17c1\u179f",
-"Source code": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17bc\u178a",
-"Insert\/Edit code sample": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b \u1780\u17bc\u178a\u200b\u1782\u17c6\u179a\u17bc",
-"Language": "\u1797\u17b6\u179f\u17b6",
-"Color": "\u1796\u178e\u17cc",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u1786\u17d2\u179c\u17c1\u1784\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
-"Right to left": "\u179f\u17d2\u178a\u17b6\u17c6\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
-"Emoticons": "\u179a\u17bc\u1794\u200b\u179f\u1789\u17d2\u1789\u17b6\u178e\u200b\u17a2\u17b6\u179a\u1798\u17d2\u1798\u178e\u17cd",
-"Document properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u179f\u1798\u17d2\u1794\u178f\u17d2\u178f\u17b7\u200b\u17af\u1780\u179f\u17b6\u179a",
-"Title": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Keywords": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1782\u1793\u17d2\u179b\u17b9\u17c7",
-"Description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799",
-"Robots": "\u179a\u17bc\u1794\u1799\u1793\u17d2\u178f",
-"Author": "\u17a2\u17d2\u1793\u1780\u200b\u1793\u17b7\u1796\u1793\u17d2\u1792",
-"Encoding": "\u1780\u17b6\u179a\u200b\u17a2\u17ca\u17b8\u1793\u1780\u17bc\u178a",
-"Fullscreen": "\u1796\u17c1\u1789\u200b\u17a2\u17c1\u1780\u17d2\u179a\u1784\u17cb",
-"Action": "\u179f\u1780\u1798\u17d2\u1798\u1797\u17b6\u1796",
-"Shortcut": "\u1795\u17d2\u179b\u17bc\u179c\u1780\u17b6\u178f\u17cb",
-"Help": "\u1787\u17c6\u1793\u17bd\u1799",
-"Address": "\u17a2\u17b6\u179f\u1799\u178a\u17d2\u178b\u17b6\u1793",
-"Focus to menubar": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u179b\u17be\u200b\u179a\u1794\u17b6\u179a\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799",
-"Focus to toolbar": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u179b\u17be\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd",
-"Focus to element path": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u179b\u17be\u200b\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u179a\u1794\u179f\u17cb\u200b\u1792\u17b6\u178f\u17bb",
-"Focus to contextual toolbar": "\u1795\u17d2\u178a\u17c4\u178f\u200b\u1791\u17c5\u200b\u179b\u17be\u200b\u179a\u1794\u17b6\u179a\u17a7\u1794\u1780\u179a\u178e\u17cd\u200b\u178f\u17b6\u1798\u200b\u1794\u179a\u17b7\u1794\u1791",
-"Insert link (if link plugin activated)": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e (\u1794\u17d2\u179a\u179f\u17b7\u1793\u1794\u17be\u200b\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8 plugin \u1794\u17b6\u1793\u1794\u17be\u1780)",
-"Save (if save plugin activated)": "\u179a\u1780\u17d2\u179f\u17b6\u1791\u17bb\u1780 (\u1794\u17d2\u179a\u179f\u17b7\u1793\u1794\u17be\u200b\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8 save \u1794\u17b6\u1793\u1794\u17be\u1780)",
-"Find (if searchreplace plugin activated)": "\u179f\u17d2\u179c\u17c2\u1784\u179a\u1780 (\u1794\u17d2\u179a\u179f\u17b7\u1793\u200b\u1794\u17be\u200b\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8 searchreplace \u1794\u17b6\u1793\u200b\u1794\u17be\u1780)",
-"Plugins installed ({0}):": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u178a\u17c2\u179b\u1794\u17b6\u1793\u200b\u178a\u17c6\u17a1\u17be\u1784 ({0})\u17d6",
-"Premium plugins:": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u1782\u17b7\u178f\u200b\u1794\u17d2\u179a\u17b6\u1780\u17cb\u17d6",
-"Learn more...": "\u179f\u17b7\u1780\u17d2\u179f\u17b6\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798...",
-"You are using {0}": "\u17a2\u17d2\u1793\u1780\u200b\u1780\u17c6\u1796\u17bb\u1784\u200b\u1794\u17d2\u179a\u17be {0}",
-"Horizontal line": "\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u178a\u17c1\u1780",
-"Insert\/edit image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
-"Image description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799\u200b\u1796\u17b8\u200b\u179a\u17bc\u1794",
-"Source": "\u1794\u17d2\u179a\u1797\u1796",
-"Dimensions": "\u179c\u17b7\u1798\u17b6\u178f\u17d2\u179a",
-"Constrain proportions": " \u1794\u1784\u17d2\u1781\u17c6\u200b\u17b2\u17d2\u1799\u200b\u1798\u17b6\u1793\u200b\u179f\u1798\u17b6\u1798\u17b6\u178f\u17d2\u179a",
-"General": "\u1791\u17bc\u1791\u17c5",
-"Advanced": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1781\u17d2\u1796\u179f\u17cb",
-"Style": "\u179a\u1785\u1793\u17b6\u1794\u1790",
-"Vertical space": "\u179b\u17c6\u17a0\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Horizontal space": "\u179b\u17c6\u17a0\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"Border": "\u179f\u17ca\u17bb\u1798",
-"Insert image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
-"Image": "\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Image list": "\u1794\u1789\u17d2\u1787\u17b8\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Rotate counterclockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u1785\u17d2\u179a\u17b6\u179f\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
-"Rotate clockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u179f\u17d2\u179a\u1794\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
-"Flip vertically": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Flip horizontally": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"Edit image": "\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Image options": "\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Zoom in": "\u1796\u1784\u17d2\u179a\u17b8\u1780",
-"Zoom out": "\u1794\u1784\u17d2\u179a\u17bd\u1798",
-"Crop": "\u1785\u17d2\u179a\u17b9\u1794",
-"Resize": "\u1794\u17d2\u178a\u17bc\u179a\u200b\u1791\u17c6\u17a0\u17c6",
-"Orientation": "\u1791\u17b7\u179f",
-"Brightness": "\u1796\u1793\u17d2\u179b\u17ba",
-"Sharpen": "\u1785\u17d2\u1794\u17b6\u179f\u17cb",
-"Contrast": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
-"Color levels": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
-"Gamma": "\u17a0\u17d2\u1782\u17b6\u1798\u17c9\u17b6",
-"Invert": "\u178a\u17b6\u1780\u17cb\u200b\u1794\u1789\u17d2\u1785\u17d2\u179a\u17b6\u179f",
-"Apply": "\u17a2\u1793\u17bb\u179c\u178f\u17d2\u178f",
-"Back": "\u1790\u1799\u1780\u17d2\u179a\u17c4\u1799",
-"Insert date\/time": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17b6\u179b\u200b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\/\u1798\u17c9\u17c4\u1784",
-"Date\/time": "\u1780\u17b6\u179b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\/\u1798\u17c9\u17c4\u1784",
-"Insert link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e",
-"Insert\/edit link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u178f\u17c6\u178e",
-"Text to display": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u1784\u17d2\u17a0\u17b6\u1789",
-"Url": "Url",
-"Target": "\u1791\u17b7\u179f\u178a\u17c5",
-"None": "\u1798\u17b7\u1793\u200b\u1798\u17b6\u1793",
-"New window": "\u1795\u17d2\u1791\u17b6\u17c6\u1784\u200b\u179c\u17b8\u1793\u178a\u17bc\u200b\u1790\u17d2\u1798\u17b8",
-"Remove link": "\u178a\u1780\u200b\u178f\u17c6\u178e\u200b\u1785\u17c1\u1789",
-"Anchors": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
-"Link": "\u178f\u17c6\u178e",
-"Paste or type a link": "\u1794\u17b7\u1791\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u17ac\u200b\u179c\u17b6\u1799\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1798\u17b6\u1793\u200b\u179f\u178e\u17d2\u178b\u17b6\u1793\u200b\u178a\u17bc\u1785\u200b\u17a2\u17b6\u179f\u1799\u178a\u17d2\u178b\u17b6\u1793\u200b\u17a2\u17ca\u17b8\u1798\u17c2\u179b\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 mailto: \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1787\u17b6\u200b\u178f\u17c6\u178e\u200b\u1791\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c5\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 http:\/\/ \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
-"Link list": "\u1794\u1789\u17d2\u1787\u17b8\u178f\u17c6\u178e",
-"Insert video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179c\u17b8\u178a\u17c1\u17a2\u17bc",
-"Insert\/edit video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179c\u17b8\u178a\u17c1\u17a2\u17bc",
-"Insert\/edit media": "\u1794\u1789\u17d2\u1787\u17bc\u179b\u200b\/\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b \u1798\u17c1\u178c\u17b6",
-"Alternative source": "\u1794\u17d2\u179a\u1797\u1796\u200b\u178a\u1791\u17c3\u200b\u1791\u17c0\u178f",
-"Poster": "\u17a2\u17d2\u1793\u1780\u200b\u1795\u17d2\u179f\u17b6\u1799",
-"Paste your embed code below:": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1780\u17bc\u178a\u200b\u1794\u1784\u17d2\u1780\u1794\u17cb\u200b\u1793\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c4\u1798:",
-"Embed": "\u1794\u1784\u17d2\u1780\u1794\u17cb",
-"Media": "\u1798\u17c1\u178c\u17b6",
-"Nonbreaking space": "\u178a\u17c6\u178e\u1780\u200b\u1783\u17d2\u179b\u17b6\u200b\u1798\u17b7\u1793\u200b\u1794\u17c6\u1794\u17c2\u1780",
-"Page break": "\u1794\u17c6\u1794\u17c2\u1780\u200b\u1791\u17c6\u1796\u17d0\u179a",
-"Paste as text": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Preview": "\u1798\u17be\u179b\u200b\u1787\u17b6\u200b\u1798\u17bb\u1793",
-"Print": "\u1794\u17c4\u17c7\u200b\u1796\u17bb\u1798\u17d2\u1796",
-"Save": "\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780",
-"Find": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780",
-"Replace with": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u178a\u17c4\u1799",
-"Replace": "\u1787\u17c6\u1793\u17bd\u179f",
-"Replace all": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"Prev": "\u1780\u17d2\u179a\u17c4\u1799",
-"Next": "\u1798\u17bb\u1781",
-"Find and replace": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780\u200b\u1793\u17b7\u1784\u200b\u1787\u17c6\u1793\u17bd\u179f",
-"Could not find the specified string.": "\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u179a\u1780\u200b\u1783\u17be\u1789\u200b\u1781\u17d2\u179f\u17c2\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u178a\u17c2\u179b\u200b\u1794\u17b6\u1793\u200b\u1780\u17c6\u178e\u178f\u17cb\u17d4",
-"Match case": "\u1780\u179a\u178e\u17b8\u200b\u178a\u17c6\u178e\u17bc\u1785",
-"Whole words": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1791\u17b6\u17c6\u1784\u200b\u1798\u17bc\u179b",
-"Spellcheck": "\u1796\u17b7\u1793\u17b7\u178f\u17d2\u1799\u200b\u17a2\u1780\u17d2\u1781\u179a\u17b6\u179c\u17b7\u179a\u17bb\u1791\u17d2\u1792",
-"Ignore": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u200b\u1796\u17be",
-"Ignore all": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u1796\u17be\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"Finish": "\u1794\u1789\u17d2\u1785\u1794\u17cb",
-"Add to Dictionary": "\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1791\u17c5\u200b\u179c\u1785\u1793\u17b6\u1793\u17bb\u1780\u17d2\u179a\u1798",
-"Insert table": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Table properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Delete table": "\u179b\u17bb\u1794\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Cell": "\u1780\u17d2\u179a\u17a1\u17b6",
-"Row": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Column": "\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Cell properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Merge cells": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17bc\u179b\u200b\u1782\u17d2\u1793\u17b6",
-"Split cell": "\u1789\u17c2\u1780\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Insert row before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1788\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Insert row after": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Delete row": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Row properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Cut row": "\u1780\u17b6\u178f\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Copy row": "\u1785\u1798\u17d2\u179b\u1784\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Paste row before": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Paste row after": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Insert column before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u1788\u179a\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Insert column after": "\u1794\u1789\u17d2\u1787\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Delete column": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Cols": "\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Rows": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Width": "\u1791\u1791\u17b9\u1784",
-"Height": "\u1780\u1798\u17d2\u1796\u179f\u17cb",
-"Cell spacing": "\u1782\u1798\u17d2\u179b\u17b6\u178f\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Cell padding": "\u1785\u1793\u17d2\u179b\u17c4\u17c7\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Caption": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Left": "\u1786\u17d2\u179c\u17c1\u1784",
-"Center": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Right": "\u179f\u17d2\u178a\u17b6\u17c6",
-"Cell type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Scope": "\u179c\u17b7\u179f\u17b6\u179b\u200b\u1797\u17b6\u1796",
-"Alignment": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798",
-"H Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"V Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Top": "\u179b\u17be",
-"Middle": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Bottom": "\u1780\u17d2\u179a\u17c4\u1798",
-"Header cell": "\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Row group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Column group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Row type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Header": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Body": "\u178f\u17bd\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8",
-"Footer": "\u1794\u178b\u1798\u200b\u1780\u1790\u17b6",
-"Border color": "\u1796\u178e\u17cc\u200b\u179f\u17ca\u17bb\u1798",
-"Insert template": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u1798\u17d2\u179a\u17bc",
-"Templates": "\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u17c6\u179a\u17bc",
-"Template": "\u1796\u17bb\u1798\u17d2\u1796\u1782\u17c6\u179a\u17bc",
-"Text color": "\u1796\u178e\u17cc\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Background color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17c3\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Custom...": "\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793...",
-"Custom color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793",
-"No color": "\u1782\u17d2\u1798\u17b6\u1793\u200b\u1796\u178e\u17cc",
-"Table of Contents": "\u178f\u17b6\u179a\u17b6\u1784\u200b\u1793\u17c3\u200b\u1798\u17b6\u178f\u17b7\u1780\u17b6",
-"Show blocks": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u1794\u17d2\u179b\u17bb\u1780",
-"Show invisible characters": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17c6\u1794\u17b6\u17c6\u1784",
-"Words: {0}": "\u1796\u17b6\u1780\u17d2\u1799: {0}",
-"File": "\u17af\u1780\u179f\u17b6\u179a",
-"Edit": "\u1780\u17c2\u1794\u17d2\u179a\u17c2",
-"Insert": "\u1794\u1789\u17d2\u1785\u17bc\u179b",
-"View": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796",
-"Format": "\u1791\u17d2\u179a\u1784\u17cb\u1791\u17d2\u179a\u17b6\u1799",
-"Table": "\u178f\u17b6\u179a\u17b6\u1784",
-"Tools": "\u17a7\u1794\u1780\u179a\u178e\u17cd",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u179f\u17c6\u1794\u17bc\u179a\u1794\u17c2\u1794\u17d4 \u1785\u17bb\u1785 ALT-F9 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799\u17d4 \u1785\u17bb\u1785 ALT-F10 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd\u17d4 \u1785\u17bb\u1785 ALT-0 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1787\u17c6\u1793\u17bd\u1799\u17d4"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/ko_KR.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('ko_KR',{
-"Redo": "\ub2e4\uc2dc \uc2e4\ud589",
-"Undo": "\uc2e4\ud589 \ucde8\uc18c",
-"Cut": "\uc798\ub77c\ub0b4\uae30",
-"Copy": "\ubcf5\uc0ac",
-"Paste": "\ubd99\uc5ec\ub123\uae30",
-"Select all": "\uc804\uccb4\uc120\ud0dd",
-"New document": "\uc0c8 \ubb38\uc11c",
-"Ok": "\ud655\uc778",
-"Cancel": "\ucde8\uc18c",
-"Visual aids": "\uc2dc\uac01\uad50\uc7ac",
-"Bold": "\uad75\uac8c",
-"Italic": "\uae30\uc6b8\uc784\uaf34",
-"Underline": "\ubc11\uc904",
-"Strikethrough": "\ucde8\uc18c\uc120",
-"Superscript": "\uc704 \ucca8\uc790",
-"Subscript": "\uc544\ub798 \ucca8\uc790",
-"Clear formatting": "\uc11c\uc2dd \uc9c0\uc6b0\uae30",
-"Align left": "\uc67c\ucabd \ub9de\ucda4",
-"Align center": "\uac00\uc6b4\ub370 \ub9de\ucda4",
-"Align right": "\uc624\ub978\ucabd \ub9de\ucda4",
-"Justify": "\uc591\ucabd \ub9de\ucda4",
-"Bullet list": "\uae00\uba38\ub9ac \uae30\ud638 \ubaa9\ub85d",
-"Numbered list": "\ubc88\ud638 \ub9e4\uae30\uae30 \ubaa9\ub85d",
-"Decrease indent": "\ub0b4\uc5b4\uc4f0\uae30",
-"Increase indent": "\ub4e4\uc5ec\uc4f0\uae30",
-"Close": "\ub2eb\uae30",
-"Formats": "\uc11c\uc2dd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc800\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc811\uadfc\uc744 \uc9c0\uc6d0\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Ctrl+X\/C\/V \ub2e8\ucd95\ud0a4\ub97c \uc774\uc6a9\ud558\uc2ed\uc2dc\uc624.",
-"Headers": "\uba38\ub9ac\uae00",
-"Header 1": "\uba38\ub9ac\uae00 1",
-"Header 2": "\uba38\ub9ac\uae00 2",
-"Header 3": "\uba38\ub9ac\uae00 3",
-"Header 4": "\uba38\ub9ac\uae00 4",
-"Header 5": "\uba38\ub9ac\uae00 5",
-"Header 6": "\uba38\ub9ac\uae00 6",
-"Headings": "\uc81c\ubaa9",
-"Heading 1": "\uc81c\ubaa9 1",
-"Heading 2": "\uc81c\ubaa9 2",
-"Heading 3": "\uc81c\ubaa9 3",
-"Heading 4": "\uc81c\ubaa9 4",
-"Heading 5": "\uc81c\ubaa9 5",
-"Heading 6": "\uc81c\ubaa9 6",
-"Preformatted": "\uc11c\uc2dd \ubbf8\uc124\uc815",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\ucf54\ub4dc",
-"Paragraph": "\ub2e8\ub77d",
-"Blockquote": "\uc778\uc6a9\ubb38",
-"Inline": "\uc778\ub77c\uc778",
-"Blocks": "\ube14\ub85d",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\uc2a4\ud0c0\uc77c\ubcf5\uc0ac \ub044\uae30. \uc774 \uc635\uc158\uc744 \ub044\uae30 \uc804\uc5d0\ub294 \ubcf5\uc0ac \uc2dc, \uc2a4\ud0c0\uc77c\uc774 \ubcf5\uc0ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
-"Fonts": "\uae00\uaf34",
-"Font Sizes": "\uae00\uaf34 \ud06c\uae30",
-"Class": "\ud074\ub798\uc2a4",
-"Browse for an image": "\uc774\ubbf8\uc9c0 \ucc3e\uae30",
-"OR": "\ub610\ub294",
-"Drop an image here": "\uc5ec\uae30\ub85c \uc774\ubbf8\uc9c0 \ub04c\uc5b4\uc624\uae30",
-"Upload": "\uc5c5\ub85c\ub4dc",
-"Block": "\ube14\ub85d",
-"Align": "\uc815\ub82c",
-"Default": "\uae30\ubcf8",
-"Circle": "\uc6d0",
-"Disc": "\uc6d0\ubc18",
-"Square": "\uc0ac\uac01",
-"Lower Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Lower Greek": "\uadf8\ub9ac\uc2a4\uc5b4 \uc18c\ubb38\uc790",
-"Lower Roman": "\ub85c\ub9c8\uc790 \uc18c\ubb38\uc790",
-"Upper Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Upper Roman": "\ub85c\ub9c8\uc790 \ub300\ubb38\uc790",
-"Anchor...": "\uc575\ucee4...",
-"Name": "\uc774\ub984",
-"Id": "\uc544\uc774\ub514",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\uc544\uc774\ub514\ub294 \ubb38\uc790, \uc22b\uc790, \ub300\uc2dc, \uc810, \ucf5c\ub860 \ub610\ub294 \ubc11\uc904\ub85c \uc2dc\uc791\ud574\uc57c\ud569\ub2c8\ub2e4.",
-"You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ud558\uc9c0 \uc54a\uc740 \uc815\ubcf4\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \ud398\uc774\uc9c0\ub97c \ubc97\uc5b4\ub098\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
-"Restore last draft": "\ub9c8\uc9c0\ub9c9 \ucd08\uc548 \ubcf5\uc6d0",
-"Special character...": "\ud2b9\uc218 \ubb38\uc790...",
-"Source code": "\uc18c\uc2a4\ucf54\ub4dc",
-"Insert\/Edit code sample": "\ucf54\ub4dc\uc0d8\ud50c \uc0bd\uc785\/\ud3b8\uc9d1",
-"Language": "\uc5b8\uc5b4",
-"Code sample...": "\ucf54\ub4dc \uc0d8\ud50c...",
-"Color Picker": "\uc0c9 \uc120\ud0dd\uae30",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd",
-"Right to left": "\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd",
-"Emoticons...": "\uc774\ubaa8\ud2f0\ucf58...",
-"Metadata and Document Properties": "\uba54\ud0c0\ub370\uc774\ud130\uc640 \ubb38\uc11c \uc18d\uc131",
-"Title": "\uc81c\ubaa9",
-"Keywords": "\ud0a4\uc6cc\ub4dc",
-"Description": "\uc124\uba85",
-"Robots": "\ub85c\ubd07",
-"Author": "\uc800\uc790",
-"Encoding": "\uc778\ucf54\ub529",
-"Fullscreen": "\uc804\uccb4\ud654\uba74",
-"Action": "\ub3d9\uc791",
-"Shortcut": "\ub2e8\ucd95\ud0a4",
-"Help": "\ub3c4\uc6c0\ub9d0",
-"Address": "\uc8fc\uc18c",
-"Focus to menubar": "\uba54\ub274\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to toolbar": "\ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to element path": "element path\uc5d0 \ud3ec\ucee4\uc2a4",
-"Focus to contextual toolbar": "\ucf04\ud14d\uc2a4\ud2b8 \ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
-"Insert link (if link plugin activated)": "\ub9c1\ud06c \uc0bd\uc785 (link \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Save (if save plugin activated)": "\uc800\uc7a5 (save \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Find (if searchreplace plugin activated)": "\ucc3e\uae30(searchreplace \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
-"Plugins installed ({0}):": "\uc124\uce58\ub41c \ud50c\ub7ec\uadf8\uc778 ({0}):",
-"Premium plugins:": "\uace0\uae09 \ud50c\ub7ec\uadf8\uc778",
-"Learn more...": "\uc880 \ub354 \uc0b4\ud3b4\ubcf4\uae30",
-"You are using {0}": "{0}\ub97c \uc0ac\uc6a9\uc911",
-"Plugins": "\ud50c\ub7ec\uadf8\uc778",
-"Handy Shortcuts": "\ub2e8\ucd95\ud0a4",
-"Horizontal line": "\uac00\ub85c",
-"Insert\/edit image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785\/\uc218\uc815",
-"Image description": "\uc774\ubbf8\uc9c0 \uc124\uba85",
-"Source": "\uc18c\uc2a4",
-"Dimensions": "\ud06c\uae30",
-"Constrain proportions": "\uc791\uc5c5 \uc81c\ud55c",
-"General": "\uc77c\ubc18",
-"Advanced": "\uace0\uae09",
-"Style": "\uc2a4\ud0c0\uc77c",
-"Vertical space": "\uc218\uc9c1 \uacf5\ubc31",
-"Horizontal space": "\uc218\ud3c9 \uacf5\ubc31",
-"Border": "\ud14c\ub450\ub9ac",
-"Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
-"Image...": "\uc774\ubbf8\uc9c0...",
-"Image list": "\uc774\ubbf8\uc9c0 \ubaa9\ub85d",
-"Rotate counterclockwise": "\uc2dc\uacc4\ubc18\ub300\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
-"Rotate clockwise": "\uc2dc\uacc4\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
-"Flip vertically": "\uc218\uc9c1 \ub4a4\uc9d1\uae30",
-"Flip horizontally": "\uc218\ud3c9 \ub4a4\uc9d1\uae30",
-"Edit image": "\uc774\ubbf8\uc9c0 \ud3b8\uc9d1",
-"Image options": "\uc774\ubbf8\uc9c0 \uc635\uc158",
-"Zoom in": "\ud655\ub300",
-"Zoom out": "\ucd95\uc18c",
-"Crop": "\uc790\ub974\uae30",
-"Resize": "\ud06c\uae30 \uc870\uc808",
-"Orientation": "\ubc29\ud5a5",
-"Brightness": "\ubc1d\uae30",
-"Sharpen": "\uc120\uba85\ud558\uac8c",
-"Contrast": "\ub300\ube44",
-"Color levels": "\uc0c9\uc0c1\ub808\ubca8",
-"Gamma": "\uac10\ub9c8",
-"Invert": "\ubc18\uc804",
-"Apply": "\uc801\uc6a9",
-"Back": "\ub4a4\ub85c",
-"Insert date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04\uc0bd\uc785",
-"Date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04",
-"Insert\/Edit Link": "\ub9c1\ud06c \uc0bd\uc785\/\ud3b8\uc9d1",
-"Insert\/edit link": "\ub9c1\ud06c \uc0bd\uc785\/\uc218\uc815",
-"Text to display": "\ubcf8\ubb38",
-"Url": "\uc8fc\uc18c",
-"Open link in...": "...\uc5d0\uc11c \ub9c1\ud06c \uc5f4\uae30",
-"Current window": "\ud604\uc7ac \ucc3d",
-"None": "\uc5c6\uc74c",
-"New window": "\uc0c8\ucc3d",
-"Remove link": "\ub9c1\ud06c\uc0ad\uc81c",
-"Anchors": "\ucc45\uac08\ud53c",
-"Link...": "\ub9c1\ud06c...",
-"Paste or type a link": "\ub9c1\ud06c\ub97c \ubd99\uc5ec\ub123\uac70\ub098 \uc785\ub825\ud558\uc138\uc694",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\ud604\uc7ac E-mail\uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. E-mail \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\ud604\uc7ac \uc6f9\uc0ac\uc774\ud2b8 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. \ud574\ub2f9 \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
-"Link list": "\ub9c1\ud06c \ub9ac\uc2a4\ud2b8",
-"Insert video": "\ube44\ub514\uc624 \uc0bd\uc785",
-"Insert\/edit video": "\ube44\ub514\uc624 \uc0bd\uc785\/\uc218\uc815",
-"Insert\/edit media": "\ubbf8\ub514\uc5b4 \uc0bd\uc785\/\uc218\uc815",
-"Alternative source": "\ub300\uccb4 \uc18c\uc2a4",
-"Alternative source URL": "\ub300\uccb4 \uc6d0\ubcf8 URL",
-"Media poster (Image URL)": "\ub300\ud45c \uc774\ubbf8\uc9c0(\uc774\ubbf8\uc9c0 URL)",
-"Paste your embed code below:": "\uc544\ub798\uc5d0 \ucf54\ub4dc\ub97c \ubd99\uc5ec\ub123\uc73c\uc138\uc694:",
-"Embed": "\uc0bd\uc785",
-"Media...": "\ubbf8\ub514\uc5b4...",
-"Nonbreaking space": "\ub744\uc5b4\uc4f0\uae30",
-"Page break": "\ud398\uc774\uc9c0 \uad6c\ubd84\uc790",
-"Paste as text": "\ud14d\uc2a4\ud2b8\ub85c \ubd99\uc5ec\ub123\uae30",
-"Preview": "\ubbf8\ub9ac\ubcf4\uae30",
-"Print...": "\uc778\uc1c4...",
-"Save": "\uc800\uc7a5",
-"Find": "\ucc3e\uae30",
-"Replace with": "\uad50\uccb4",
-"Replace": "\uad50\uccb4",
-"Replace all": "\uc804\uccb4 \uad50\uccb4",
-"Previous": "\uc774\uc804",
-"Next": "\ub2e4\uc74c",
-"Find and replace...": "\ucc3e\uae30 \ubc0f \ubc14\uafb8\uae30...",
-"Could not find the specified string.": "\ubb38\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
-"Match case": "\ub300\uc18c\ubb38\uc790 \uc77c\uce58",
-"Find whole words only": "\ubaa8\ub450 \uc77c\uce58\ud558\ub294 \ubb38\uc790 \ucc3e\uae30",
-"Spell check": "\ub9de\ucda4\ubc95 \uac80\uc0ac",
-"Ignore": "\ubb34\uc2dc",
-"Ignore all": "\uc804\uccb4\ubb34\uc2dc",
-"Finish": "\uc644\ub8cc",
-"Add to Dictionary": "\uc0ac\uc804\uc5d0 \ucd94\uac00",
-"Insert table": "\ud14c\uc774\ube14 \uc0bd\uc785",
-"Table properties": "\ud14c\uc774\ube14 \uc18d\uc131",
-"Delete table": "\ud14c\uc774\ube14 \uc0ad\uc81c",
-"Cell": "\uc140",
-"Row": "\uc5f4",
-"Column": "\ud589",
-"Cell properties": "\uc140 \uc18d",
-"Merge cells": "\uc140 \ud569\uce58\uae30",
-"Split cell": "\uc140 \ub098\ub204\uae30",
-"Insert row before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Insert row after": "\ub2e4\uc74c\uc5d0 \ud589 \uc0bd\uc785",
-"Delete row": "\ud589 \uc9c0\uc6b0\uae30",
-"Row properties": "\ud589 \uc18d\uc131",
-"Cut row": "\ud589 \uc798\ub77c\ub0b4\uae30",
-"Copy row": "\ud589 \ubcf5\uc0ac",
-"Paste row before": "\uc774\uc804\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Paste row after": "\ub2e4\uc74c\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Insert column before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Insert column after": "\ub2e4\uc74c\uc5d0 \uc5f4 \uc0bd\uc785",
-"Delete column": "\uc5f4 \uc9c0\uc6b0\uae30",
-"Cols": "\uc5f4",
-"Rows": "\ud589",
-"Width": "\ub113\uc774",
-"Height": "\ub192\uc774",
-"Cell spacing": "\uc140 \uac04\uaca9",
-"Cell padding": "\uc140 \uc548\ucabd \uc5ec\ubc31",
-"Show caption": "\ucea1\uc158 \ud45c\uc2dc",
-"Left": "\uc67c\ucabd",
-"Center": "\uac00\uc6b4\ub370",
-"Right": "\uc624\ub978\ucabd",
-"Cell type": "\uc140 \ud0c0\uc785",
-"Scope": "\ubc94\uc704",
-"Alignment": "\uc815\ub82c",
-"H Align": "\uac00\ub85c \uc815\ub82c",
-"V Align": "\uc138\ub85c \uc815\ub82c",
-"Top": "\uc0c1\ub2e8",
-"Middle": "\uc911\uac04",
-"Bottom": "\ud558\ub2e8",
-"Header cell": "\ud5e4\ub354 \uc140",
-"Row group": "\ud589 \uadf8\ub8f9",
-"Column group": "\uc5f4 \uadf8\ub8f9",
-"Row type": "\ud589 \ud0c0\uc785",
-"Header": "\ud5e4\ub354",
-"Body": "\ubc14\ub514",
-"Footer": "\ud478\ud130",
-"Border color": "\ud14c\ub450\ub9ac \uc0c9",
-"Insert template...": "\ud15c\ud50c\ub9bf \uc0bd\uc785...",
-"Templates": "\ud15c\ud50c\ub9bf",
-"Template": "\ud15c\ud50c\ub9bf",
-"Text color": "\ubb38\uc790 \uc0c9\uae54",
-"Background color": "\ubc30\uacbd\uc0c9",
-"Custom...": "\uc9c1\uc811 \uc0c9\uae54 \uc9c0\uc815\ud558\uae30",
-"Custom color": "\uc9c1\uc811 \uc9c0\uc815\ud55c \uc0c9\uae54",
-"No color": "\uc0c9\uc0c1 \uc5c6\uc74c",
-"Remove color": "\uc0c9 \uc81c\uac70",
-"Table of Contents": "\ubaa9\ucc28",
-"Show blocks": "\ube14\ub7ed \ubcf4\uc5ec\uc8fc\uae30",
-"Show invisible characters": "\uc548\ubcf4\uc774\ub294 \ubb38\uc790 \ubcf4\uc774\uae30",
-"Word count": "\ub2e8\uc5b4 \uc218",
-"Count": "\uac1c\uc218",
-"Document": "\ubb38\uc11c",
-"Selection": "\uc120\ud0dd",
-"Words": "\ub2e8\uc5b4",
-"Words: {0}": "\ub2e8\uc5b4: {0}",
-"{0} words": "{0} \ub2e8\uc5b4",
-"File": "\ud30c\uc77c",
-"Edit": "\uc218\uc815",
-"Insert": "\uc0bd\uc785",
-"View": "\ubcf4\uae30",
-"Format": "\ud3ec\ub9f7",
-"Table": "\ud14c\uc774\ube14",
-"Tools": "\ub3c4\uad6c",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30 \uc785\ub2c8\ub2e4. ALT-F9\ub97c \ub204\ub974\uba74 \uba54\ub274, ALT-F10\ub97c \ub204\ub974\uba74 \ud234\ubc14, ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
-"Image title": "\uc774\ubbf8\uc9c0 \uc81c\ubaa9",
-"Border width": "\ud14c\ub450\ub9ac \ub450\uaed8",
-"Border style": "\ud14c\ub450\ub9ac \uc2a4\ud0c0\uc77c",
-"Error": "\uc624\ub958",
-"Warn": "\uacbd\uace0",
-"Valid": "\uc720\ud6a8\ud568",
-"To open the popup, press Shift+Enter": "\ud31d\uc5c5\uc744 \uc5f4\ub824\uba74 Shift+Enter\ub97c \ub204\ub974\uc2ed\uc2dc\uc624.",
-"Rich Text Area. Press ALT-0 for help.": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \uc601\uc5ed. ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
-"System Font": "\uc2dc\uc2a4\ud15c \uae00\uaf34",
-"Failed to upload image: {0}": "\uc774\ubbf8\uc9c0 \uc5c5\ub85c\ub4dc \uc2e4\ud328: {0}",
-"Failed to load plugin: {0} from url {1}": "\ud50c\ub7ec\uadf8\uc778 \ub85c\ub4dc \uc2e4\ud328:  URL: {1}\uc5d0\uc11c\uc758 {0}",
-"Failed to load plugin url: {0}": "\ud50c\ub7ec\uadf8\uc778 URL \ub85c\ub4dc \uc2e4\ud328: {0}",
-"Failed to initialize plugin: {0}": "\ud50c\ub7ec\uadf8\uc778 \ucd08\uae30\ud654 \uc2e4\ud328: {0}",
-"example": "\uc608\uc81c",
-"Search": "\uac80\uc0c9",
-"All": "\ubaa8\ub450",
-"Currency": "\ud1b5\ud654",
-"Text": "\ud14d\uc2a4\ud2b8",
-"Quotations": "\uc778\uc6a9\ubb38",
-"Mathematical": "\uc218\ud559",
-"Extended Latin": "\ud655\uc7a5 \ub77c\ud2f4\uc5b4",
-"Symbols": "\uae30\ud638",
-"Arrows": "\ud654\uc0b4\ud45c",
-"User Defined": "\uc0ac\uc6a9\uc790 \uc815\uc758",
-"dollar sign": "\ub2ec\ub7ec \uae30\ud638",
-"currency sign": "\ud1b5\ud654 \uae30\ud638",
-"euro-currency sign": "\uc720\ub85c\ud654 \uae30\ud638",
-"colon sign": "\ucf5c\ub860 \uae30\ud638",
-"cruzeiro sign": "\ud06c\ub8e8\uc81c\uc774\ub8e8 \uae30\ud638",
-"french franc sign": "\ud504\ub791\uc2a4 \ud504\ub791 \uae30\ud638",
-"lira sign": "\ub9ac\ub77c \uae30\ud638",
-"mill sign": "\ubc00 \uae30\ud638",
-"naira sign": "\ub098\uc774\ub77c \uae30\ud638",
-"peseta sign": "\ud398\uc138\ud0c0 \uae30\ud638",
-"rupee sign": "\ub8e8\ud53c \uae30\ud638",
-"won sign": "\uc6d0 \uae30\ud638",
-"new sheqel sign": "\ub274 \uc138\ucf08 \uae30\ud638",
-"dong sign": "\ub3d9 \uae30\ud638",
-"kip sign": "\ud0b5 \uae30\ud638",
-"tugrik sign": "\ud22c\uadf8\ub9ac\ud06c \uae30\ud638",
-"drachma sign": "\ub4dc\ub77c\ud06c\ub9c8 \uae30\ud638",
-"german penny symbol": "\ub3c5\uc77c \ud398\ub2c8 \uae30\ud638",
-"peso sign": "\ud398\uc18c \uae30\ud638",
-"guarani sign": "\uacfc\ub77c\ub2c8 \uae30\ud638",
-"austral sign": "\uc544\uc6b0\uc2a4\ud2b8\ub784 \uae30\ud638",
-"hryvnia sign": "\uadf8\ub9ac\ube0c\ub098 \uae30\ud638",
-"cedi sign": "\uc138\ub514 \uae30\ud638",
-"livre tournois sign": "\ub9ac\ube0c\ub974 \ud2b8\ub974\ub204\uc544 \uae30\ud638",
-"spesmilo sign": "\uc2a4\ud398\uc2a4\ubc00\ub85c \uae30\ud638",
-"tenge sign": "\ud161\uac8c \uae30\ud638",
-"indian rupee sign": "\uc778\ub3c4 \ub8e8\ud53c \uae30\ud638",
-"turkish lira sign": "\ud130\ud0a4 \ub9ac\ub77c \uae30\ud638",
-"nordic mark sign": "\ub178\ub974\ub515 \ub9c8\ub974\ud06c \uae30\ud638",
-"manat sign": "\ub9c8\ub098\ud2b8 \uae30\ud638",
-"ruble sign": "\ub8e8\ube14 \uae30\ud638",
-"yen character": "\uc5d4 \uae30\ud638",
-"yuan character": "\uc704\uc548 \uae30\ud638",
-"yuan character, in hong kong and taiwan": "\ub300\ub9cc \uc704\uc548 \uae30\ud638",
-"yen\/yuan character variant one": "\uc5d4\/\uc704\uc548 \ubb38\uc790 \ubcc0\ud615",
-"Loading emoticons...": "\uc774\ubaa8\ud2f0\ucf58 \ubd88\ub7ec\uc624\ub294 \uc911...",
-"Could not load emoticons": "\uc774\ubaa8\ud2f0\ucf58\uc744 \ubd88\ub7ec\uc62c \uc218 \uc5c6\uc74c",
-"People": "\uc0ac\ub78c",
-"Animals and Nature": "\ub3d9\ubb3c\uacfc \uc790\uc5f0",
-"Food and Drink": "\uc74c\uc2dd\uacfc \uc74c\ub8cc",
-"Activity": "\ud65c\ub3d9",
-"Travel and Places": "\uc5ec\ud589\uacfc \uc7a5\uc18c",
-"Objects": "\ubb3c\uac74",
-"Flags": "\uae43\ubc1c",
-"Characters": "\ubb38\uc790",
-"Characters (no spaces)": "\ubb38\uc790(\uacf5\ubc31 \uc5c6\uc74c)",
-"{0} characters": "{0} \ubb38\uc790",
-"Error: Form submit field collision.": "\uc624\ub958: \uc591\uc2dd \uc81c\ucd9c \ud544\ub4dc \ubd88\uc77c\uce58",
-"Error: No form element found.": "\uc624\ub958: \uc591\uc2dd \ud56d\ubaa9 \uc5c6\uc74c",
-"Update": "\uc5c5\ub370\uc774\ud2b8",
-"Color swatch": "\uc0c9\uc0c1 \uacac\ubcf8",
-"Turquoise": "\uccad\ub85d\uc0c9",
-"Green": "\ucd08\ub85d\uc0c9",
-"Blue": "\ud30c\ub780\uc0c9",
-"Purple": "\ubcf4\ub77c\uc0c9",
-"Navy Blue": "\ub0a8\uc0c9",
-"Dark Turquoise": "\uc9c4\ud55c \uccad\ub85d\uc0c9",
-"Dark Green": "\uc9c4\ud55c \ucd08\ub85d\uc0c9",
-"Medium Blue": "\uc911\uac04 \ud30c\ub780\uc0c9",
-"Medium Purple": "\uc911\uac04 \ubcf4\ub77c\uc0c9",
-"Midnight Blue": "\uc9c4\ud55c \ud30c\ub780\uc0c9",
-"Yellow": "\ub178\ub780\uc0c9",
-"Orange": "\uc8fc\ud669\uc0c9",
-"Red": "\ube68\uac04\uc0c9",
-"Light Gray": "\ubc1d\uc740 \ud68c\uc0c9",
-"Gray": "\ud68c\uc0c9",
-"Dark Yellow": "\uc9c4\ud55c \ub178\ub780\uc0c9",
-"Dark Orange": "\uc9c4\ud55c \uc8fc\ud669\uc0c9",
-"Dark Red": "\uc9c4\ud55c \ube68\uac04\uc0c9",
-"Medium Gray": "\uc911\uac04 \ud68c\uc0c9",
-"Dark Gray": "\uc9c4\ud55c \ud68c\uc0c9",
-"Light Green": "\ubc1d\uc740 \ub179\uc0c9",
-"Light Yellow": "\ubc1d\uc740 \ub178\ub780\uc0c9",
-"Light Red": "\ubc1d\uc740 \ube68\uac04\uc0c9",
-"Light Purple": "\ubc1d\uc740 \ubcf4\ub77c\uc0c9",
-"Light Blue": "\ubc1d\uc740 \ud30c\ub780\uc0c9",
-"Dark Purple": "\uc9c4\ud55c \ubcf4\ub77c\uc0c9",
-"Dark Blue": "\uc9c4\ud55c \ud30c\ub780\uc0c9",
-"Black": "\uac80\uc740\uc0c9",
-"White": "\ud770\uc0c9",
-"Switch to or from fullscreen mode": "\uc804\uccb4 \ud654\uba74\uc73c\ub85c\/\uc5d0\uc11c \uc804\ud658",
-"Open help dialog": "\ub3c4\uc6c0\ub9d0 \ub300\ud654\ucc3d \uc5f4\uae30",
-"history": "\uae30\ub85d",
-"styles": "\uc2a4\ud0c0\uc77c",
-"formatting": "\ud3ec\ub9f7\ud305",
-"alignment": "\uc815\ub82c",
-"indentation": "\ub4e4\uc5ec\uc4f0\uae30",
-"permanent pen": "\uc720\uc131\ud39c",
-"comments": "\uc8fc\uc11d",
-"Format Painter": "\uc11c\uc2dd \ubcf5\uc0ac",
-"Insert\/edit iframe": "\uc544\uc774\ud504\ub808\uc784 \uc0bd\uc785\/\ud3b8\uc9d1",
-"Capitalization": "\ub300\ubb38\uc790\ud654",
-"lowercase": "\uc18c\ubb38\uc790",
-"UPPERCASE": "\ub300\ubb38\uc790",
-"Title Case": "\uc81c\ubaa9\uc744 \ub300\ubb38\uc790\ud654",
-"Permanent Pen Properties": "\uc601\uad6c \ud39c \ud2b9\uc131",
-"Permanent pen properties...": "\uc601\uad6c \ud39c \ud2b9\uc131...",
-"Font": "\uae00\uaf34",
-"Size": "\ud06c\uae30",
-"More...": "\ub354 \ubcf4\uae30...",
-"Spellcheck Language": "\ub9de\ucda4\ubc95 \uac80\uc0ac \uc5b8\uc5b4",
-"Select...": "\uc120\ud0dd...",
-"Preferences": "\ud658\uacbd\uc124\uc815",
-"Yes": "\ub124",
-"No": "\uc544\ub2c8\uc624",
-"Keyboard Navigation": "\ud0a4 \uc120\ud0dd",
-"Version": "\ubc84\uc804",
-"Anchor": "\uc575\ucee4",
-"Special character": "\ud2b9\uc218\ubb38\uc790",
-"Code sample": "\ucf54\ub4dc\uc0d8\ud50c",
-"Color": "\uc0c9\uc0c1",
-"Emoticons": "\uc774\ubaa8\ud2f0\ucf58",
-"Document properties": "\ubb38\uc11c \uc18d\uc131",
-"Image": "\uc774\ubbf8\uc9c0",
-"Insert link": "\ub9c1\ud06c \uc0bd\uc785 ",
-"Target": "\ub300\uc0c1",
-"Link": "\ub9c1\ud06c",
-"Poster": "\ud3ec\uc2a4\ud130",
-"Media": "\ubbf8\ub514\uc5b4",
-"Print": "\ucd9c\ub825",
-"Prev": "\uc774\uc804",
-"Find and replace": "\ucc3e\uc544\uc11c \uad50\uccb4",
-"Whole words": "\uc804\uccb4 \ub2e8\uc5b4",
-"Spellcheck": "\ubb38\ubc95\uccb4\ud06c",
-"Caption": "\ucea1\uc158",
-"Insert template": "\ud15c\ud50c\ub9bf \uc0bd\uc785"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/ku.js Deleted

@@ -1,415 +0,0 @@
-tinymce.addI18n('ku',{
-"Redo": "\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5",
-"Undo": "\u06af\u06d5\u0695\u0627\u0646\u06d5\u0648\u06d5",
-"Cut": "\u0628\u0695\u06cc\u0646",
-"Copy": "\u0644\u06d5\u0628\u06d5\u0631\u06af\u0631\u062a\u0646\u06d5\u0648\u06d5",
-"Paste": "\u0644\u06a9\u0627\u0646\u062f\u0646",
-"Select all": "\u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u0646\u06cc \u0647\u06d5\u0645\u0648\u0648",
-"New document": "\u0628\u06d5\u06b5\u06af\u06d5\u0646\u0627\u0645\u06d5\u06cc \u0646\u0648\u06ce",
-"Ok": "\u0628\u0627\u0634\u06d5",
-"Cancel": "\u067e\u0627\u0634\u06af\u06d5\u0632\u0628\u0648\u0648\u0646\u06d5\u0648\u06d5",
-"Visual aids": "\u0647\u0627\u0648\u06a9\u0627\u0631\u06cc \u0628\u06cc\u0646\u06d5\u06cc\u06cc",
-"Bold": "\u062a\u06c6\u062e\u06a9\u0631\u062f\u0646",
-"Italic": "\u0644\u0627\u0631\u06a9\u0631\u062f\u0646",
-"Underline": "\u0647\u06ce\u06b5 \u0628\u06d5\u0698\u06ce\u0631\u062f\u0627\u0646",
-"Strikethrough": "\u0647\u06ce\u06b5 \u0628\u06d5\u0646\u0627\u0648\u062f\u0627\u0646",
-"Superscript": "\u0633\u06d5\u0631\u0646\u0648\u0648\u0633",
-"Subscript": "\u0698\u06ce\u0631\u0646\u0648\u0648\u0633",
-"Clear formatting": "\u067e\u0627\u06a9\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5\u06cc \u0634\u06ce\u0648\u0627\u0632\u06a9\u0631\u062f\u0646",
-"Align left": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0686\u06d5\u067e",
-"Align center": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0646\u0627\u0648\u06d5\u0695\u0627\u0633\u062a",
-"Align right": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0695\u0627\u0633\u062a",
-"Justify": "\u0647\u0627\u0648\u0695\u06ce\u06a9\u06cc ",
-"Bullet list": "\u0644\u06cc\u0633\u062a\u06cc \u062e\u0627\u06b5",
-"Numbered list": "\u0644\u06cc\u0633\u062a\u06cc \u0698\u0645\u0627\u0631\u06d5",
-"Decrease indent": "\u06a9\u06d5\u0645\u06a9\u0631\u062f\u0646\u06cc \u0628\u06c6\u0634\u0627\u06cc\u06cc",
-"Increase indent": "\u0632\u06cc\u0627\u062f\u06a9\u0631\u062f\u0646\u06cc \u0628\u06c6\u0634\u0627\u06cc\u06cc",
-"Close": "\u062f\u0627\u062e\u0633\u062a\u0646",
-"Formats": "\u0634\u06ce\u0648\u0627\u0632\u06a9\u0631\u062f\u0646\u06d5\u06a9\u0627\u0646",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0648\u06ce\u0628\u06af\u06d5\u0695\u06d5\u06a9\u06d5\u062a \u067e\u0627\u06b5\u067e\u0634\u062a\u06cc \u062f\u06d5\u0633\u062a\u06a9\u06d5\u0648\u062a\u0646\u06cc \u0695\u0627\u0633\u062a\u06d5\u0648\u062e\u06c6\u06cc \u06a9\u0644\u06cc\u067e\u0628\u06c6\u0631\u062f \u0646\u0627\u06a9\u0627\u062a. \u062a\u06a9\u0627\u06cc\u06d5 \u0644\u06d5\u062c\u06cc\u0627\u062a\u06cc \u06a9\u0648\u0631\u062a\u0628\u0695\u06d5\u06a9\u0627\u0646\u06cc Ctrl+X\/C\/V \u062a\u06d5\u062e\u062a\u06d5\u06a9\u0644\u06cc\u0644 \u0628\u06d5\u06a9\u0627\u0631\u0628\u06ce\u0646\u06d5.",
-"Headers": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5\u06a9\u0627\u0646",
-"Header 1": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 1",
-"Header 2": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 2",
-"Header 3": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 3",
-"Header 4": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 4",
-"Header 5": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 5",
-"Header 6": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 6",
-"Headings": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a\u06d5\u06a9\u0627\u0646",
-"Heading 1": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 1",
-"Heading 2": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 2",
-"Heading 3": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 3",
-"Heading 4": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 4",
-"Heading 5": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 5",
-"Heading 6": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 6",
-"Preformatted": "\u067e\u06ce\u0634\u0634\u06ce\u0648\u0627\u0632\u06a9\u0631\u0627\u0648",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u06a9\u06c6\u062f",
-"Paragraph": "\u0628\u0695\u06af\u06d5",
-"Blockquote": "Blockquote",
-"Inline": "\u0644\u06d5\u0633\u06d5\u0631\u062f\u06ce\u0631",
-"Blocks": "\u0628\u0644\u06c6\u06a9\u06d5\u06a9\u0627\u0646",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0644\u06a9\u0627\u0646\u062f\u0646 \u0626\u06ce\u0633\u062a\u0627 \u0644\u06d5 \u0628\u0627\u0631\u06cc \u062f\u06d5\u0642\u06cc \u0633\u0627\u062f\u06d5\u06cc\u06d5. \u0646\u0627\u0648\u06d5\u0695\u06c6\u06a9\u06d5\u06a9\u0627\u0646 \u062f\u06d5\u0644\u06a9\u06ce\u0646 \u0648\u06d5\u06a9 \u062f\u06d5\u0642\u06cc \u0633\u0627\u062f\u06d5 \u0647\u06d5\u062a\u0627 \u0626\u06d5\u0645 \u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u06d5 \u0646\u0627\u06a9\u0627\u0631\u0627 \u062f\u06d5\u06a9\u06d5\u06cc\u062a.",
-"Fonts": "\u0641\u06c6\u0646\u062a\u06d5\u06a9\u0627\u0646",
-"Font Sizes": "\u0642\u06d5\u0628\u0627\u0631\u06d5\u06cc \u0641\u06c6\u0646\u062a",
-"Class": "\u067e\u06c6\u0644",
-"Browse for an image": "\u0628\u06af\u06d5\u0695\u06ce \u0628\u06c6 \u0648\u06ce\u0646\u06d5\u06cc\u06d5\u06a9",
-"OR": "OR",
-"Drop an image here": "\u0648\u06ce\u0646\u06d5\u06cc\u06d5\u06a9 \u0695\u0627\u06a9\u06ce\u0634\u06d5 \u0628\u06c6 \u0626\u06ce\u0631\u06d5",
-"Upload": "\u0628\u0627\u0631\u06a9\u0631\u062f\u0646",
-"Block": "\u0628\u0644\u06c6\u06a9",
-"Align": "\u0644\u0627\u06af\u0631\u062a\u0646",
-"Default": "\u0628\u0646\u06d5\u0695\u06d5\u062a\u06cc",
-"Circle": "\u0628\u0627\u0632\u0646\u06d5",
-"Disc": "\u067e\u06d5\u067e\u06a9\u06d5",
-"Square": "\u0686\u0648\u0627\u0631\u06af\u06c6\u0634\u06d5",
-"Lower Alpha": "\u0626\u06d5\u0644\u0641\u0627\u06cc \u0628\u0686\u0648\u0648\u06a9",
-"Lower Greek": "\u06cc\u06c6\u0646\u0627\u0646\u06cc \u0628\u0686\u0648\u0648\u06a9",
-"Lower Roman": "\u0695\u06c6\u0645\u0627\u0646\u06cc \u0628\u0686\u0648\u0648\u06a9",
-"Upper Alpha": "\u0626\u06d5\u0644\u0641\u0627\u06cc \u06af\u06d5\u0648\u0631\u06d5",
-"Upper Roman": "\u0695\u06c6\u0645\u0627\u0646\u06cc \u06af\u06d5\u0648\u0631\u06d5",
-"Anchor...": "\u0644\u06d5\u0646\u06af\u06d5\u0631...",
-"Name": "\u0646\u0627\u0648",
-"Id": "\u067e\u06ce\u0646\u0627\u0633\u06d5",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u067e\u06ce\u0646\u0627\u0633\u06d5 \u062f\u06d5\u0628\u06ce \u0628\u06d5 \u062d\u06d5\u0631\u0641\u06d5\u0648\u06d5 \u062f\u06d5\u0633\u062a \u067e\u06ce \u0628\u06a9\u0627\u060c \u0648 \u0628\u06d5 \u062d\u06d5\u0631\u0641\u060c \u0698\u0645\u0627\u0631\u06d5\u060c \u0628\u06d5\u0646\u062f\u06d5\u06a9\u060c \u062e\u0627\u06b5\u060c \u062c\u0648\u0648\u062a\u062e\u0627\u06b5 \u06cc\u0627\u0646 \u0628\u0646\u0647\u06ce\u06b5 \u062f\u0631\u06ce\u0698\u06d5\u06cc \u067e\u06ce \u0628\u062f\u0631\u06ce.",
-"You have unsaved changes are you sure you want to navigate away?": "\u062a\u06c6 \u06af\u06c6\u0695\u0627\u0646\u06a9\u0627\u0631\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u062a \u067e\u0627\u0634\u06d5\u06a9\u06d5\u0648\u062a \u0646\u06d5\u06a9\u0631\u062f\u0648\u0648\u06d5\u060c \u0626\u0627\u06cc\u0627 \u062f\u06b5\u0646\u06cc\u0627\u06cc\u062a \u0644\u06d5 \u062f\u06d5\u0631\u0686\u0648\u0648\u0646\u062a\u061f",
-"Restore last draft": "\u06af\u06d5\u0695\u0627\u0646\u062f\u0646\u06d5\u0648\u06d5\u06cc \u062f\u0648\u0627\u06cc\u06cc\u0646 \u0695\u06d5\u0634\u0646\u0648\u0648\u0633",
-"Special character...": "\u0646\u0648\u0648\u0633\u06d5 \u062a\u0627\u06cc\u0628\u06d5\u062a\u06d5\u06a9\u0627\u0646...",
-"Source code": "\u06a9\u06c6\u062f\u06cc \u0633\u06d5\u0631\u0686\u0627\u0648\u06d5",
-"Insert\/Edit code sample": "\u062a\u06ce\u062e\u0633\u062a\u0646\/\u0628\u0698\u0627\u0631\u06a9\u0631\u062f\u0646\u06cc \u0646\u0645\u0648\u0648\u0646\u06d5 \u06a9\u06c6\u062f",
-"Language": "\u0632\u0645\u0627\u0646",
-"Code sample...": "\u0646\u0645\u0648\u0648\u0646\u06d5 \u06a9\u06c6\u062f...",
-"Color Picker": "\u0647\u06d5\u06b5\u0686\u0646\u06cc \u0695\u06d5\u0646\u06af",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0686\u06d5\u067e \u0628\u06c6 \u0695\u0627\u0633\u062a",
-"Right to left": "\u0695\u0627\u0633\u062a \u0628\u06c6 \u0686\u06d5\u067e",
-"Emoticons...": "\u067e\u06ce\u06a9\u06d5\u0646\u06c6\u06a9...",
-"Metadata and Document Properties": "\u0645\u06ce\u062a\u0627\u062f\u0631\u0627\u0648\u06d5 \u0648 \u062a\u0627\u06cc\u0628\u06d5\u062a\u0645\u06d5\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u0628\u06d5\u06b5\u06af\u06d5",
-"Title": "\u0646\u0627\u0648\u0646\u06cc\u0634\u0627\u0646",
-"Keywords": "\u06a9\u0644\u06cc\u0644\u0647\u200c\u0648\u0634\u0647\u200c\u06a9\u0627\u0646",
-"Description": "\u0628\u0627\u0633\u06a9\u0631\u062f\u0646",
-"Robots": "\u0695\u06c6\u0628\u06c6\u062a\u06d5\u06a9\u0627\u0646",
-"Author": "\u0646\u0648\u0648\u0633\u06d5\u0631",
-"Encoding": "\u0628\u06d5\u06a9\u06c6\u062f\u06a9\u0631\u062f\u0646",
-"Fullscreen": "\u0695\u0648\u0648\u067e\u0695\u06cc",
-"Action": "\u06a9\u0631\u062f\u0627\u0631",
-"Shortcut": "\u0646\u0627\u0648\u0628\u0695",
-"Help": "\u06cc\u0627\u0631\u0645\u06d5\u062a\u06cc",
-"Address": "\u0646\u0627\u0648\u0646\u06cc\u0634\u0627\u0646",
-"Focus to menubar": "\u0633\u06d5\u0631\u0646\u062c\u062f\u0627\u0646 \u0644\u06d5 \u0634\u0631\u06cc\u062a\u06cc \u0645\u06ce\u0646\u0648\u0648",
-"Focus to toolbar": "\u0633\u06d5\u0631\u0646\u062c\u062f\u0627\u0646 \u0644\u06d5 \u0634\u0631\u06cc\u062a\u06cc \u0626\u0627\u0645\u06ce\u0631\u06d5\u06a9\u0627\u0646",
-"Focus to element path": "\u0633\u06d5\u0631\u0646\u062c\u062f\u0627\u0646 \u0644\u06d5 \u0695\u06ce\u0686\u06a9\u06d5\u06cc \u0639\u0648\u0646\u0633\u0648\u0631",
-"Focus to contextual toolbar": "\u0633\u06d5\u0631\u0646\u062c\u062f\u0627\u0646 \u0644\u06d5 \u0634\u0631\u06cc\u062a\u06cc \u0626\u0627\u0645\u06ce\u0631\u06cc \u062f\u06d5\u0642\u06cc",
-"Insert link (if link plugin activated)": "\u062a\u06ce\u062e\u0633\u062a\u0646\u06cc \u0644\u06cc\u0646\u06a9 (\u0626\u06d5\u06af\u06d5\u0631 \u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648 \u0686\u0627\u0644\u0627\u06a9 \u06a9\u0631\u0627\u0648\u06d5)",
-"Save (if save plugin activated)": "\u067e\u0627\u0634\u06d5\u06a9\u06d5\u0648\u062a\u06a9\u0631\u062f\u0646 (\u0626\u06d5\u06af\u06d5\u0631 \u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648\u06cc \u067e\u0627\u0634\u06d5\u06a9\u06d5\u0648\u062a\u06a9\u0631\u062f\u0646 \u0686\u0627\u0644\u0627\u06a9 \u06a9\u0631\u0627\u0648\u06d5)",
-"Find (if searchreplace plugin activated)": "\u062f\u06c6\u0632\u06cc\u0646\u06d5\u0648\u06d5 (\u0626\u06d5\u06af\u06d5\u0631 \u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648\u06cc \u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646\u06cc \u06af\u06d5\u0695\u0627\u0646 \u0686\u0627\u0644\u0627\u06a9 \u06a9\u0631\u0627\u0648\u06d5)",
-"Plugins installed ({0}):": "\u0626\u06d5\u0648 \u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648\u0627\u0646\u06d5\u06cc \u062f\u0627\u0645\u06d5\u0632\u0631\u0627\u0648\u0646 ({0}):",
-"Premium plugins:": "\u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648\u06d5 \u067e\u0627\u0631\u06d5\u06cc\u06cc\u06cc\u06d5\u06a9\u0627\u0646:",
-"Learn more...": "\u0632\u06cc\u0627\u062a\u0631 \u0628\u0632\u0627\u0646\u06d5...",
-"You are using {0}": "\u062a\u06c6  {0} \u0628\u06d5\u06a9\u0627\u0631 \u062f\u06ce\u0646\u06cc",
-"Plugins": "\u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648\u06d5\u06a9\u0627\u0646",
-"Handy Shortcuts": "\u0646\u0627\u0648\u0628\u0695\u06d5 \u062f\u06d5\u0633\u062a\u06cc\u06cc\u06d5\u06a9\u0627\u0646",
-"Horizontal line": "\u0647\u06ce\u06b5\u06cc \u0626\u0627\u0633\u06c6\u06cc\u06cc",
-"Insert\/edit image": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\/\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc \u0648\u06ce\u0646\u06d5",
-"Image description": "\u0628\u0627\u0633\u06a9\u0631\u062f\u0646\u06cc \u0648\u06ce\u0646\u06d5",
-"Source": "\u0633\u06d5\u0631\u0686\u0627\u0648\u06d5",
-"Dimensions": "\u062f\u0648\u0648\u0631\u06cc\u06cc\u06d5\u06a9\u0627\u0646",
-"Constrain proportions": "\u0695\u06d5\u0647\u06d5\u0646\u062f\u06cc \u0645\u06d5\u0631\u062c\u06d5\u06a9\u0627\u0646",
-"General": "\u06af\u0634\u062a\u06cc",
-"Advanced": "\u067e\u06ce\u0634\u06a9\u06d5\u0648\u062a\u0648\u0648",
-"Style": "\u0634\u06ce\u0648\u0627\u0632",
-"Vertical space": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u0633\u062a\u0648\u0648\u0646\u06cc",
-"Horizontal space": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u0626\u0627\u0633\u06c6\u06cc\u06cc",
-"Border": "\u0633\u0646\u0648\u0648\u0631",
-"Insert image": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0648\u06ce\u0646\u06d5",
-"Image...": "\u0648\u06ce\u0646\u06d5...",
-"Image list": "\u067e\u06ce\u0631\u0633\u062a\u06cc \u0648\u06ce\u0646\u06d5",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Color levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0695\u06c6\u0698\/\u06a9\u0627\u062a",
-"Date\/time": "\u0695\u06ce\u06a9\u06d5\u0648\u062a\/\u06a9\u0627\u062a",
-"Insert\/Edit Link": "\u062a\u06ce\u062e\u0633\u062a\u0646\/\u0628\u0698\u0627\u0631\u06a9\u0631\u062f\u0646\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Insert\/edit link": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\/\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Text to display": "\u062f\u06d5\u0642 \u0628\u06c6 \u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646",
-"Url": "\u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Open link in...": "\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631 \u0644\u06d5...",
-"Current window": "\u0647\u06d5\u0631\u0626\u06d5\u0645 \u067e\u06d5\u0646\u062c\u06d5\u0631\u06d5\u06cc\u06d5",
-"None": "\u0647\u06cc\u0686",
-"New window": "\u067e\u06d5\u0646\u062c\u06d5\u0631\u06d5\u06cc \u0646\u0648\u06ce",
-"Remove link": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Anchors": "\u0644\u06d5\u0646\u06af\u06d5\u0631\u06d5\u06a9\u0627\u0646",
-"Link...": "\u0628\u06d5\u0633\u062a\u06d5\u0631...",
-"Paste or type a link": "\u0644\u06a9\u0627\u0646\u062f\u0646 \u06cc\u0627\u0646 \u0646\u0648\u0648\u0633\u06cc\u0646\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0626\u06d5\u0648 \u0628\u06d5\u0633\u062a\u06d5\u0631\u06d5\u06cc \u0646\u0648\u0648\u0633\u06cc\u0648\u062a\u06d5 \u0628\u06d5 \u067e\u06d5\u06cc\u0627\u0645\u06cc \u0626\u06d5\u0644\u06cc\u06a9\u062a\u0695\u06c6\u0646\u06cc \u062f\u06d5\u0686\u06ce\u062a. \u0626\u0627\u06cc\u0627 \u062f\u06d5\u062a\u06d5\u0648\u06ce\u062a mailto: prefix \u06cc \u0628\u06c6 \u0632\u06cc\u0627\u062f \u0628\u06a9\u06d5\u06cc\u062a\u061f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0626\u06d5\u0648 \u0628\u06d5\u0633\u062a\u06d5\u0631\u06d5\u06cc \u0646\u0648\u0648\u0633\u06cc\u0648\u062a\u06d5 \u0628\u06d5 \u0628\u06d5\u0633\u062a\u06d5\u0631\u06cc \u062f\u06d5\u0631\u06d5\u06a9\u06cc \u062f\u06d5\u0686\u06ce\u062a. \u0626\u0627\u06cc\u0627 \u062f\u06d5\u062a\u06d5\u0648\u06ce\u062a http:\/\/ prefix \u06cc \u0628\u06c6 \u0632\u06cc\u0627\u062f \u0628\u06a9\u06d5\u06cc\u062a\u061f",
-"Link list": "\u067e\u06ce\u0633\u0631\u062a\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Insert video": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u06a4\u06cc\u062f\u06cc\u06c6",
-"Insert\/edit video": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\/\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc \u06a4\u06cc\u062f\u06cc\u06c6",
-"Insert\/edit media": "\u062a\u06ce\u062e\u0633\u062a\u0646\/\u0628\u0698\u0627\u0631\u06a9\u0631\u062f\u0646\u06cc \u06af\u06d5\u06cc\u0627\u0646\u06d5",
-"Alternative source": "\u0633\u06d5\u0631\u0686\u0627\u0648\u06d5\u06cc \u062c\u06ce\u06af\u0631\u06d5\u0648\u06d5",
-"Alternative source URL": "\u0628\u06d5\u0633\u062a\u06d5\u0631\u06cc \u0633\u06d5\u0631\u0686\u0627\u0648\u06d5\u06cc \u062c\u06ce\u06af\u0631\u06d5\u0648\u06d5",
-"Media poster (Image URL)": "\u067e\u06c6\u0633\u062a\u06d5\u0631\u06cc \u06af\u06d5\u06cc\u0627\u0646\u06d5 (\u0628\u06d5\u0633\u062a\u06d5\u0631\u06cc \u0648\u06ce\u0646\u06d5)",
-"Paste your embed code below:": "\u06a9\u06c6\u062f\u06cc \u062a\u06ce\u062e\u0633\u062a\u0646\u06d5\u06a9\u06d5\u062a \u0644\u06d5\u062e\u0648\u0627\u0631\u06d5\u0648\u06d5 \u0628\u0644\u06a9\u06ce\u0646\u06d5:",
-"Embed": "\u062a\u06ce\u062e\u0633\u062a\u0646",
-"Media...": "\u06af\u06d5\u06cc\u0627\u0646\u06d5...",
-"Nonbreaking space": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u0646\u06d5\u0628\u0695\u0627\u0648",
-"Page break": "\u0628\u0695\u06cc\u0646\u06cc \u067e\u06d5\u0695\u06d5",
-"Paste as text": "\u0644\u06a9\u0627\u0646\u062f\u0646 \u0648\u06d5\u06a9 \u062f\u06d5\u0642",
-"Preview": "\u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646",
-"Print...": "\u0686\u0627\u067e\u06a9\u0631\u062f\u0646...",
-"Save": "\u067e\u0627\u0634\u06d5\u06a9\u06d5\u0648\u062a",
-"Find": "\u062f\u06c6\u0632\u06cc\u0646\u06d5\u0648\u06d5",
-"Replace with": "\u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646 \u0644\u06d5\u06af\u06d5\u06b5",
-"Replace": "\u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646",
-"Replace all": "\u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646\u06cc \u0647\u06d5\u0645\u0648\u0648",
-"Previous": "\u067e\u06ce\u0634\u0648\u0648",
-"Next": "\u062f\u0648\u0627\u062a\u0631",
-"Find and replace...": "\u062f\u06c6\u0632\u06cc\u0646 \u0648 \u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646...",
-"Could not find the specified string.": "\u0695\u06cc\u0632\u0628\u06d5\u0646\u062f\u06cc \u062f\u06cc\u0627\u0631\u06cc\u06a9\u0631\u0627\u0648 \u0646\u0627\u062f\u06c6\u0632\u0631\u06ce\u062a\u06d5\u0648\u06d5.",
-"Match case": "\u0647\u0627\u0648\u062a\u0627\u0628\u0648\u0648\u0646\u06cc \u0628\u0627\u0631",
-"Find whole words only": "\u062f\u06c6\u0632\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u062a\u06d5\u0646\u06cc\u0627 \u062a\u06d5\u0648\u0627\u0648\u06cc \u0648\u0634\u06d5\u06a9\u0627\u0646",
-"Spell check": "\u062a\u0627\u0648\u062a\u0648\u06ce\u06cc \u0695\u06ce\u0646\u0648\u0648\u0633",
-"Ignore": "\u0644\u06d5\u0628\u06cc\u0631\u06a9\u0631\u062f\u0646",
-"Ignore all": "\u0644\u06d5\u0628\u06cc\u0631\u06a9\u0631\u062f\u0646\u06cc \u0647\u06d5\u0645\u0648\u0648",
-"Finish": "\u062a\u06d5\u0648\u0627\u0648",
-"Add to Dictionary": "\u0632\u06cc\u0627\u062f\u06a9\u0631\u062f\u0646 \u0628\u06c6 \u0641\u06d5\u0631\u0647\u06d5\u0646\u06af",
-"Insert table": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u062e\u0634\u062a\u06d5",
-"Table properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u062e\u0634\u062a\u06d5",
-"Delete table": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u062e\u0634\u062a\u06d5",
-"Cell": "\u062e\u0627\u0646\u06d5",
-"Row": "\u0695\u06cc\u0632",
-"Column": "\u0633\u062a\u0648\u0648\u0646",
-"Cell properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u062e\u0627\u0646\u06d5",
-"Merge cells": "\u06cc\u06d5\u06a9\u062e\u0633\u062a\u0646\u06cc \u062e\u0627\u0646\u06d5\u06a9\u0627\u0646",
-"Split cell": "\u062c\u06cc\u0627\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5\u06cc \u062e\u0627\u0646\u06d5",
-"Insert row before": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0695\u06cc\u0632 \u0628\u06c6 \u067e\u06ce\u0634\u062a\u0631",
-"Insert row after": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0695\u06cc\u0632 \u0628\u06c6 \u062f\u0648\u0627\u062a\u0631",
-"Delete row": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u0695\u06cc\u0632",
-"Row properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u0695\u06cc\u0632",
-"Cut row": "\u0628\u0695\u06cc\u0646\u06cc \u0695\u06cc\u0632",
-"Copy row": "\u0644\u06d5\u0628\u06d5\u0631\u06af\u0631\u062a\u0646\u06d5\u0648\u06d5\u06cc \u0695\u06cc\u0632",
-"Paste row before": "\u0644\u06a9\u0627\u0646\u062f\u0646\u06cc \u0695\u06cc\u0632 \u0644\u06d5 \u067e\u06ce\u0634\u062a\u0631",
-"Paste row after": "\u0644\u06a9\u0627\u0646\u062f\u0646\u06cc \u0695\u06cc\u0632 \u0644\u06d5 \u062f\u0648\u0627\u062a\u0631",
-"Insert column before": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0633\u062a\u0648\u0648\u0646 \u0628\u06c6 \u067e\u06ce\u0634\u062a\u0631",
-"Insert column after": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0633\u062a\u0648\u0648\u0646 \u0628\u06c6 \u062f\u0648\u0627\u062a\u0631",
-"Delete column": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u0633\u062a\u0648\u0648\u0646",
-"Cols": "\u0633\u062a\u0648\u0648\u0646\u06d5\u06a9\u0627\u0646",
-"Rows": "\u0695\u06cc\u0632\u06d5\u06a9\u0627\u0646",
-"Width": "\u062f\u0631\u06ce\u0698\u06cc",
-"Height": "\u0628\u06d5\u0631\u0632\u06cc",
-"Cell spacing": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u062e\u0627\u0646\u06d5",
-"Cell padding": "\u0646\u0627\u0648\u067e\u06c6\u0634\u06cc \u062e\u0627\u0646\u06d5",
-"Show caption": "\u0646\u06cc\u0634\u0627\u0646\u062f\u0627\u0646\u06cc \u0633\u06d5\u0631\u062f\u06ce\u0695",
-"Left": "\u0686\u06d5\u067e",
-"Center": "\u0646\u0627\u0648\u06d5\u0695\u0627\u0633\u062a",
-"Right": "\u0695\u0627\u0633\u062a",
-"Cell type": "\u062c\u06c6\u0631\u06cc \u062e\u0627\u0646\u06d5",
-"Scope": "\u0628\u0648\u0627\u0631",
-"Alignment": "\u0644\u0627\u06af\u0631\u062a\u0646",
-"H Align": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0626\u0627\u0633\u06c6\u06cc\u06cc",
-"V Align": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0633\u062a\u0648\u0648\u0646\u06cc",
-"Top": "\u0633\u06d5\u0631\u06d5\u0648\u06d5",
-"Middle": "\u0646\u0627\u0648\u06d5\u0646\u062f",
-"Bottom": "\u0698\u06ce\u0631\u06d5\u0648\u06d5",
-"Header cell": "\u062e\u0627\u0646\u06d5\u06cc \u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5",
-"Row group": "\u06a9\u06c6\u0645\u06d5\u06b5\u06d5 \u0695\u06cc\u0632",
-"Column group": "\u06a9\u06c6\u0645\u06d5\u06b5\u06d5 \u0633\u062a\u0648\u0648\u0646",
-"Row type": "\u062c\u06c6\u0631\u06cc \u0695\u06cc\u0632",
-"Header": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5",
-"Body": "\u0646\u0627\u0648\u06d5\u0695\u06c6\u06a9",
-"Footer": "\u067e\u06ce\u067e\u06d5\u0695\u06d5",
-"Border color": "\u0695\u06d5\u0646\u06af\u06cc \u0633\u0646\u0648\u0648\u0631",
-"Insert template...": "\u062a\u06ce\u062e\u0633\u062a\u0646\u06cc \u0642\u0627\u06b5\u0628...",
-"Templates": "\u062f\u0627\u0695\u06ce\u0698\u06d5\u06a9\u0627\u0646",
-"Template": "\u0642\u0627\u06b5\u0628",
-"Text color": "\u0695\u06d5\u0646\u06af\u06cc \u062f\u06d5\u0642",
-"Background color": "\u0695\u06d5\u0646\u06af\u06cc \u067e\u0627\u0634\u0628\u0646\u06d5\u0645\u0627",
-"Custom...": "\u062f\u0627\u0646\u0631\u0627\u0648...",
-"Custom color": "\u0695\u06d5\u0646\u06af\u06cc \u062f\u0627\u0646\u0631\u0627\u0648",
-"No color": "\u0628\u06d5\u0628\u06ce \u0695\u06d5\u0646\u06af",
-"Remove color": "\u0644\u0627\u0628\u0631\u062f\u0646\u06cc \u0695\u06d5\u0646\u06af",
-"Table of Contents": "\u062c\u06d5\u062f\u0648\u06d5\u0644\u06cc \u0646\u0627\u0648\u06d5\u0631\u06c6\u06a9",
-"Show blocks": "\u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646\u06cc \u0628\u0644\u06c6\u06a9\u06d5\u06a9\u0627\u0646",
-"Show invisible characters": "\u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646\u06cc \u0646\u0648\u0648\u0633\u06d5 \u0634\u0627\u0631\u0627\u0648\u06d5\u06a9\u0627\u0646",
-"Word count": "\u0698\u0645\u0627\u0631\u06d5\u06cc \u0648\u0634\u06d5\u06a9\u0627\u0646",
-"Count": "\u0698\u0645\u0627\u0631\u06d5",
-"Document": "\u0628\u06d5\u06b5\u06af\u06d5",
-"Selection": "\u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u0646",
-"Words": "\u0648\u0634\u06d5\u06a9\u0627\u0646",
-"Words: {0}": "\u0648\u0634\u06d5\u06a9\u0627\u0646: {0}",
-"{0} words": "{0} \u0648\u0634\u06d5",
-"File": "\u067e\u06d5\u0695\u06af\u06d5",
-"Edit": "\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc",
-"Insert": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648",
-"View": "\u0628\u06cc\u0646\u06cc\u0646",
-"Format": "\u0634\u06ce\u0648\u0627\u0632",
-"Table": "\u062e\u0634\u062a\u06d5",
-"Tools": "\u0626\u0627\u0645\u0631\u0627\u0632\u06d5\u06a9\u0627\u0646",
-"Powered by {0}": "\u0647\u06ce\u0632\u06af\u0631\u062a\u0648\u0648 \u0644\u06d5 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0646\u0627\u0648\u0686\u06d5\u06cc \u062f\u06d5\u0642\u06cc \u062a\u06d5\u0648\u0627\u0648. ALT-F9 \u062f\u0627\u06af\u0631\u06d5 \u0628\u06c6 \u0644\u06cc\u0633\u062a\u06d5. ALT-F10 \u062f\u0627\u06af\u0631\u06d5 \u0628\u06c6 \u062a\u0648\u0648\u06b5\u0627\u0645\u0631\u0627\u0632. ALT-0 \u062f\u0627\u06af\u0631\u06d5 \u0628\u06c6 \u06cc\u0627\u0631\u0645\u06d5\u062a\u06cc",
-"Image title": "\u0633\u06d5\u0631\u062f\u06ce\u0631\u06cc \u0648\u06ce\u0646\u06d5",
-"Border width": "\u067e\u0627\u0646\u06cc\u06cc \u0644\u06ce\u0648\u0627\u0631",
-"Border style": "\u0634\u06ce\u0648\u0627\u0632\u06cc \u0644\u06ce\u0648\u0627\u0631",
-"Error": "\u0647\u06d5\u06b5\u06d5",
-"Warn": "\u0647\u06c6\u0634\u06cc\u0627\u0631\u06cc",
-"Valid": "\u062f\u0631\u0648\u0633\u062a",
-"To open the popup, press Shift+Enter": "\u0628\u06c6 \u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5\u06cc \u067e\u06d5\u0646\u062c\u06d5\u0631\u06d5\u06cc \u0633\u06d5\u0631\u067e\u06d5\u0695\u060c Shift+Enter \u0644\u06ce\u062f\u06d5",
-"Rich Text Area. Press ALT-0 for help.": "\u062f\u06d5\u06a4\u06d5\u0631\u06cc \u062f\u06d5\u0642\u06cc \u062f\u06d5\u0648\u06b5\u06d5\u0645\u06d5\u0646\u062f. \u0628\u06c6 \u0695\u06ce\u0646\u0645\u0627\u06cc\u06cc ALT-0 \u0644\u06ce\u062f\u06d5.",
-"System Font": "\u0641\u06c6\u0646\u062a\u06cc \u0633\u06cc\u0633\u062a\u0645",
-"Failed to upload image: {0}": "\u0628\u0627\u0631\u06a9\u0631\u062f\u0646\u06cc \u0648\u06ce\u0646\u06d5 \u0634\u06a9\u0633\u062a\u06cc \u0647\u06ce\u0646\u0627: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0628\u0627\u0631\u06af\u0631\u062a\u0646\u06cc \u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648 \u0634\u06a9\u0633\u062a\u06cc \u0647\u06ce\u0646\u0627: {0}",
-"Failed to load plugin url: {0}": "\u0628\u0627\u0631\u06af\u0631\u062a\u0646\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631\u06cc \u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648 \u0634\u06a9\u0633\u062a\u06cc \u0647\u06ce\u0646\u0627: {0}",
-"Failed to initialize plugin: {0}": "\u0695\u06ce\u062e\u0633\u062a\u0646\u06cc \u0633\u06d5\u0631\u06d5\u062a\u0627\u06cc\u06cc \u067e\u06ce\u0648\u06d5\u06a9\u0631\u0627\u0648 \u0634\u06a9\u0633\u062a\u06cc \u0647\u06ce\u0646\u0627: {0}",
-"example": "\u0646\u0645\u0648\u0648\u0646\u06d5",
-"Search": "\u06af\u06d5\u0695\u0627\u0646",
-"All": "\u0647\u06d5\u0645\u0648\u0648",
-"Currency": "\u062f\u0631\u0627\u0648",
-"Text": "\u062f\u06d5\u0642",
-"Quotations": "\u0648\u062a\u06d5\u06cc \u06af\u06ce\u0695\u0627\u0648\u06d5",
-"Mathematical": "\u0628\u06cc\u0631\u06a9\u0627\u0631\u06cc\u0627\u0646\u06d5",
-"Extended Latin": "\u0644\u0627\u062a\u06cc\u0646\u06cc \u067e\u06d5\u0631\u06d5\u067e\u06ce\u062f\u0631\u0627\u0648",
-"Symbols": "\u0646\u06cc\u0634\u0627\u0646\u06d5\u06a9\u0627\u0646",
-"Arrows": "\u062a\u06cc\u0631\u0646\u06cc\u0634\u0627\u0646\u06d5\u06a9\u0627\u0646",
-"User Defined": "\u062f\u06cc\u0627\u0631\u06cc\u06a9\u0631\u0627\u0648\u06cc \u0628\u06d5\u06a9\u0627\u0631\u0647\u06ce\u0646\u06d5\u0631",
-"dollar sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062f\u06c6\u0644\u0627\u0631",
-"currency sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062f\u0631\u0627\u0648",
-"euro-currency sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062f\u0631\u0627\u0648\u06cc \u06cc\u06c6\u0631\u06c6",
-"colon sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062c\u0648\u0648\u062a\u062e\u0627\u06b5",
-"cruzeiro sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u06a9\u0631\u0648\u0648\u0632\u06cc\u0631\u06c6",
-"french franc sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0641\u0631\u0627\u0646\u06a9\u06cc \u0641\u06d5\u0695\u06d5\u0646\u0633\u0627",
-"lira sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0644\u06cc\u0631\u06d5",
-"mill sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0645\u06cc\u0644",
-"naira sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0646\u0627\u06cc\u0631\u0627",
-"peseta sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u067e\u06ce\u0633\u06ce\u062a\u0627",
-"rupee sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0695\u0648\u0648\u067e\u06cc\u06d5",
-"won sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0648\u06c6\u0646",
-"new sheqel sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0646\u0648\u06ce\u06cc \u0634\u06ce\u06a9\u06ce\u0644",
-"dong sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062f\u06c6\u0646\u06af",
-"kip sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u06a9\u06cc\u067e",
-"tugrik sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062a\u0648\u06af\u0631\u0648\u06af",
-"drachma sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062f\u0631\u0627\u062e\u0645\u0627",
-"german penny symbol": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u067e\u06ce\u0646\u06cc\u06cc \u0626\u06d5\u06b5\u0645\u0627\u0646\u06cc",
-"peso sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u067e\u06ce\u0633\u06c6",
-"guarani sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u06af\u0648\u0627\u0631\u0627\u0646\u06cc",
-"austral sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0626\u0627\u0648\u0633\u062a\u0631\u0627\u0644",
-"hryvnia sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u06af\u0631\u06cc\u06a4\u0646\u06cc\u0627",
-"cedi sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0633\u06ce\u062f\u06cc",
-"livre tournois sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0644\u06cc\u06a4\u0631\u06ce \u062a\u0648\u0631\u0646\u06c6\u06cc\u0633",
-"spesmilo sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0633\u067e\u06ce\u0633\u0645\u0627\u06cc\u06b5\u06c6",
-"tenge sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u062a\u06ce\u0646\u062c",
-"indian rupee sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0695\u0648\u0648\u067e\u06cc\u06d5\u06cc \u0647\u0646\u062f\u06cc",
-"turkish lira sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0644\u06cc\u0631\u06d5\u06cc \u062a\u0648\u0631\u06a9",
-"nordic mark sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0645\u0627\u0631\u06a9\u06cc \u0646\u06c6\u0631\u0648\u06cc\u0698",
-"manat sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0645\u06d5\u0646\u0627\u062a",
-"ruble sign": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u0695\u0648\u0648\u0628\u06b5",
-"yen character": "\u0646\u0648\u0648\u0633\u06d5\u06cc \u06cc\u06ce\u0646",
-"yuan character": "\u0646\u0648\u0648\u0633\u06d5\u06cc \u06cc\u0648\u0627\u0646",
-"yuan character, in hong kong and taiwan": "\u0646\u06cc\u0634\u0627\u0646\u06cc \u06cc\u0648\u0627\u0646\u060c \u0644\u06d5 \u0647\u06c6\u0646\u06af \u06a9\u06c6\u0646\u06af \u0648 \u062a\u0627\u06cc\u0648\u0627\u0646",
-"yen\/yuan character variant one": "\u0646\u0648\u0648\u0633\u06d5\u06cc \u062c\u06ce\u06af\u0631\u06cc \u06cc\u06ce\u0646\/\u06cc\u0648\u0627\u0646",
-"Loading emoticons...": "\u062e\u06d5\u0631\u06cc\u06a9\u06cc \u0628\u0627\u0631\u06af\u0631\u062a\u0646\u06cc \u067e\u06ce\u06a9\u06d5\u0646\u06c6\u06a9\u06d5\u06a9\u0627\u0646...",
-"Could not load emoticons": "\u0646\u0627\u062a\u0648\u0627\u0646\u0631\u06ce \u067e\u06ce\u06a9\u06d5\u0646\u06c6\u06a9\u06d5\u06a9\u0627\u0646 \u0628\u0627\u0631 \u0628\u06af\u06cc\u0631\u06ce",
-"People": "\u062e\u06d5\u06b5\u06a9",
-"Animals and Nature": "\u0626\u0627\u0698\u06d5\u06b5 \u0648 \u0633\u0631\u0648\u0634\u062a",
-"Food and Drink": "\u0686\u06ce\u0634\u062a \u0648 \u062e\u0648\u0627\u0631\u062f\u0646",
-"Activity": "\u0686\u0627\u0644\u0627\u06a9\u06cc",
-"Travel and Places": "\u0633\u06d5\u0641\u06d5\u0631 \u0648 \u0634\u0648\u06ce\u0646\u06d5\u06a9\u0627\u0646",
-"Objects": "\u0634\u062a\u06d5\u06a9\u0627\u0646",
-"Flags": "\u0626\u0627\u06b5\u0627\u06a9\u0627\u0646",
-"Characters": "\u0646\u0648\u0648\u0633\u06d5\u06a9\u0627\u0646",
-"Characters (no spaces)": "\u0646\u0648\u0648\u0633\u06d5\u06a9\u0627\u0646 (\u0628\u06d5\u0628\u06ce \u0628\u06c6\u0634\u0627\u06cc\u06cc)",
-"{0} characters": "{0} \u0646\u0648\u0648\u0633\u06d5",
-"Error: Form submit field collision.": "\u0647\u06d5\u06b5\u06d5: \u062a\u06ce\u06a9\u0686\u0648\u0648\u0646\u06cc \u0646\u0627\u0631\u062f\u0646\u06cc \u0641\u06c6\u0631\u0645.",
-"Error: No form element found.": "\u0647\u06d5\u06b5\u06d5: \u0647\u06cc\u0686 \u0639\u0648\u0646\u0633\u0648\u0631\u06ce\u06a9\u06cc \u0641\u06c6\u0631\u0645 \u0646\u06d5\u062f\u06c6\u0632\u0631\u0627\u06cc\u06d5\u0648\u06d5.",
-"Update": "\u0695\u06c6\u0698\u0627\u0646\u06d5\u06a9\u0631\u062f\u0646",
-"Color swatch": "\u0646\u0645\u0648\u0648\u0646\u06d5 \u0695\u06d5\u0646\u06af",
-"Turquoise": "\u067e\u06cc\u0631\u06c6\u0632\u06d5\u06cc\u06cc",
-"Green": "\u0633\u06d5\u0648\u0632",
-"Blue": "\u06a9\u06d5\u0648\u06d5",
-"Purple": "\u0645\u06c6\u0631",
-"Navy Blue": "\u0633\u0648\u0631\u0645\u06d5\u06cc\u06cc",
-"Dark Turquoise": "\u067e\u06cc\u0631\u06c6\u0632\u06d5\u06cc\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Dark Green": "\u0633\u06d5\u0648\u0632\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Medium Blue": "\u06a9\u06d5\u0648\u06d5\u06cc \u0645\u0627\u0645\u0646\u0627\u0648\u06d5\u0646\u062f",
-"Medium Purple": "\u0645\u06c6\u0631\u06cc \u0645\u0627\u0645\u0646\u0627\u0648\u06d5\u0646\u062f",
-"Midnight Blue": "\u06a9\u06d5\u0648\u06d5\u06cc \u0646\u06cc\u0648\u06d5\u0634\u06d5\u0648",
-"Yellow": "\u0632\u06d5\u0631\u062f",
-"Orange": "\u067e\u0631\u062a\u06d5\u0642\u0627\u06b5\u06cc",
-"Red": "\u0633\u0648\u0648\u0631",
-"Light Gray": "\u0628\u06c6\u0631\u06cc \u06a9\u0627\u06b5",
-"Gray": "\u0628\u06c6\u0631",
-"Dark Yellow": "\u0632\u06d5\u0631\u062f\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Dark Orange": "\u067e\u0631\u062a\u06d5\u0642\u0627\u06b5\u06cc\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Dark Red": "\u0633\u0648\u0648\u0631\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Medium Gray": "\u0628\u06c6\u0631\u06cc \u0645\u0627\u0645\u0646\u0627\u0648\u06d5\u0646\u062f",
-"Dark Gray": "\u0628\u06c6\u0631\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Light Green": "\u0633\u06d5\u0648\u0632\u06cc \u06a9\u0627\u06b5",
-"Light Yellow": "\u0632\u06d5\u0631\u062f\u06cc \u06a9\u0627\u06b5",
-"Light Red": "\u0633\u0648\u0648\u0631\u06cc \u06a9\u0627\u06b5",
-"Light Purple": "\u0645\u06c6\u0631\u06cc \u06a9\u0627\u06b5",
-"Light Blue": "\u06a9\u06d5\u0648\u06d5\u06cc \u06a9\u0627\u06b5",
-"Dark Purple": "\u0645\u06c6\u0631\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Dark Blue": "\u06a9\u06d5\u0648\u06d5\u06cc \u062a\u0627\u0631\u06cc\u06a9",
-"Black": "\u0695\u06d5\u0634",
-"White": "\u0633\u067e\u06cc",
-"Switch to or from fullscreen mode": "\u06af\u06c6\u0695\u06cc\u0646 \u0644\u06d5 \u06cc\u0627\u0646 \u0628\u06c6 \u062d\u0627\u06b5\u06d5\u062a\u06cc \u067e\u0695\u062f\u06cc\u0645\u06d5\u0646",
-"Open help dialog": "\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5\u06cc \u0648\u062a\u0648\u0648\u06ce\u0698\u06cc \u06cc\u0627\u0631\u0645\u06d5\u062a\u06cc",
-"history": "\u0645\u06ce\u0698\u0648\u0648",
-"styles": "\u0634\u06ce\u0648\u06d5\u06a9\u0627\u0646",
-"formatting": "\u0634\u06ce\u0648\u06d5\u067e\u06ce\u062f\u0627\u0646",
-"alignment": "\u0644\u0627\u06af\u0631\u062a\u0646",
-"indentation": "\u0646\u0627\u0648\u0648\u06d5\u0686\u0648\u0648\u0646",
-"permanent pen": "\u067e\u06ce\u0646\u0648\u0648\u0633\u06cc \u0647\u06d5\u0645\u06cc\u0634\u06d5\u06cc\u06cc",
-"comments": "\u0628\u06c6\u0686\u0648\u0648\u0646\u06d5\u06a9\u0627\u0646",
-"Format Painter": "\u0646\u06cc\u06af\u0627\u0631\u06a9\u06ce\u0634\u06cc \u0634\u06ce\u0648\u0627\u0632",
-"Insert\/edit iframe": "\u062a\u06ce\u062e\u0633\u062a\u0646\/\u0628\u0698\u0627\u0631\u06a9\u0631\u062f\u0646\u06cc \u0626\u0627\u06cc\u0641\u0631\u06d5\u06cc\u0645",
-"Capitalization": "\u062d\u06d5\u0631\u0641\u06d5 \u06af\u06d5\u0648\u0631\u06d5\u06a9\u0627\u0646",
-"lowercase": "\u062d\u06d5\u0631\u0641\u06cc \u0628\u0686\u0648\u0648\u06a9",
-"UPPERCASE": "\u062d\u06d5\u0631\u0641\u06cc \u06af\u06d5\u0648\u0631\u06d5",
-"Title Case": "\u062d\u06d5\u0631\u0641\u06d5 \u0633\u06d5\u0631\u062f\u06ce\u0631\u06cc\u06cc\u06d5\u06a9\u0627\u0646",
-"Permanent Pen Properties": "\u062a\u0627\u06cc\u0628\u06d5\u062a\u0645\u06d5\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u067e\u06ce\u0646\u0648\u0648\u0633\u06cc \u0647\u06d5\u0645\u06cc\u0634\u06d5\u06cc\u06cc",
-"Permanent pen properties...": "\u062a\u0627\u06cc\u0628\u06d5\u062a\u0645\u06d5\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u067e\u06ce\u0646\u0648\u0648\u0633\u06cc \u0647\u06d5\u0645\u06cc\u0634\u06d5\u06cc\u06cc...",
-"Font": "\u0641\u06c6\u0646\u062a",
-"Size": "\u0626\u06d5\u0646\u062f\u0627\u0632\u06d5",
-"More...": "\u0632\u06cc\u0627\u062a\u0631...",
-"Spellcheck Language": "\u0632\u0645\u0627\u0646\u06cc \u062a\u0627\u0648\u062a\u0648\u06ce\u06cc \u0695\u06ce\u0646\u0648\u0648\u0633",
-"Select...": "\u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u0646...",
-"Preferences": "\u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u06d5\u06a9\u0627\u0646",
-"Yes": "\u0626\u06d5\u0631\u06ce",
-"No": "\u0646\u06d5\u062e\u06ce\u0631",
-"Keyboard Navigation": "\u0695\u06ce\u067e\u06ce\u0648\u0627\u0646 \u0628\u06d5 \u062a\u06d5\u062e\u062a\u06d5\u06a9\u0644\u06cc\u0644",
-"Version": "\u0648\u06d5\u0634\u0627\u0646",
-"Anchor": "\u0644\u06d5\u0646\u06af\u06d5\u0631",
-"Special character": "\u0646\u0648\u0648\u0633\u06d5\u06cc \u062a\u0627\u06cc\u0628\u06d5\u062a",
-"Color": "\u0695\u06d5\u0646\u06af",
-"Emoticons": "\u0648\u06ce\u0646\u06c6\u0686\u06a9\u06d5\u06a9\u0627\u0646\u06cc \u0647\u06d5\u0633\u062a",
-"Document properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u0628\u06d5\u06b5\u06af\u06d5\u0646\u0627\u0645\u06d5",
-"Insert link": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Target": "\u0626\u0627\u0645\u0627\u0646\u062c",
-"Poster": "\u067e\u06c6\u0633\u062a\u06d5\u0631",
-"Print": "\u0686\u0627\u067e\u06a9\u0631\u062f\u0646",
-"Whole words": "\u0647\u06d5\u0645\u0648\u0648 \u0648\u0634\u06d5\u06a9\u0627\u0646",
-"Find and replace": "\u062f\u06c6\u0632\u06cc\u0646\u06d5\u0648\u06d5 \u0648 \u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646",
-"Prev": "\u067e\u06ce\u0634\u0648\u0648",
-"Spellcheck": "\u067e\u0634\u06a9\u0646\u06cc\u0646\u06cc \u0695\u06ce\u0646\u0648\u0648\u0633",
-"Caption": "\u0633\u06d5\u0631\u062f\u06ce\u0695",
-"Insert template": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u062f\u0627\u0695\u06ce\u0698\u06d5"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/ku_IQ.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('ku_IQ',{
-"Redo": "\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5",
-"Undo": "\u06af\u06d5\u0695\u0627\u0646\u06d5\u0648\u06d5",
-"Cut": "\u0628\u0695\u06cc\u0646",
-"Copy": "\u0644\u06d5\u0628\u06d5\u0631\u06af\u0631\u062a\u0646\u06d5\u0648\u06d5",
-"Paste": "\u0644\u06a9\u0627\u0646\u062f\u0646",
-"Select all": "\u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u0646\u06cc \u0647\u06d5\u0645\u0648\u0648",
-"New document": "\u0628\u06d5\u06b5\u06af\u06d5\u0646\u0627\u0645\u06d5\u06cc \u0646\u0648\u06ce",
-"Ok": "\u0628\u0627\u0634\u06d5",
-"Cancel": "\u067e\u0627\u0634\u06af\u06d5\u0632\u0628\u0648\u0648\u0646\u06d5\u0648\u06d5",
-"Visual aids": "\u0647\u0627\u0648\u06a9\u0627\u0631\u06cc \u0628\u06cc\u0646\u06d5\u06cc\u06cc",
-"Bold": "\u062a\u06c6\u062e\u06a9\u0631\u062f\u0646",
-"Italic": "\u0644\u0627\u0631\u06a9\u0631\u062f\u0646",
-"Underline": "\u0647\u06ce\u06b5 \u0628\u06d5\u0698\u06ce\u0631\u062f\u0627\u0646",
-"Strikethrough": "\u0647\u06ce\u06b5 \u0628\u06d5\u0646\u0627\u0648\u062f\u0627\u0646",
-"Superscript": "\u0633\u06d5\u0631\u0646\u0648\u0648\u0633",
-"Subscript": "\u0698\u06ce\u0631\u0646\u0648\u0648\u0633",
-"Clear formatting": "\u067e\u0627\u06a9\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5\u06cc \u0634\u06ce\u0648\u0627\u0632\u06a9\u0631\u062f\u0646",
-"Align left": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0686\u06d5\u067e",
-"Align center": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0646\u0627\u0648\u06d5\u0695\u0627\u0633\u062a",
-"Align right": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0695\u0627\u0633\u062a",
-"Justify": "\u0647\u0627\u0648\u0695\u06ce\u06a9\u06cc ",
-"Bullet list": "\u0644\u06cc\u0633\u062a\u06cc \u062e\u0627\u06b5",
-"Numbered list": "\u0644\u06cc\u0633\u062a\u06cc \u0698\u0645\u0627\u0631\u06d5",
-"Decrease indent": "\u06a9\u06d5\u0645\u06a9\u0631\u062f\u0646\u06cc \u0628\u06c6\u0634\u0627\u06cc\u06cc",
-"Increase indent": "\u0632\u06cc\u0627\u062f\u06a9\u0631\u062f\u0646\u06cc \u0628\u06c6\u0634\u0627\u06cc\u06cc",
-"Close": "\u062f\u0627\u062e\u0633\u062a\u0646",
-"Formats": "\u0634\u06ce\u0648\u0627\u0632\u06a9\u0631\u062f\u0646\u06d5\u06a9\u0627\u0646",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0648\u06ce\u0628\u06af\u06d5\u0695\u06d5\u06a9\u06d5\u062a \u067e\u0627\u06b5\u067e\u0634\u062a\u06cc \u062f\u06d5\u0633\u062a\u06a9\u06d5\u0648\u062a\u0646\u06cc \u0695\u0627\u0633\u062a\u06d5\u0648\u062e\u06c6\u06cc \u06a9\u0644\u06cc\u067e\u0628\u06c6\u0631\u062f \u0646\u0627\u06a9\u0627\u062a. \u062a\u06a9\u0627\u06cc\u06d5 \u0644\u06d5\u062c\u06cc\u0627\u062a\u06cc \u06a9\u0648\u0631\u062a\u0628\u0695\u06d5\u06a9\u0627\u0646\u06cc Ctrl+X\/C\/V \u062a\u06d5\u062e\u062a\u06d5\u06a9\u0644\u06cc\u0644 \u0628\u06d5\u06a9\u0627\u0631\u0628\u06ce\u0646\u06d5.",
-"Headers": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5\u06a9\u0627\u0646",
-"Header 1": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 1",
-"Header 2": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 2",
-"Header 3": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 3",
-"Header 4": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 4",
-"Header 5": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 5",
-"Header 6": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5 6",
-"Headings": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a\u06d5\u06a9\u0627\u0646",
-"Heading 1": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 1",
-"Heading 2": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 2",
-"Heading 3": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 3",
-"Heading 4": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 4",
-"Heading 5": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 5",
-"Heading 6": "\u0633\u06d5\u0631\u0628\u0627\u0628\u06d5\u062a 6",
-"Preformatted": "Preformatted",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u06a9\u06c6\u062f",
-"Paragraph": "\u0628\u0695\u06af\u06d5",
-"Blockquote": "Blockquote",
-"Inline": "\u0644\u06d5\u0633\u06d5\u0631\u062f\u06ce\u0631",
-"Blocks": "\u0628\u0644\u06c6\u06a9\u06d5\u06a9\u0627\u0646",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0644\u06a9\u0627\u0646\u062f\u0646 \u0626\u06ce\u0633\u062a\u0627 \u0644\u06d5 \u0628\u0627\u0631\u06cc \u062f\u06d5\u0642\u06cc \u0633\u0627\u062f\u06d5\u06cc\u06d5. \u0646\u0627\u0648\u06d5\u0695\u06c6\u06a9\u06d5\u06a9\u0627\u0646 \u062f\u06d5\u0644\u06a9\u06ce\u0646 \u0648\u06d5\u06a9 \u062f\u06d5\u0642\u06cc \u0633\u0627\u062f\u06d5 \u0647\u06d5\u062a\u0627 \u0626\u06d5\u0645 \u0647\u06d5\u06b5\u0628\u0698\u0627\u0631\u062f\u06d5 \u0646\u0627\u06a9\u0627\u0631\u0627 \u062f\u06d5\u06a9\u06d5\u06cc\u062a.",
-"Font Family": "\u062c\u06c6\u0631\u06cc \u0641\u06c6\u0646\u062a",
-"Font Sizes": "\u0642\u06d5\u0628\u0627\u0631\u06d5\u06cc \u0641\u06c6\u0646\u062a",
-"Class": "\u06a9\u0644\u0627\u0633",
-"Browse for an image": "\u0648\u06ce\u0646\u06d5 \u062f\u06cc\u0627\u0631\u06cc\u0628\u06a9\u06d5",
-"OR": "\u06cc\u0627\u0646",
-"Drop an image here": "\u0648\u06ce\u0646\u06d5 \u0628\u062e\u06d5 \u0633\u06d5\u0631\u0626\u06ce\u0631\u06d5",
-"Upload": "\u0628\u0627\u0631\u06a9\u0631\u062f\u0646",
-"Block": "\u0628\u0644\u06c6\u06a9",
-"Align": "\u0626\u0627\u0695\u0627\u0633\u062a\u06d5",
-"Default": "\u0628\u0646\u06d5\u0695\u06d5\u062a\u06cc",
-"Circle": "\u0628\u0627\u0632\u0646\u06d5",
-"Disc": "\u067e\u06d5\u067e\u06a9\u06d5",
-"Square": "\u0686\u0648\u0627\u0631\u06af\u06c6\u0634\u06d5",
-"Lower Alpha": "\u0626\u06d5\u0644\u0641\u0627\u06cc \u0628\u0686\u0648\u0648\u06a9",
-"Lower Greek": "\u06cc\u06c6\u0646\u0627\u0646\u06cc \u0628\u0686\u0648\u0648\u06a9",
-"Lower Roman": "\u0695\u06c6\u0645\u0627\u0646\u06cc \u0628\u0686\u0648\u0648\u06a9",
-"Upper Alpha": "\u0626\u06d5\u0644\u0641\u0627\u06cc \u06af\u06d5\u0648\u0631\u06d5",
-"Upper Roman": "\u0695\u06c6\u0645\u0627\u0646\u06cc \u06af\u06d5\u0648\u0631\u06d5",
-"Anchor": "\u0644\u06d5\u0646\u06af\u06d5\u0631",
-"Name": "\u0646\u0627\u0648",
-"Id": "\u0646\u0627\u0633\u0646\u0627\u0645\u06d5",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0646\u0627\u0633\u0646\u0627\u0645\u06d5 \u067e\u06ce\u0648\u06cc\u0633\u062a\u06d5 \u0628\u06d5 \u0646\u0648\u0633\u06cc\u0646 \u062f\u06d5\u0633\u062a \u067e\u06ce \u0628\u06a9\u0627\u062a\u060c \u06a9\u06d5 \u062a\u06d5\u0646\u0647\u0627 \u0646\u0648\u0633\u06cc\u0646\u060c \u0698\u0645\u0627\u0631\u06d5\u06a9\u0627\u0646\u060c \u062f\u0627\u0634\u060c \u0646\u0648\u06a9\u062a\u06d5\u060c \u06a9\u06c6\u06b5\u06c6\u0646\u06d5\u06a9\u0627\u0646 \u0648 \u0628\u0646\u0647\u06ce\u06b5\u06d5\u06a9\u0627\u0646 \u0695\u06ce\u06af\u06d5\u067e\u06ce\u062f\u0631\u0627\u0648\u0646.",
-"You have unsaved changes are you sure you want to navigate away?": "\u062a\u06c6 \u06af\u06c6\u0695\u0627\u0646\u06a9\u0627\u0631\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u062a \u067e\u0627\u0634\u06d5\u06a9\u06d5\u0648\u062a \u0646\u06d5\u06a9\u0631\u062f\u0648\u0648\u06d5\u060c \u0626\u0627\u06cc\u0627 \u062f\u06b5\u0646\u06cc\u0627\u06cc\u062a \u0644\u06d5 \u062f\u06d5\u0631\u0686\u0648\u0648\u0646\u062a\u061f",
-"Restore last draft": "\u06af\u06d5\u0695\u0627\u0646\u062f\u0646\u06d5\u0648\u06d5\u06cc \u062f\u0648\u0627\u06cc\u06cc\u0646 \u0695\u06d5\u0634\u0646\u0648\u0648\u0633",
-"Special character": "\u0646\u0648\u0648\u0633\u06d5\u06cc \u062a\u0627\u06cc\u0628\u06d5\u062a",
-"Source code": "\u06a9\u06c6\u062f\u06cc \u0633\u06d5\u0631\u0686\u0627\u0648\u06d5",
-"Insert\/Edit code sample": "\u0632\u06cc\u0627\u062f\u06a9\u0631\u062f\u0646 \u0648 \u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc\u06a9\u0631\u062f\u0646\u06cc \u0646\u0645\u0648\u0648\u0646\u06d5\u06cc \u06a9\u06c6\u062f",
-"Language": "\u0632\u0645\u0627\u0646",
-"Code sample": "\u0646\u0645\u0648\u0648\u0646\u06d5\u06cc \u06a9\u06c6\u062f",
-"Color": "\u0695\u06d5\u0646\u06af",
-"R": "\u0633\u0648\u0631",
-"G": "\u0633\u06d5\u0648\u0632",
-"B": "\u0634\u06cc\u0646",
-"Left to right": "\u0686\u06d5\u067e \u0628\u06c6 \u0695\u0627\u0633\u062a",
-"Right to left": "\u0695\u0627\u0633\u062a \u0628\u06c6 \u0686\u06d5\u067e",
-"Emoticons": "\u0648\u06ce\u0646\u06c6\u0686\u06a9\u06d5\u06a9\u0627\u0646\u06cc \u0647\u06d5\u0633\u062a",
-"Document properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u0628\u06d5\u06b5\u06af\u06d5\u0646\u0627\u0645\u06d5",
-"Title": "\u0646\u0627\u0648\u0646\u06cc\u0634\u0627\u0646",
-"Keywords": "\u06a9\u0644\u06cc\u0644\u0647\u200c\u0648\u0634\u0647\u200c\u06a9\u0627\u0646",
-"Description": "\u0628\u0627\u0633\u06a9\u0631\u062f\u0646",
-"Robots": "\u0695\u06c6\u0628\u06c6\u062a\u06d5\u06a9\u0627\u0646",
-"Author": "\u0646\u0648\u0648\u0633\u06d5\u0631",
-"Encoding": "\u0628\u06d5\u06a9\u06c6\u062f\u06a9\u0631\u062f\u0646",
-"Fullscreen": "\u0695\u0648\u0648\u067e\u0695\u06cc",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "\u0647\u06ce\u06b5\u06cc \u0626\u0627\u0633\u06c6\u06cc\u06cc",
-"Insert\/edit image": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\/\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc \u0648\u06ce\u0646\u06d5",
-"Image description": "\u0628\u0627\u0633\u06a9\u0631\u062f\u0646\u06cc \u0648\u06ce\u0646\u06d5",
-"Source": "\u0633\u06d5\u0631\u0686\u0627\u0648\u06d5",
-"Dimensions": "\u062f\u0648\u0648\u0631\u06cc\u06cc\u06d5\u06a9\u0627\u0646",
-"Constrain proportions": "\u0695\u06d5\u0647\u06d5\u0646\u062f\u06cc \u0645\u06d5\u0631\u062c\u06d5\u06a9\u0627\u0646",
-"General": "\u06af\u0634\u062a\u06cc",
-"Advanced": "\u067e\u06ce\u0634\u06a9\u06d5\u0648\u062a\u0648\u0648",
-"Style": "\u0634\u06ce\u0648\u0627\u0632",
-"Vertical space": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u0633\u062a\u0648\u0648\u0646\u06cc",
-"Horizontal space": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u0626\u0627\u0633\u06c6\u06cc\u06cc",
-"Border": "\u0633\u0646\u0648\u0648\u0631",
-"Insert image": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0648\u06ce\u0646\u06d5",
-"Image": "\u0648\u06ce\u0646\u06d5",
-"Image list": "\u0644\u06cc\u0633\u062a\u06cc \u0648\u06ce\u0646\u06d5",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Color levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0695\u06c6\u0698\/\u06a9\u0627\u062a",
-"Date\/time": "Date\/time",
-"Insert link": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Insert\/edit link": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\/\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Text to display": "\u062f\u06d5\u0642 \u0628\u06c6 \u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646",
-"Url": "\u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Target": "\u0626\u0627\u0645\u0627\u0646\u062c",
-"None": "\u0647\u06cc\u0686",
-"New window": "\u067e\u06d5\u0646\u062c\u06d5\u0631\u06d5\u06cc \u0646\u0648\u06ce",
-"Remove link": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u0628\u06d5\u0633\u062a\u06d5\u0631",
-"Anchors": "\u0644\u06d5\u0646\u06af\u06d5\u0631\u06d5\u06a9\u0627\u0646",
-"Link": "Link",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0626\u06d5\u0648 \u0628\u06d5\u0633\u062a\u06d5\u0631\u06d5\u06cc \u0646\u0648\u0648\u0633\u06cc\u0648\u062a\u06d5 \u0628\u06d5 \u067e\u06d5\u06cc\u0627\u0645\u06cc \u0626\u06d5\u0644\u06cc\u06a9\u062a\u0695\u06c6\u0646\u06cc \u062f\u06d5\u0686\u06ce\u062a. \u0626\u0627\u06cc\u0627 \u062f\u06d5\u062a\u06d5\u0648\u06ce\u062a mailto: prefix \u06cc \u0628\u06c6 \u0632\u06cc\u0627\u062f \u0628\u06a9\u06d5\u06cc\u062a\u061f",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0626\u06d5\u0648 \u0628\u06d5\u0633\u062a\u06d5\u0631\u06d5\u06cc \u0646\u0648\u0648\u0633\u06cc\u0648\u062a\u06d5 \u0628\u06d5 \u0628\u06d5\u0633\u062a\u06d5\u0631\u06cc \u062f\u06d5\u0631\u06d5\u06a9\u06cc \u062f\u06d5\u0686\u06ce\u062a. \u0626\u0627\u06cc\u0627 \u062f\u06d5\u062a\u06d5\u0648\u06ce\u062a http:\/\/ prefix \u06cc \u0628\u06c6 \u0632\u06cc\u0627\u062f \u0628\u06a9\u06d5\u06cc\u062a\u061f",
-"Link list": "Link list",
-"Insert video": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u06a4\u06cc\u062f\u06cc\u06c6",
-"Insert\/edit video": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\/\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc \u06a4\u06cc\u062f\u06cc\u06c6",
-"Insert\/edit media": "\u0647\u06ce\u0627\u0646\u06d5\u0646\u0627\u0648\/\u062f\u06d5\u0633\u06a9\u0627\u0631\u06cc \u0645\u06cc\u062f\u06cc\u0627",
-"Alternative source": "\u0633\u06d5\u0631\u0686\u0627\u0648\u06d5\u06cc \u062c\u06ce\u06af\u0631\u06d5\u0648\u06d5",
-"Poster": "\u067e\u06c6\u0633\u062a\u06d5\u0631",
-"Paste your embed code below:": "\u06a9\u06c6\u062f\u06cc \u062a\u06ce\u062e\u0633\u062a\u0646\u06d5\u06a9\u06d5\u062a \u0644\u06d5\u062e\u0648\u0627\u0631\u06d5\u0648\u06d5 \u0628\u0644\u06a9\u06ce\u0646\u06d5:",
-"Embed": "\u062a\u06ce\u062e\u0633\u062a\u0646",
-"Media": "\u0645\u06cc\u062f\u06cc\u0627",
-"Nonbreaking space": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u0646\u06d5\u0628\u0695\u0627\u0648",
-"Page break": "\u0628\u0695\u06cc\u0646\u06cc \u067e\u06d5\u0695\u06d5",
-"Paste as text": "\u0644\u06a9\u0627\u0646\u062f\u0646 \u0648\u06d5\u06a9 \u062f\u06d5\u0642",
-"Preview": "\u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646",
-"Print": "\u0686\u0627\u067e\u06a9\u0631\u062f\u0646",
-"Save": "\u067e\u0627\u0634\u06d5\u06a9\u06d5\u0648\u062a",
-"Find": "\u062f\u06c6\u0632\u06cc\u0646\u06d5\u0648\u06d5",
-"Replace with": "\u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646 \u0644\u06d5\u06af\u06d5\u06b5",
-"Replace": "\u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646",
-"Replace all": "\u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646\u06cc \u0647\u06d5\u0645\u0648\u0648",
-"Prev": "\u067e\u06ce\u0634\u0648\u0648",
-"Next": "\u062f\u0648\u0627\u062a\u0631",
-"Find and replace": "\u062f\u06c6\u0632\u06cc\u0646\u06d5\u0648\u06d5 \u0648 \u062c\u06ce\u06af\u06c6\u0695\u06cc\u0646",
-"Could not find the specified string.": "\u0695\u06cc\u0632\u0628\u06d5\u0646\u062f\u06cc \u062f\u06cc\u0627\u0631\u06cc\u06a9\u0631\u0627\u0648 \u0646\u0627\u062f\u06c6\u0632\u0631\u06ce\u062a\u06d5\u0648\u06d5.",
-"Match case": "\u0647\u0627\u0648\u062a\u0627\u0628\u0648\u0648\u0646\u06cc \u0628\u0627\u0631",
-"Whole words": "\u0647\u06d5\u0645\u0648\u0648 \u0648\u0634\u06d5\u06a9\u0627\u0646",
-"Spellcheck": "\u067e\u0634\u06a9\u0646\u06cc\u0646\u06cc \u0695\u06ce\u0646\u0648\u0648\u0633",
-"Ignore": "\u0644\u06d5\u0628\u06cc\u0631\u06a9\u0631\u062f\u0646",
-"Ignore all": "\u0644\u06d5\u0628\u06cc\u0631\u06a9\u0631\u062f\u0646\u06cc \u0647\u06d5\u0645\u0648\u0648",
-"Finish": "\u062a\u06d5\u0648\u0627\u0648",
-"Add to Dictionary": "\u0632\u06cc\u0627\u062f\u06a9\u0631\u062f\u0646 \u0628\u06c6 \u0641\u06d5\u0631\u0647\u06d5\u0646\u06af",
-"Insert table": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u062e\u0634\u062a\u06d5",
-"Table properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u062e\u0634\u062a\u06d5",
-"Delete table": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u062e\u0634\u062a\u06d5",
-"Cell": "\u062e\u0627\u0646\u06d5",
-"Row": "\u0695\u06cc\u0632",
-"Column": "\u0633\u062a\u0648\u0648\u0646",
-"Cell properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u062e\u0627\u0646\u06d5",
-"Merge cells": "\u06cc\u06d5\u06a9\u062e\u0633\u062a\u0646\u06cc \u062e\u0627\u0646\u06d5\u06a9\u0627\u0646",
-"Split cell": "\u062c\u06cc\u0627\u06a9\u0631\u062f\u0646\u06d5\u0648\u06d5\u06cc \u062e\u0627\u0646\u06d5",
-"Insert row before": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0695\u06cc\u0632 \u0628\u06c6 \u067e\u06ce\u0634\u062a\u0631",
-"Insert row after": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0695\u06cc\u0632 \u0628\u06c6 \u062f\u0648\u0627\u062a\u0631",
-"Delete row": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u0695\u06cc\u0632",
-"Row properties": "\u062a\u0627\u06cc\u0628\u0647\u200c\u062a\u0645\u0647\u200c\u0646\u062f\u06cc\u06cc\u06d5\u06a9\u0627\u0646\u06cc \u0695\u06cc\u0632",
-"Cut row": "\u0628\u0695\u06cc\u0646\u06cc \u0695\u06cc\u0632",
-"Copy row": "\u0644\u06d5\u0628\u06d5\u0631\u06af\u0631\u062a\u0646\u06d5\u0648\u06d5\u06cc \u0695\u06cc\u0632",
-"Paste row before": "\u0644\u06a9\u0627\u0646\u062f\u0646\u06cc \u0695\u06cc\u0632 \u0644\u06d5 \u067e\u06ce\u0634\u062a\u0631",
-"Paste row after": "\u0644\u06a9\u0627\u0646\u062f\u0646\u06cc \u0695\u06cc\u0632 \u0644\u06d5 \u062f\u0648\u0627\u062a\u0631",
-"Insert column before": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0633\u062a\u0648\u0648\u0646 \u0628\u06c6 \u067e\u06ce\u0634\u062a\u0631",
-"Insert column after": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u0633\u062a\u0648\u0648\u0646 \u0628\u06c6 \u062f\u0648\u0627\u062a\u0631",
-"Delete column": "\u0633\u0695\u06cc\u0646\u06d5\u0648\u06d5\u06cc \u0633\u062a\u0648\u0648\u0646",
-"Cols": "\u0633\u062a\u0648\u0648\u0646\u06d5\u06a9\u0627\u0646",
-"Rows": "\u0695\u06cc\u0632\u06d5\u06a9\u0627\u0646",
-"Width": "\u062f\u0631\u06ce\u0698\u06cc",
-"Height": "\u0628\u06d5\u0631\u0632\u06cc",
-"Cell spacing": "\u0628\u06c6\u0634\u0627\u06cc\u06cc \u062e\u0627\u0646\u06d5",
-"Cell padding": "\u0646\u0627\u0648\u067e\u06c6\u0634\u06cc \u062e\u0627\u0646\u06d5",
-"Caption": "\u0633\u06d5\u0631\u062f\u06ce\u0695",
-"Left": "\u0686\u06d5\u067e",
-"Center": "\u0646\u0627\u0648\u06d5\u0695\u0627\u0633\u062a",
-"Right": "\u0695\u0627\u0633\u062a",
-"Cell type": "\u062c\u06c6\u0631\u06cc \u062e\u0627\u0646\u06d5",
-"Scope": "\u0628\u0648\u0627\u0631",
-"Alignment": "\u0644\u0627\u06af\u0631\u062a\u0646",
-"H Align": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0626\u0627\u0633\u06c6\u06cc\u06cc",
-"V Align": "\u0644\u0627\u06af\u0631\u062a\u0646\u06cc \u0633\u062a\u0648\u0648\u0646\u06cc",
-"Top": "\u0633\u06d5\u0631\u06d5\u0648\u06d5",
-"Middle": "\u0646\u0627\u0648\u06d5\u0646\u062f",
-"Bottom": "\u0698\u06ce\u0631\u06d5\u0648\u06d5",
-"Header cell": "\u062e\u0627\u0646\u06d5\u06cc \u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5",
-"Row group": "\u06a9\u06c6\u0645\u06d5\u06b5\u06d5 \u0695\u06cc\u0632",
-"Column group": "\u06a9\u06c6\u0645\u06d5\u06b5\u06d5 \u0633\u062a\u0648\u0648\u0646",
-"Row type": "\u062c\u06c6\u0631\u06cc \u0695\u06cc\u0632",
-"Header": "\u0633\u06d5\u0631\u067e\u06d5\u0695\u06d5",
-"Body": "\u0646\u0627\u0648\u06d5\u0695\u06c6\u06a9",
-"Footer": "\u067e\u06ce\u067e\u06d5\u0695\u06d5",
-"Border color": "\u0695\u06d5\u0646\u06af\u06cc \u0633\u0646\u0648\u0648\u0631",
-"Insert template": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648\u06cc \u062f\u0627\u0695\u06ce\u0698\u06d5",
-"Templates": "\u062f\u0627\u0695\u06ce\u0698\u06d5\u06a9\u0627\u0646",
-"Template": "Template",
-"Text color": "\u0695\u06d5\u0646\u06af\u06cc \u062f\u06d5\u0642",
-"Background color": "\u0695\u06d5\u0646\u06af\u06cc \u067e\u0627\u0634\u0628\u0646\u06d5\u0645\u0627",
-"Custom...": "\u062f\u0627\u0646\u0631\u0627\u0648...",
-"Custom color": "\u0695\u06d5\u0646\u06af\u06cc \u062f\u0627\u0646\u0631\u0627\u0648",
-"No color": "\u0628\u06d5\u0628\u06ce \u0695\u06d5\u0646\u06af",
-"Table of Contents": "Table of Contents",
-"Show blocks": "\u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646\u06cc \u0628\u0644\u06c6\u06a9\u06d5\u06a9\u0627\u0646",
-"Show invisible characters": "\u067e\u06cc\u0634\u0627\u0646\u062f\u0627\u0646\u06cc \u0646\u0648\u0648\u0633\u06d5 \u0634\u0627\u0631\u0627\u0648\u06d5\u06a9\u0627\u0646",
-"Words: {0}": "\u0648\u0634\u06d5\u06a9\u0627\u0646: {0}",
-"{0} words": "{0} words",
-"File": "\u067e\u06d5\u0695\u06af\u06d5",
-"Edit": "\u062f\u06d5\u0633\u062a\u06a9\u0627\u0631\u06cc",
-"Insert": "\u062e\u0633\u062a\u0646\u06d5\u0646\u0627\u0648",
-"View": "\u0628\u06cc\u0646\u06cc\u0646",
-"Format": "\u0634\u06ce\u0648\u0627\u0632",
-"Table": "\u062e\u0634\u062a\u06d5",
-"Tools": "\u0626\u0627\u0645\u0631\u0627\u0632\u06d5\u06a9\u0627\u0646",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0646\u0627\u0648\u0686\u06d5\u06cc \u062f\u06d5\u0642\u06cc \u062a\u06d5\u0648\u0627\u0648. ALT-F9 \u062f\u0627\u06af\u0631\u06d5 \u0628\u06c6 \u0644\u06cc\u0633\u062a\u06d5. ALT-F10 \u062f\u0627\u06af\u0631\u06d5 \u0628\u06c6 \u062a\u0648\u0648\u06b5\u0627\u0645\u0631\u0627\u0632. ALT-0 \u062f\u0627\u06af\u0631\u06d5 \u0628\u06c6 \u06cc\u0627\u0631\u0645\u06d5\u062a\u06cc"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/lb.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('lb',{
-"Cut": "Ausschneiden",
-"Heading 5": "Iwwerschr\u00ebft 5",
-"Header 2": "Titel 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "D\u00e4i Web-Browser \u00ebnnerst\u00ebtzt keen direkten Acc\u00e8s op d'Zw\u00ebschenaplag. Benotz w.e.gl. CTRL+C fir den ausgewielten Text ze kop\u00e9ieren an CTRL+V fir en anzepechen.",
-"Heading 4": "Iwwerschr\u00ebft 4",
-"Div": "DIV",
-"Heading 2": "Iwwerschr\u00ebft 2",
-"Paste": "Apechen",
-"Close": "Zoumaachen",
-"Font Family": "Schr\u00ebft-Famill",
-"Pre": "PRE",
-"Align right": "Riets align\u00e9iert",
-"New document": "Neit Dokument",
-"Blockquote": "Zitat",
-"Numbered list": "Nummer\u00e9iert L\u00ebscht",
-"Heading 1": "Iwwerschr\u00ebft 1",
-"Headings": "Iwwerschr\u00ebften",
-"Increase indent": "Ident\u00e9ierung vergr\u00e9isseren",
-"Formats": "Formater",
-"Headers": "Titelen",
-"Select all": "Alles auswielen",
-"Header 3": "Titel 3",
-"Blocks": "Bl\u00e9ck",
-"Undo": "R\u00e9ckg\u00e4ngeg maachen",
-"Strikethrough": "Duerchgestrach",
-"Bullet list": "Opzielung",
-"Header 1": "Titel 1",
-"Superscript": "H\u00e9ichgestallt",
-"Clear formatting": "Format\u00e9ierung l\u00e4schen",
-"Font Sizes": "Schr\u00ebft-Gr\u00e9issten",
-"Subscript": "Erofgestallt",
-"Header 6": "Titel 6",
-"Redo": "Widderhuelen",
-"Paragraph": "Paragraph",
-"Ok": "Okee",
-"Bold": "Fett",
-"Code": "CODE",
-"Italic": "Kursiv",
-"Align center": "Zentr\u00e9iert",
-"Header 5": "Titel 5",
-"Heading 6": "Iwwerschr\u00ebft 6",
-"Heading 3": "Iwwerschr\u00ebft 3",
-"Decrease indent": "Ident\u00e9ierung verklengeren",
-"Header 4": "Titel 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\"Apechen\" ass elo am Textmodus. Inhalter ginn elo ouni Format\u00e9ierungen agepecht bis du d\u00ebs Optioun ausm\u00e9chs.",
-"Underline": "\u00cbnnerstrach",
-"Cancel": "Ofbriechen",
-"Justify": "Blocksaz",
-"Inline": "Inline",
-"Copy": "Kop\u00e9ieren",
-"Align left": "L\u00e9nks align\u00e9iert",
-"Visual aids": "Visuell H\u00ebllefen",
-"Lower Greek": "Klengt griichescht Alphabet",
-"Square": "Quadrat",
-"Default": "Standard",
-"Lower Alpha": "Klengt Alphabet",
-"Circle": "Krees",
-"Disc": "Scheif",
-"Upper Alpha": "Grousst Alphabet",
-"Upper Roman": "Grousst r\u00e9imescht Alphabet",
-"Lower Roman": "Klengt r\u00e9imescht Alphabet",
-"Name": "Numm",
-"Anchor": "Anker",
-"You have unsaved changes are you sure you want to navigate away?": "Du hues ongesp\u00e4ichert \u00c4nnerungen. W\u00eblls du s\u00e9cher ewechnavig\u00e9ieren?",
-"Restore last draft": "Leschten Entworf er\u00ebm zr\u00e9cksetzen",
-"Special character": "Speziell Zeechen",
-"Source code": "Quelltext",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Faarf",
-"Right to left": "Vu riets no l\u00e9nks",
-"Left to right": "Vu l\u00e9nks no riets",
-"Emoticons": "Smileyen",
-"Robots": "Robotter",
-"Document properties": "Eegeschafte vum Dokument",
-"Title": "Titel",
-"Keywords": "Schl\u00ebsselwierder",
-"Encoding": "Cod\u00e9ierung",
-"Description": "Beschreiwung",
-"Author": "Auteur",
-"Fullscreen": "Vollbildschierm",
-"Horizontal line": "Horizontal Linn",
-"Horizontal space": "Horizontalen Espace",
-"Insert\/edit image": "Bild af\u00fcgen\/\u00e4nneren",
-"General": "Allgemeng",
-"Advanced": "Erweidert",
-"Source": "Quell",
-"Border": "Rand",
-"Constrain proportions": "Proportioune b\u00e4ibehalen",
-"Vertical space": "Vertikalen Espace",
-"Image description": "Bildbeschreiwung",
-"Style": "Stil",
-"Dimensions": "Dimensiounen",
-"Insert image": "Bild af\u00fcgen",
-"Zoom in": "Zoom in",
-"Contrast": "Contrast",
-"Back": "Back",
-"Gamma": "Gamma",
-"Flip horizontally": "Flip horizontally",
-"Resize": "Resize",
-"Sharpen": "Sharpen",
-"Zoom out": "Zoom out",
-"Image options": "Image options",
-"Apply": "Apply",
-"Brightness": "Brightness",
-"Rotate clockwise": "Rotate clockwise",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Edit image": "Edit image",
-"Color levels": "Color levels",
-"Crop": "Crop",
-"Orientation": "Orientation",
-"Flip vertically": "Flip vertically",
-"Invert": "Invert",
-"Insert date\/time": "Datum\/Z\u00e4it drasetzen",
-"Remove link": "Link l\u00e4schen",
-"Url": "URL",
-"Text to display": "Text deen unzeweisen ass",
-"Anchors": "Ankeren",
-"Insert link": "Link drasetzen",
-"New window": "Nei F\u00ebnster",
-"None": "Keen",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "D'URL d\u00e9i s du aginn hues sch\u00e9ngt en externe Link ze sinn. W\u00eblls du den \"http:\/\/\"-Pr\u00e4fix dob\u00e4isetzen?",
-"Target": "Zil",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "D'URL d\u00e9i s du aginn hues sch\u00e9ngt eng Email-Adress ze sinn. W\u00eblls du de \"mailto:\"-Pr\u00e4fix dob\u00e4isetzen?",
-"Insert\/edit link": "Link drasetzen\/\u00e4nneren",
-"Insert\/edit video": "Video drasetzen\/\u00e4nneren",
-"Poster": "Pouster",
-"Alternative source": "Alternativ Quell",
-"Paste your embed code below:": "Abannungscode hei apechen:",
-"Insert video": "Video drasetzen",
-"Embed": "Abannen",
-"Nonbreaking space": "Net\u00ebmbriechenden Espace",
-"Page break": "S\u00e4iten\u00ebmbroch",
-"Paste as text": "Als Text apechen",
-"Preview": "Kucken",
-"Print": "Dr\u00e9cken",
-"Save": "Sp\u00e4icheren",
-"Could not find the specified string.": "Den Text konnt net fonnt ginn.",
-"Replace": "Ersetzen",
-"Next": "Weider",
-"Whole words": "Ganz Wierder",
-"Find and replace": "Fannen an ersetzen",
-"Replace with": "Ersetze mat",
-"Find": "Fannen",
-"Replace all": "All ersetzen",
-"Match case": "Grouss-\/Klengschreiwung respekt\u00e9ieren",
-"Prev": "Zr\u00e9ck",
-"Spellcheck": "Verbesseren",
-"Finish": "Ofschl\u00e9issen",
-"Ignore all": "All ignor\u00e9ieren",
-"Ignore": "Ignor\u00e9ieren",
-"Add to Dictionary": "An den Dictionnaire androen",
-"Insert row before": "Rei virdrun drasetzen",
-"Rows": "Reien",
-"Height": "H\u00e9icht",
-"Paste row after": "Rei herno apechen",
-"Alignment": "Align\u00e9ierung",
-"Border color": "Rumm-Faarf",
-"Column group": "Kolonnegrupp",
-"Row": "Rei",
-"Insert column before": "Kolonn virdrun drasetzen",
-"Split cell": "Zell opspl\u00e9cken",
-"Cell padding": "Zellenopf\u00ebllung",
-"Cell spacing": "Zellenofstand",
-"Row type": "Reientyp",
-"Insert table": "Tabell drasetzen",
-"Body": "Kierper",
-"Caption": "Beschr\u00ebftung",
-"Footer": "Fouss",
-"Delete row": "Rei l\u00e4schen",
-"Paste row before": "Rei virdrun apechen",
-"Scope": "Ber\u00e4ich",
-"Delete table": "Tabell l\u00e4schen",
-"H Align": "H-Align\u00e9ierung",
-"Top": "Uewen",
-"Header cell": "Kappzell",
-"Column": "Kolonn",
-"Row group": "Reiegrupp",
-"Cell": "Zell",
-"Middle": "M\u00ebtt",
-"Cell type": "Zellentyp",
-"Copy row": "Rei kop\u00e9ieren",
-"Row properties": "Eegeschafte vu Reien",
-"Table properties": "Eegeschafte vun Tabellen",
-"Bottom": "\u00cbnnen",
-"V Align": "V-Align\u00e9ierung",
-"Header": "Kapp",
-"Right": "Riets",
-"Insert column after": "Kolonn herno drasetzen",
-"Cols": "Kolonnen",
-"Insert row after": "Rei herno drasetzen",
-"Width": "Breet",
-"Cell properties": "Eegeschafte vun Zellen",
-"Left": "L\u00e9nks",
-"Cut row": "Rei ausschneiden",
-"Delete column": "Kolonn l\u00e4schen",
-"Center": "M\u00ebtt",
-"Merge cells": "Zelle fusion\u00e9ieren",
-"Insert template": "Virlag drasetzen",
-"Templates": "Virlagen",
-"Background color": "Hanndergrondfaarf",
-"Custom...": "Eegen...",
-"Custom color": "Eege Faarf",
-"No color": "Keng Faarf",
-"Text color": "Textfaarf",
-"Show blocks": "Bl\u00e9ck weisen",
-"Show invisible characters": "Onsiichtbar Zeeche weisen",
-"Words: {0}": "Wierder: {0}",
-"Insert": "Drasetzen",
-"File": "Fichier",
-"Edit": "\u00c4nneren",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ber\u00e4ich fir format\u00e9ierten Text. Dr\u00e9ck ALT+F9 fir de Men\u00fc. Dr\u00e9ck ALT+F10 fir d'Geschirleescht. Dr\u00e9ck ALT+0 fir d'H\u00ebllef.",
-"Tools": "Geschir",
-"View": "Kucken",
-"Table": "Tabell",
-"Format": "Format"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/lt.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('lt',{
-"Redo": "Gr\u0105\u017einti",
-"Undo": "Atstatyti",
-"Cut": "I\u0161kirpti",
-"Copy": "Kopijuoti",
-"Paste": "\u012ed\u0117ti",
-"Select all": "Pa\u017eym\u0117ti visk\u0105",
-"New document": "Naujas dokumentas",
-"Ok": "Gerai",
-"Cancel": "Atsisakyti",
-"Visual aids": "Vaizdin\u0117s priemon\u0117s",
-"Bold": "Pary\u0161kintas",
-"Italic": "Kursyvinis",
-"Underline": "Pabrauktas",
-"Strikethrough": "Perbrauktas",
-"Superscript": "Vir\u0161utinis indeksas",
-"Subscript": "Apatinis indeksas",
-"Clear formatting": "Naikinti formatavim\u0105",
-"Align left": "Lygiuoti kair\u0117je",
-"Align center": "Centruoti",
-"Align right": "Lygiuoti de\u0161in\u0117je",
-"Justify": "I\u0161d\u0117styti per vis\u0105 plot\u012f",
-"Bullet list": "\u017denklinimo s\u0105ra\u0161as",
-"Numbered list": "Skaitmeninis s\u0105ra\u0161as",
-"Decrease indent": "Ma\u017einti \u012ftrauk\u0105",
-"Increase indent": "Didinti \u012ftrauk\u0105",
-"Close": "U\u017edaryti",
-"Formats": "Formatai",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nar\u0161ykl\u0117s nustatymai neleid\u017eia redaktoriui tiesiogiai pasiekti laikinosios atminties. Pra\u0161ome naudoti klaviat\u016bros klavi\u0161us Ctrl+X\/C\/V.",
-"Headers": "Antra\u0161t\u0117s",
-"Header 1": "Antra\u0161t\u0117 1",
-"Header 2": "Antra\u0161t\u0117 2",
-"Header 3": "Antra\u0161t\u0117 3",
-"Header 4": "Antra\u0161t\u0117 4",
-"Header 5": "Antra\u0161t\u0117 5",
-"Header 6": "Antra\u0161t\u0117 6",
-"Headings": "Antra\u0161t\u0117s",
-"Heading 1": "Antra\u0161t\u0117 1",
-"Heading 2": "Antra\u0161t\u0117 2",
-"Heading 3": "Antra\u0161t\u0117 3",
-"Heading 4": "Antra\u0161t\u0117 4",
-"Heading 5": "Antra\u0161t\u0117 5",
-"Heading 6": "Antra\u0161t\u0117 6",
-"Preformatted": "Suformuotas i\u0161 anksto",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kodas",
-"Paragraph": "Paragrafas",
-"Blockquote": "Citata",
-"Inline": "Inline",
-"Blocks": "Blokai",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Dabar \u012fterpiama paprastojo teksto re\u017eimu. Kol \u0161i parinktis \u012fjungta, turinys bus \u012fterptas kaip paprastas tekstas.",
-"Fonts": "\u0160riftai",
-"Font Sizes": "\u0160rifto dyd\u017eiai",
-"Class": "Klas\u0117",
-"Browse for an image": "Ie\u0161koti paveiksl\u0117lio",
-"OR": "ARBA",
-"Drop an image here": "Tempkite paveiksl\u0117l\u012f \u010dia",
-"Upload": "\u012ekelti",
-"Block": "Blokas",
-"Align": "Lygiavimas",
-"Default": "Pagrindinis",
-"Circle": "Apskritimas",
-"Disc": "Diskas",
-"Square": "Kvadratas",
-"Lower Alpha": "Ma\u017eosios raid\u0117s",
-"Lower Greek": "Ma\u017eosios graik\u0173",
-"Lower Roman": "Ma\u017eosios rom\u0117n\u0173",
-"Upper Alpha": "Did\u017eiosios raid\u0117s",
-"Upper Roman": "Did\u017eiosios rom\u0117n\u0173",
-"Anchor...": "Nuoroda...",
-"Name": "Pavadinimas",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID turi prasid\u0117ti raide, po kurios gali b\u016bti raid\u0117s, skai\u010diai, br\u016bk\u0161niai, ta\u0161kai, kabliata\u0161kiai ar apatiniai pabraukimai.",
-"You have unsaved changes are you sure you want to navigate away?": "Turite nei\u0161saugot\u0173 pakeitim\u0173! Ar tikrai norite i\u0161eiti?",
-"Restore last draft": "Atstatyti paskutin\u012f projekt\u0105",
-"Special character...": "Specialieji simboliai...",
-"Source code": "Pirminis \u0161altinis",
-"Insert\/Edit code sample": "Prid\u0117ti \/ keisti kodo pavyzd\u012f",
-"Language": "Kalba",
-"Code sample...": "Kodo pavyzdys...",
-"Color Picker": "Spalvos parinkimas",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "I\u0161 kair\u0117s \u012f de\u0161in\u0119",
-"Right to left": "I\u0161 de\u0161in\u0117s \u012f kair\u0119",
-"Emoticons...": "Jaustukai...",
-"Metadata and Document Properties": "Meta duomenys ir dokumento ypatyb\u0117s",
-"Title": "Pavadinimas",
-"Keywords": "\u017dymos",
-"Description": "Apra\u0161as",
-"Robots": "Robotai",
-"Author": "Autorius",
-"Encoding": "Kodavimas",
-"Fullscreen": "Visas ekranas",
-"Action": "Veiksmas",
-"Shortcut": "Nuoroda",
-"Help": "Pagalba",
-"Address": "Adresas",
-"Focus to menubar": "Fokusuoti \u012f meniu",
-"Focus to toolbar": "Fokusuoti \u012f \u012franki\u0173 juost\u0105",
-"Focus to element path": "Fokusuoti \u012f elemento keli\u0105",
-"Focus to contextual toolbar": "Fokusuoti \u012f kontekstin\u012f \u012franki\u0173 juost\u0105",
-"Insert link (if link plugin activated)": "Prid\u0117ti nuorod\u0105 (jei link priedas aktyvuotas)",
-"Save (if save plugin activated)": "I\u0161saugoti (jei save priedas aktyvuotas)",
-"Find (if searchreplace plugin activated)": "Ie\u0161koti (jei searchreplace priedas aktyvuotas)",
-"Plugins installed ({0}):": "\u012ediegti priedai ({0}):",
-"Premium plugins:": "Mokami priedai:",
-"Learn more...": "Su\u017einoti daugiau...",
-"You are using {0}": "Naudojate {0}",
-"Plugins": "Priedai",
-"Handy Shortcuts": "Patogios nuorodos",
-"Horizontal line": "Horizontali linija",
-"Insert\/edit image": "\u012eterpti|Tvarkyti paveiksl\u0117l\u012f",
-"Image description": "Paveiksl\u0117lio apra\u0161as",
-"Source": "Pirmin\u0117 nuoroda",
-"Dimensions": "Matmenys",
-"Constrain proportions": "Laikytis proporcij\u0173",
-"General": "Bendra",
-"Advanced": "I\u0161pl\u0117stas",
-"Style": "Stilius",
-"Vertical space": "Vertikalus tarpas",
-"Horizontal space": "Horizontalus tarpas",
-"Border": "R\u0117melis",
-"Insert image": "\u012eterpti paveiksl\u0117l\u012f",
-"Image...": "Paveiksl\u0117lis...",
-"Image list": "Paveiksl\u0117li\u0173 s\u0105ra\u0161as",
-"Rotate counterclockwise": "Pasukti prie\u0161 laikrod\u017eio rodykl\u0119",
-"Rotate clockwise": "Pasukti pagal laikrod\u017eio rodykl\u0119",
-"Flip vertically": "Apversti vertikaliai",
-"Flip horizontally": "Apversti horizontaliai",
-"Edit image": "Redaguoti paveiksl\u0117l\u012f",
-"Image options": "Paveiksl\u0117lio nustatymai",
-"Zoom in": "Priartinti",
-"Zoom out": "Atitolinti",
-"Crop": "Atkarpyti",
-"Resize": "Keisti dyd\u012f",
-"Orientation": "Pasukimas",
-"Brightness": "\u0160viesumas",
-"Sharpen": "Ry\u0161kumas",
-"Contrast": "Kontrastas",
-"Color levels": "Spalv\u0173 lygiai",
-"Gamma": "Gama",
-"Invert": "Prie\u0161ingos spalvos",
-"Apply": "Taikyti",
-"Back": "Atgal",
-"Insert date\/time": "\u012eterpti dat\u0105\/laik\u0105",
-"Date\/time": "Data \/ laikas",
-"Insert\/Edit Link": "Prid\u0117ti\/Keisti nuorod\u0105",
-"Insert\/edit link": "\u012eterpti\/taisyti nuorod\u0105",
-"Text to display": "Rodomas tekstas",
-"Url": "Nuoroda",
-"Open link in...": "Nuorod\u0105 atverti...",
-"Current window": "Dabartiniame lange",
-"None": "Nieko",
-"New window": "Naujas langas",
-"Remove link": "\u0160alinti nuorod\u0105",
-"Anchors": "\u017dym\u0117",
-"Link...": "Nuoroda...",
-"Paste or type a link": "\u012eklijuokite arba \u012fra\u0161ykite nuorod\u0105",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Atrodo, kad \u012fvesta nuoroda yra elektroninio pa\u0161to adresas. Ar norite prie\u0161 j\u012f \u012fvesti reikalaujam\u0105 \u201emailto:\u201c?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Atrodo, kad \u012fved\u0117te nuotolin\u0119 nuorod\u0105. Ar norite prie\u0161 j\u0105 \u012fvesti reikalaujam\u0105 \u201ehttp:\/\/\u201c?",
-"Link list": "Nuorod\u0173 s\u0105ra\u0161as",
-"Insert video": "\u012eterpti video",
-"Insert\/edit video": "\u012eterpti\/tvarkyti video",
-"Insert\/edit media": "Prid\u0117ti \/ keisti medij\u0105",
-"Alternative source": "Alternatyvus \u0161altinis",
-"Alternative source URL": "Alternatyvus \u0161altinio URL adresas",
-"Media poster (Image URL)": "medijos skelbiklis (paveiksl\u0117lio URL adresas)",
-"Paste your embed code below:": "\u012eterpkite kod\u0105 \u017eemiau:",
-"Embed": "\u012eterpti",
-"Media...": "Medija...",
-"Nonbreaking space": "Nepertraukiamos vietos",
-"Page break": "Puslapio skirtukas",
-"Paste as text": "\u012eklijuoti kaip tekst\u0105",
-"Preview": "Per\u017ei\u016bra",
-"Print...": "Spausdinti...",
-"Save": "I\u0161saugoti",
-"Find": "Ie\u0161koti",
-"Replace with": "Kuo pakeisti",
-"Replace": "Pakeisti",
-"Replace all": "Pakeisti visk\u0105",
-"Previous": "Ankstesnis",
-"Next": "Sekantis",
-"Find and replace...": "Ie\u0161koti ir pakeisti...",
-"Could not find the specified string.": "Nepavyko rasti nurodytos eilut\u0117s.",
-"Match case": "Atitinkamus",
-"Find whole words only": "Ie\u0161koti tik vis\u0105 \u017eod\u012f",
-"Spell check": "Klaid\u0173 tikrinimas",
-"Ignore": "Ignoruoti",
-"Ignore all": "Ignoruoti visk\u0105",
-"Finish": "Baigti",
-"Add to Dictionary": "Prid\u0117ti \u012f \u017dodyn\u0105",
-"Insert table": "\u012eterpti lentel\u0119",
-"Table properties": "Lentel\u0117s savyb\u0117s",
-"Delete table": "\u0160alinti lentel\u0119",
-"Cell": "Langeliai",
-"Row": "Eilut\u0117s",
-"Column": "Stulpelis",
-"Cell properties": "Langelio savyb\u0117s",
-"Merge cells": "Sujungti langelius",
-"Split cell": "Skaidyti langelius",
-"Insert row before": "\u012eterpti eilut\u0119 prie\u0161",
-"Insert row after": "\u012eterpti eilut\u0119 po",
-"Delete row": "Naikinti eilut\u0119",
-"Row properties": "Eilut\u0117s savyb\u0117s",
-"Cut row": "I\u0161kirpti eilut\u0119",
-"Copy row": "Kopijuoti eilut\u0119",
-"Paste row before": "\u012ed\u0117ti eilut\u0119 prie\u0161",
-"Paste row after": "\u012ed\u0117ti eilut\u0119 po",
-"Insert column before": "\u012eterpti stulpel\u012f prie\u0161",
-"Insert column after": "\u012eterpti stulpel\u012f po",
-"Delete column": "Naikinti stulpel\u012f",
-"Cols": "Stulpeliai",
-"Rows": "Eilut\u0117s",
-"Width": "Plotis",
-"Height": "Auk\u0161tis",
-"Cell spacing": "Tarpas tarp langeli\u0173",
-"Cell padding": "Tarpas nuo langelio iki teksto",
-"Show caption": "Rodyti antra\u0161t\u0119",
-"Left": "Kair\u0117",
-"Center": "Centras",
-"Right": "De\u0161in\u0117",
-"Cell type": "Langelio tipas",
-"Scope": "Strukt\u016bra",
-"Alignment": "Lygiavimas",
-"H Align": "H Lygiavimas",
-"V Align": "V Lygiavimas",
-"Top": "Vir\u0161uje",
-"Middle": "Viduryje",
-"Bottom": "Apa\u010dioje",
-"Header cell": "Antra\u0161t\u0117s langelis",
-"Row group": "Eilu\u010di\u0173 grup\u0117",
-"Column group": "Stulpeli\u0173 grup\u0117",
-"Row type": "Eilu\u010di\u0173 tipas",
-"Header": "Antra\u0161t\u0117",
-"Body": "Turinys",
-"Footer": "Apa\u010dia",
-"Border color": "R\u0117melio spalva",
-"Insert template...": "Prid\u0117ti \u0161ablon\u0105...",
-"Templates": "\u0160ablonai",
-"Template": "\u0160ablonas",
-"Text color": "Teksto spalva",
-"Background color": "Fono spalva",
-"Custom...": "Pasirinktinas...",
-"Custom color": "Pasirinktina spalva",
-"No color": "Jokios spalvos",
-"Remove color": "Pa\u0161alinti spalv\u0105",
-"Table of Contents": "Turinys",
-"Show blocks": "Rodyti blokus",
-"Show invisible characters": "Rodyti nematomus simbolius",
-"Word count": "\u017dod\u017ei\u0173 kiekis",
-"Count": "Skai\u010dius",
-"Document": "Dokumentas",
-"Selection": "Pasirinkimas",
-"Words": "\u017dod\u017ei\u0173",
-"Words: {0}": "\u017dod\u017eiai: {0}",
-"{0} words": "{0} \u017eod\u017eiai",
-"File": "Failas",
-"Edit": "Redaguoti",
-"Insert": "\u012eterpti",
-"View": "Per\u017ei\u016bra",
-"Format": "Formatas",
-"Table": "Lentel\u0117",
-"Tools": "\u012erankiai",
-"Powered by {0}": "Sukurta {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Suformatuoto teksto laukas. D\u0117l meniu spauskite ALT-F9. U\u017eduo\u010di\u0173 juostos \u012fjungimui spauskite ALT-F10. Pagalbai - spauskite ALT-0.",
-"Image title": "Paveiksl\u0117lio pavadinimas",
-"Border width": "Kra\u0161tin\u0117s plotis",
-"Border style": "Kra\u0161tin\u0117s stilius",
-"Error": "Klaida",
-"Warn": "\u012esp\u0117ti",
-"Valid": "Tinkamas",
-"To open the popup, press Shift+Enter": "Spustel\u0117j\u0119 Shift+Enter atversite i\u0161kylant\u012f lang\u0105",
-"Rich Text Area. Press ALT-0 for help.": "Rai\u0161kiojo teksto vieta. Spustel\u0117j\u0119 Alt-0 gausite pagalbos.",
-"System Font": "Sisteminiai \u0161riftai",
-"Failed to upload image: {0}": "Paveiksl\u0117lio \u012fkelti nepavyko: {0}",
-"Failed to load plugin: {0} from url {1}": "Priedo \u012fkelti nepavyko: {0} i\u0161 adreso {1}",
-"Failed to load plugin url: {0}": "Priedo adreso \u012fkelti nepavyko: {0}",
-"Failed to initialize plugin: {0}": "Priedo inicijuoti nepavyko: {0}",
-"example": "pavyzdys",
-"Search": "Ie\u0161koti",
-"All": "Visi",
-"Currency": "Valiuta",
-"Text": "Tekstas",
-"Quotations": "Citata",
-"Mathematical": "Matematinis",
-"Extended Latin": "Lotyn\u0173 i\u0161pl\u0117stin\u0117",
-"Symbols": "Simboliai",
-"Arrows": "Rodykl\u0117s",
-"User Defined": "Vartotojo apibr\u0117\u017eta",
-"dollar sign": "dolerio \u017eenklas",
-"currency sign": "valiutos \u017eenklas",
-"euro-currency sign": "euro \u017eenklas",
-"colon sign": "dvita\u0161kio \u017eenklas",
-"cruzeiro sign": "kruzeiro \u017eenklas",
-"french franc sign": "Pranc\u016bz\u0173 franko \u017eenklas",
-"lira sign": "lyros \u017eenklas",
-"mill sign": "milo simbolis",
-"naira sign": "nairos simbolis",
-"peseta sign": "peseto \u017eenklas",
-"rupee sign": "rupijos \u017eenklas",
-"won sign": "vono \u017eenklas",
-"new sheqel sign": "naujojo \u0161ekelio \u017eenklas",
-"dong sign": "dongo \u017eenklas",
-"kip sign": "kipo \u017eenklas",
-"tugrik sign": "tugriko \u017eenklas",
-"drachma sign": "drachmos \u017eenklas",
-"german penny symbol": "Vokietijos fenigo \u017eenklas",
-"peso sign": "peso \u017eenklas",
-"guarani sign": "gvaranio \u017eenklas",
-"austral sign": "australo \u017eenklas",
-"hryvnia sign": "grivinos \u017eenklas",
-"cedi sign": "sed\u017eio \u017eenklas",
-"livre tournois sign": "toro svaro \u017eenklas",
-"spesmilo sign": "spesmilo \u017eenklas",
-"tenge sign": "teng\u0117s \u017eenklas",
-"indian rupee sign": "Indijos rupijos \u017eenklas",
-"turkish lira sign": "Turkijos lyros \u017eenklas",
-"nordic mark sign": "\u0161iaur\u0117s \u0161ali\u0173 mark\u0117s \u017eenklas",
-"manat sign": "manato \u017eenklas",
-"ruble sign": "rublio \u017eenklas",
-"yen character": "jienos simbolis",
-"yuan character": "juanio simbolis",
-"yuan character, in hong kong and taiwan": "juanio \u017eenklas, naudojamas Hongkonge ir Taivane",
-"yen\/yuan character variant one": "jienos\/juanio vieningas \u017eenklas",
-"Loading emoticons...": "\u012ekeliami jaustukai...",
-"Could not load emoticons": "Nepavyko \u012fkelti jaustuk\u0173",
-"People": "\u017dmon\u0117s",
-"Animals and Nature": "Gyv\u016bnai ir gamta",
-"Food and Drink": "Maistas ir g\u0117rimai",
-"Activity": "Veikla",
-"Travel and Places": "Kelion\u0117s ir vietos",
-"Objects": "Objektai",
-"Flags": "V\u0117liavos",
-"Characters": "Simboli\u0173",
-"Characters (no spaces)": "Simboli\u0173 (be tarp\u0173)",
-"{0} characters": "{0} simboliai",
-"Error: Form submit field collision.": "Klaida: formos lauk\u0173 nesuderinamumas.",
-"Error: No form element found.": "Klaida: formos element\u0173 nerasta.",
-"Update": "Naujinti",
-"Color swatch": "Spalv\u0173 pavyzd\u017eiai",
-"Turquoise": "\u017dalsvai m\u0117lyna",
-"Green": "\u017dalia",
-"Blue": "M\u0117lyna",
-"Purple": "Ro\u017ein\u0117",
-"Navy Blue": "Tamsiai m\u0117lyna",
-"Dark Turquoise": "Tamsiai \u017ealsvai m\u0117lyna",
-"Dark Green": "Tamsiai \u017ealia",
-"Medium Blue": "Vidutini\u0161kai m\u0117lyna",
-"Medium Purple": "Vidutini\u0161kai violetin\u0117",
-"Midnight Blue": "Vidurnak\u010dio m\u0117lyna",
-"Yellow": "Geltona",
-"Orange": "Oran\u017ein\u0117",
-"Red": "Raudona",
-"Light Gray": "\u0160viesiai pilka",
-"Gray": "Pilka",
-"Dark Yellow": "Tamsiai geltona",
-"Dark Orange": "Tamsiai oran\u017ein\u0117",
-"Dark Red": "Tamsiai raudona",
-"Medium Gray": "Vidutini\u0161kai pilka",
-"Dark Gray": "Tamsiai pilka",
-"Light Green": "\u0160viesiai \u017ealia",
-"Light Yellow": "\u0160viesiai geltona",
-"Light Red": "\u0160viesiai raudona",
-"Light Purple": "\u0160viesiai violetin\u0117",
-"Light Blue": "\u0160viesiai m\u0117lyna",
-"Dark Purple": "Tamsiai violetin\u0117",
-"Dark Blue": "Tamsiai m\u0117lyna",
-"Black": "Juoda",
-"White": "Balta",
-"Switch to or from fullscreen mode": "Perjungti i\u0161\/\u012f viso ekrano rodym\u0105",
-"Open help dialog": "Atverti pagalbos lang\u0105",
-"history": "praeitis",
-"styles": "stiliai",
-"formatting": "formatavimas",
-"alignment": "lygiavimas",
-"indentation": "\u012ftrauka",
-"permanent pen": "nuolatinis ra\u0161iklis",
-"comments": "komentarai",
-"Format Painter": "Formato kopijavimo priemon\u0117",
-"Insert\/edit iframe": "Prid\u0117ti \/ keisti iframe",
-"Capitalization": "Did\u017eiosios raid\u0117s",
-"lowercase": "ma\u017eosios raid\u0117s",
-"UPPERCASE": "VISOS DID\u017dIOSIOS",
-"Title Case": "Pirmos Did\u017eiosios",
-"Permanent Pen Properties": "Nuolatinio ra\u0161iklio nustatymai",
-"Permanent pen properties...": "Nuolatinio ra\u0161iklio nustatymai...",
-"Font": "\u0160riftas",
-"Size": "Dydis",
-"More...": "Daugiau...",
-"Spellcheck Language": "Ra\u0161ybos tikrinimo kalba",
-"Select...": "Pasirinkti...",
-"Preferences": "Nustatymai",
-"Yes": "Taip",
-"No": "Ne",
-"Keyboard Navigation": "Valdymas klaviat\u016bra",
-"Version": "Versija",
-"Anchor": "\u017dym\u0117",
-"Special character": "Specialus simbolis",
-"Code sample": "Kodo pavyzdys",
-"Color": "Spalva",
-"Emoticons": "Jaustukai",
-"Document properties": "Dokumento savyb\u0117s",
-"Image": "Paveiksl\u0117lis",
-"Insert link": "\u012eterpti nuorod\u0105",
-"Target": "Tikslin\u0117 nuoroda",
-"Link": "Nuoroda",
-"Poster": "Plakatas",
-"Media": "Medija",
-"Print": "Spausdinti",
-"Prev": "Ankstesnis",
-"Find and replace": "Surasti ir pakeisti",
-"Whole words": "Visus \u017eod\u017eius",
-"Spellcheck": "Ra\u0161ybos tikrinimas",
-"Caption": "Antra\u0161t\u0117",
-"Insert template": "\u012eterpti \u0161ablon\u0105"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/lv.js Deleted

@@ -1,260 +0,0 @@
-tinymce.addI18n('lv',{
-"Redo": "Solis uz priek\u0161u",
-"Undo": "Solis atpaka\u013c",
-"Cut": "Izgriezt",
-"Copy": "Kop\u0113t",
-"Paste": "Iel\u012bm\u0113t",
-"Select all": "Iez\u012bm\u0113t visu",
-"New document": "Jauns dokuments",
-"Ok": "Ok",
-"Cancel": "Atcelt",
-"Visual aids": "Vizu\u0101l\u0101 pal\u012bdz\u012bba",
-"Bold": "Treknraksts",
-"Italic": "Sl\u012bpraksts",
-"Underline": "Pasv\u012btrot",
-"Strikethrough": "Nosv\u012btrot",
-"Superscript": "Aug\u0161raksts",
-"Subscript": "Apak\u0161raksts",
-"Clear formatting": "No\u0146emt format\u0113jumu",
-"Align left": "Pa kreisi",
-"Align center": "Centr\u0113t",
-"Align right": "Pa labi",
-"Justify": "Gar ab\u0101m mal\u0101m",
-"Bullet list": "Nenumur\u0113ts saraksts",
-"Numbered list": "Numur\u0113ts saraksts",
-"Decrease indent": "Samazin\u0101t atk\u0101pi",
-"Increase indent": "Palielin\u0101t atk\u0101pi",
-"Close": "Aizv\u0113rt",
-"Formats": "Format\u0113jumi",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "J\u016bsu p\u0101rl\u016bkprogramma neatbalsta piek\u013cuvi starpliktuvei. L\u016bdzu, lietojiet Ctrl+X\/C\/V klaviat\u016bras sa\u012bsnes.",
-"Headers": "Virsraksti",
-"Header 1": "1. l\u012bme\u0146a virsraksts",
-"Header 2": "2. l\u012bme\u0146a virsraksts",
-"Header 3": "3. l\u012bme\u0146a virsraksts",
-"Header 4": "4. l\u012bme\u0146a virsraksts",
-"Header 5": "5. l\u012bme\u0146a virsraksts",
-"Header 6": "6. l\u012bme\u0146a virsraksts",
-"Headings": "Virsraksti",
-"Heading 1": "1. l\u012bme\u0146a virsraksts",
-"Heading 2": "2. l\u012bme\u0146a virsraksts",
-"Heading 3": "3. l\u012bme\u0146a virsraksts",
-"Heading 4": "4. l\u012bme\u0146a virsraksts",
-"Heading 5": "5. l\u012bme\u0146a virsraksts",
-"Heading 6": "6. l\u012bme\u0146a virsraksts",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kods",
-"Paragraph": "Rindkopa",
-"Blockquote": "Cit\u0101ts",
-"Inline": "Inline elementi",
-"Blocks": "Bloka elementi",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Iel\u012bm\u0113\u0161ana vienk\u0101r\u0161\u0101 teksta re\u017e\u012bm\u0101. Saturs tiks iel\u012bm\u0113ts bez format\u0113juma l\u012bdz \u0161\u012b opcija tiks atsl\u0113gta.",
-"Font Family": "Fontu saime",
-"Font Sizes": "Fontu izm\u0113ri",
-"Class": "Klase",
-"Browse for an image": "Izv\u0113l\u0113ties att\u0113lu",
-"OR": "VAI",
-"Drop an image here": "Ievelciet att\u0113lu \u0161eit",
-"Upload": "Aug\u0161upiel\u0101d\u0113t",
-"Block": "Bloks",
-"Align": "L\u012bdzin\u0101t",
-"Default": "Parastais",
-"Circle": "Aplis",
-"Disc": "Disks",
-"Square": "Kvadr\u0101ts",
-"Lower Alpha": "Lat\u012b\u0146u mazie burti",
-"Lower Greek": "Grie\u0137u mazie burti",
-"Lower Roman": "Romie\u0161u mazie burti",
-"Upper Alpha": "Lat\u012b\u0146u lielie burti",
-"Upper Roman": "Romie\u0161u lielie burti",
-"Anchor": "Iek\u0161\u0113j\u0101 saite",
-"Name": "Nosaukums",
-"Id": "Identifikators",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Identifikatoram j\u0101s\u0101kas ar burtu, p\u0113c tam var satur\u0113t: burtus, ciparus, domuz\u012bmes, punktus, kolus vai pasv\u012btrojumz\u012bmes. ",
-"You have unsaved changes are you sure you want to navigate away?": "Saturs ir labots un nav saglab\u0101ts. Vai tie\u0161\u0101m v\u0113laties atst\u0101t \u0161o lapu?",
-"Restore last draft": "Atjaunot p\u0113d\u0113jo melnrakstu",
-"Special character": "Speci\u0101l\u0101 rakstz\u012bme",
-"Source code": "Pirmkods",
-"Insert\/Edit code sample": "Ievad\u012bt\/Labot koda paraugu",
-"Language": "Valoda",
-"Code sample": "Koda paraugs",
-"Color": "Kr\u0101sa",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "No kreis\u0101s uz labo",
-"Right to left": "No lab\u0101s uz kreiso",
-"Emoticons": "Emocijas",
-"Document properties": "Dokumenta parametri",
-"Title": "Nosaukums",
-"Keywords": "Atsl\u0113gv\u0101rdi",
-"Description": "Apraksts",
-"Robots": "Programmas",
-"Author": "Autors",
-"Encoding": "Kod\u0113\u0161ana",
-"Fullscreen": "Pilnekr\u0101na re\u017e\u012bms",
-"Action": "Darb\u012bba",
-"Shortcut": "Sa\u012bsne",
-"Help": "Pal\u012bdz\u012bba",
-"Address": "Adrese",
-"Focus to menubar": "Fokuss uz izv\u0113lni",
-"Focus to toolbar": "Fokuss uz r\u012bkjoslu",
-"Focus to element path": "Fokuss uz elementa ce\u013cu",
-"Focus to contextual toolbar": "Fokuss uz papildizv\u0113lni",
-"Insert link (if link plugin activated)": "Ievietot saiti (Ja sai\u0161u spraudnis ir akt\u012bvs)",
-"Save (if save plugin activated)": "Saglab\u0101t (Ja saglab\u0101\u0161anas spraudnis ir akt\u012bvs)",
-"Find (if searchreplace plugin activated)": "Atrast (Ja \"searchreplace\" spraudnis ir akt\u012bvs)",
-"Plugins installed ({0}):": "Spraud\u0146i instal\u0113ti ({0}):",
-"Premium plugins:": "\u012apa\u0161ie spraud\u0146i:",
-"Learn more...": "Uzzin\u0101t vair\u0101k...",
-"You are using {0}": "J\u016bs lietojiet {0}",
-"Plugins": "Spraud\u0146i",
-"Handy Shortcuts": "Paroc\u012bgi \u012bsce\u013ci",
-"Horizontal line": "Horizont\u0101l\u0101 l\u012bnija",
-"Insert\/edit image": "Ievietot\/labot att\u0113lu",
-"Image description": "Apraksts",
-"Source": "Avots",
-"Dimensions": "Izm\u0113ri",
-"Constrain proportions": "Saglab\u0101t malu attiec\u012bbu",
-"General": "Pamata info",
-"Advanced": "Papildus",
-"Style": "Stils",
-"Vertical space": "Vertik\u0101l\u0101 atstarpe",
-"Horizontal space": "Horizont\u0101l\u0101 atstarpe",
-"Border": "Apmale",
-"Insert image": "Ievietot att\u0113lu",
-"Image": "Att\u0113ls",
-"Image list": "Att\u0113lu saraksts",
-"Rotate counterclockwise": "Pagriezt pret\u0113ji pulkste\u0146a r\u0101d\u012bt\u0101ja virzienam",
-"Rotate clockwise": "Pagriezt pulkste\u0146a r\u0101d\u012bt\u0101ja virzien\u0101",
-"Flip vertically": "Apmest vertik\u0101li",
-"Flip horizontally": "Apmest horizont\u0101li",
-"Edit image": "Redi\u0123\u0113t att\u0113lu",
-"Image options": "Att\u0113la parametri",
-"Zoom in": "Pietuvin\u0101t",
-"Zoom out": "Att\u0101lin\u0101t",
-"Crop": "Apgriezt",
-"Resize": "Main\u012bt izm\u0113ru",
-"Orientation": "Orient\u0101cija",
-"Brightness": "Gai\u0161ums",
-"Sharpen": "Asums",
-"Contrast": "Kontrasts",
-"Color levels": "Kr\u0101su l\u012bme\u0146i",
-"Gamma": "Gamma",
-"Invert": "Pret\u0113j\u0101s kr\u0101sas",
-"Apply": "Pielietot",
-"Back": "Atgriezties",
-"Insert date\/time": "Ievietot datumu\/laiku",
-"Date\/time": "Datums\/laiks",
-"Insert link": "Ievietot saiti",
-"Insert\/edit link": "Ievietot\/labot saiti",
-"Text to display": "Nosaukums",
-"Url": "Adrese",
-"Target": "Kur atv\u0113rt",
-"None": "\u2014",
-"New window": "Jaun\u0101 \u0161\u0137irkl\u012b",
-"Remove link": "No\u0146emt saiti",
-"Anchors": "Saites",
-"Link": "Saite",
-"Paste or type a link": "Iekop\u0113jiet vai ierakstiet saiti",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "J\u016bs ievad\u012bj\u0101t e-pasta adresi. Lai t\u0101 korekti darbotos, ir nepiecie\u0161ams to papildin\u0101t ar \"mailto:\" priek\u0161\u0101. Vai v\u0113laties to izdar\u012bt?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "J\u016bs ievad\u012bj\u0101t \u0101r\u0113jo saiti. Lai t\u0101 korekti darbotos, ir nepiecie\u0161ams to papildin\u0101t ar \"http:\/\/\" priek\u0161\u0101. Vai v\u0113laties to izdar\u012bt?",
-"Link list": "Sai\u0161u saraksts",
-"Insert video": "Ievietot video",
-"Insert\/edit video": "Ievietot\/redi\u0123\u0113t video",
-"Insert\/edit media": "Ievietot\/labot att\u0113lu",
-"Alternative source": "Alternat\u012bvs avots",
-"Poster": "Att\u0113ls",
-"Paste your embed code below:": "Iekop\u0113jiet Embed kodu \u0161eit:",
-"Embed": "Embed kods",
-"Media": "Att\u0113ls vai video",
-"Nonbreaking space": "Nedal\u0101m\u0101 atstarpe",
-"Page break": "P\u0101reja uz jauno lapu",
-"Paste as text": "Iel\u012bm\u0113t bez format\u0113juma",
-"Preview": "Priek\u0161skat\u012bt",
-"Print": "Druk\u0101t",
-"Save": "Saglab\u0101t",
-"Find": "Mekl\u0113t",
-"Replace with": "Aizvietot ar",
-"Replace": "Aizvietot",
-"Replace all": "Aizvietot visu",
-"Prev": "Iepriek\u0161\u0113jais",
-"Next": "N\u0101kamais",
-"Find and replace": "Mekl\u0113t un aizvietot",
-"Could not find the specified string.": "Mekl\u0113tais teksts netika atrasts",
-"Match case": "At\u0161\u0137irt lielos un mazos burtus",
-"Whole words": "Tikai pilnos v\u0101rdus",
-"Spellcheck": "Pareizrakst\u012bbas p\u0101rbaude",
-"Ignore": "Ignor\u0113t",
-"Ignore all": "Ignor\u0113t visu",
-"Finish": "Pabeigt",
-"Add to Dictionary": "Pievienot v\u0101rdn\u012bcai",
-"Insert table": "Ievietot tabulu",
-"Table properties": "Tabulas parametri",
-"Delete table": "Dz\u0113st tabulu",
-"Cell": "\u0160\u016bna",
-"Row": "Rinda",
-"Column": "Kolonna",
-"Cell properties": "\u0160\u016bnas parametri",
-"Merge cells": "Apvienot \u0161\u016bnas",
-"Split cell": "Sadal\u012bt \u0161\u016bnas",
-"Insert row before": "Jauna rinda augst\u0101k",
-"Insert row after": "Jauna rinda zem\u0101k",
-"Delete row": "Dz\u0113st rindu",
-"Row properties": "Rindas parametri",
-"Cut row": "Izgriezt rindu",
-"Copy row": "Kop\u0113t rindu",
-"Paste row before": "Iel\u012bm\u0113t rindu augst\u0101k",
-"Paste row after": "Iel\u012bm\u0113t rindu zem\u0101k",
-"Insert column before": "Jauna kolonna pa kreisi",
-"Insert column after": "Jauna kolonna pa labi",
-"Delete column": "Dz\u0113st kolonu",
-"Cols": "Kolonnas",
-"Rows": "Rindas",
-"Width": "Platums",
-"Height": "Augstums",
-"Cell spacing": "\u0160\u016bnu atstarpe",
-"Cell padding": "Iek\u0161\u0113j\u0101 atstarpe",
-"Caption": "Ar virsrakstu",
-"Left": "Pa kreisi",
-"Center": "Centr\u0113t",
-"Right": "Pa labi",
-"Cell type": "\u0160\u016bnas veids",
-"Scope": "Attiecin\u0101t uz",
-"Alignment": "Izl\u012bdzin\u0101\u0161ana",
-"H Align": "Horizont\u0101lais novietojums",
-"V Align": "Vertik\u0101lais novietojums",
-"Top": "Aug\u0161\u0101",
-"Middle": "Pa vidu",
-"Bottom": "Apak\u0161\u0101",
-"Header cell": "Galvenes \u0161\u016bna",
-"Row group": "Rindu grupa",
-"Column group": "Kolonnu grupa",
-"Row type": "Rindas veids",
-"Header": "Galvene",
-"Body": "Saturs",
-"Footer": "K\u0101jene",
-"Border color": "Apmales kr\u0101sa",
-"Insert template": "Ievietot veidni",
-"Templates": "Veidnes",
-"Template": "Veidne",
-"Text color": "Teksta kr\u0101sa",
-"Background color": "Fona kr\u0101sa",
-"Custom...": "Izv\u0113l\u0113ties citu...",
-"Custom color": "Specifisk\u0101 kr\u0101sa",
-"No color": "Nenor\u0101d\u012bt kr\u0101su",
-"Table of Contents": "Saturs",
-"Show blocks": "R\u0101d\u012bt blokus",
-"Show invisible characters": "R\u0101d\u012bt neredzam\u0101s rakstz\u012bmes",
-"Words: {0}": "V\u0101rdi: {0}",
-"{0} words": "{0} v\u0101rdi",
-"File": "Datne",
-"Edit": "Labot",
-"Insert": "Ievietot",
-"View": "Skat\u012bt",
-"Format": "Format\u0113t",
-"Table": "Tabula",
-"Tools": "R\u012bki",
-"Powered by {0}": "Darb\u012bbu nodro\u0161ina {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Satura redaktors. Nospiediet ALT-F9 lai par\u0101d\u012btu izv\u0113lni, ALT-F10 - r\u012bkjoslu vai ALT-0 - pal\u012bdz\u012bbu."
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/mk_MK.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('mk_MK',{
-"Cut": "\u0418\u0441\u0435\u0447\u0438",
-"Heading 5": "Heading 5",
-"Header 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0458\u0435 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u043e\u0442 \u043f\u0440\u0435\u043b\u0438\u0441\u0442\u0443\u0432\u0430\u0447 \u043d\u0435 \u043f\u043e\u0434\u0440\u0436\u0443\u0432\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u043f\u0440\u0438\u0441\u0442\u0430\u043f \u0434\u043e clipboard. \u041a\u043e\u0440\u0438\u0441\u0442\u0435\u0442\u0435 \u0433\u0438 \u043a\u0440\u0430\u0442\u0435\u043d\u043a\u0438\u0442\u0435 CTRL+X\/C\/V.",
-"Heading 4": "Heading 4",
-"Div": "Div",
-"Heading 2": "Heading 2",
-"Paste": "\u0417\u0430\u043b\u0435\u043f\u0438",
-"Close": "\u0417\u0430\u0442\u0432\u043e\u0440\u0438",
-"Font Family": "Font Family",
-"Pre": "Pre",
-"Align right": "\u041f\u043e\u0440\u0430\u043c\u043d\u0438 \u0434\u0435\u0441\u043d\u043e",
-"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Blockquote": "Blockquote",
-"Numbered list": "\u041b\u0438\u0441\u0442\u0430 \u0431\u0440\u043e\u0458\u043a\u0438",
-"Heading 1": "Heading 1",
-"Headings": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0458\u0430",
-"Increase indent": "\u0417\u0433\u043e\u043b\u0435\u043c\u0438 \u0432\u043e\u0432\u043b\u0435\u043a\u0443\u0432\u0430\u045a\u0435",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
-"Headers": "\u0417\u0430\u0433\u043b\u0430\u0432\u0458\u0435",
-"Select all": "\u0421\u0435\u043b\u0435\u043a\u0442\u0438\u0440\u0430\u0458 \u0441\u00e8",
-"Header 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0458\u0435 3",
-"Blocks": "Blocks",
-"Undo": "\u0412\u0440\u0430\u0442\u0438",
-"Strikethrough": "\u041f\u0440\u0435\u0446\u0440\u0442\u0430\u043d\u043e",
-"Bullet list": "\u041b\u0438\u0441\u0442\u0430 \u0442\u043e\u0447\u043a\u0438",
-"Header 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0458\u0435 1",
-"Superscript": "\u0422\u0435\u043a\u0441\u0442 \u0433\u043e\u0440\u0435",
-"Clear formatting": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u045a\u0435",
-"Font Sizes": "Font Sizes",
-"Subscript": "\u0422\u0435\u043a\u0441\u0442 \u0434\u043e\u043b\u0443",
-"Header 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0458\u0435 6",
-"Redo": "\u041f\u043e\u0432\u0442\u043e\u0440\u0438",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Ok": "\u041e\u043a",
-"Bold": "\u0417\u0434\u0435\u0431\u0435\u043b\u0435\u043d\u043e",
-"Code": "Code",
-"Italic": "\u0417\u0430\u043a\u043e\u0441\u0435\u043d\u043e",
-"Align center": "\u041f\u043e\u0440\u0430\u043c\u043d\u0438 \u0441\u0440\u0435\u0434\u0438\u043d\u0430",
-"Header 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0458\u0435 5",
-"Heading 6": "Heading 6",
-"Heading 3": "Heading 3",
-"Decrease indent": "\u041d\u0430\u043c\u0430\u043b\u0438 \u0432\u043e\u0432\u043b\u0435\u043a\u0443\u0432\u0430\u045a\u0435",
-"Header 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0458\u0435 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u043c\u0435\u0442\u043d\u0443\u0432\u0430\u045a\u0435\u0442\u043e \u0441\u0435\u0433\u0430 \u0435 \u043a\u0430\u043a\u043e \u0447\u0438\u0441\u0442 \u0442\u0435\u043a\u0441\u0442. \u0421\u043e\u0434\u0440\u0436\u0438\u043d\u0430\u0442\u0430 \u045c\u0435 \u0431\u0438\u0434\u0435 \u0432\u043c\u0435\u0442\u043d\u0430\u0442\u0430 \u043a\u0430\u043a\u043e \u0447\u0438\u0441\u0442 \u0442\u0435\u043a\u0441\u0442 \u0431\u0430\u0440\u0435\u043c \u0434\u043e\u0434\u0435\u043a\u0430 \u043d\u0435 \u0458\u0430 \u0438\u0441\u043a\u043b\u0443\u0447\u0438\u0442\u0435 \u043e\u0432\u0430\u0430 \u043e\u043f\u0446\u0438\u0458\u0430",
-"Underline": "\u041f\u043e\u0434\u0432\u043b\u0435\u0447\u0435\u043d\u043e",
-"Cancel": "\u041e\u0442\u043a\u0430\u0436\u0438",
-"Justify": "Justify",
-"Inline": "Inline",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u0458",
-"Align left": "\u041f\u043e\u0440\u0430\u043c\u043d\u0438 \u043b\u0435\u0432\u043e",
-"Visual aids": "\u0412\u0438\u0437\u0443\u0435\u043b\u043d\u0430 \u043f\u043e\u043c\u043e\u0448",
-"Lower Greek": "\u043c\u0430\u043b\u0438 \u0413\u0440\u0438\u043a",
-"Square": "\u043a\u0432\u0430\u0434\u0440\u0430\u0442",
-"Default": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e",
-"Lower Alpha": "\u043c\u0430\u043b\u0438 \u0410\u043b\u0444\u0430",
-"Circle": "\u043a\u0440\u0443\u0433",
-"Disc": "\u0434\u0438\u0441\u043a",
-"Upper Alpha": "\u0433\u043e\u043b\u0435\u043c\u0438 \u0410\u043b\u0444\u0430",
-"Upper Roman": "\u0433\u043e\u043b\u0435\u043c\u0438 \u0420\u043e\u043c\u0430\u043d",
-"Lower Roman": "\u043c\u0430\u043b\u0438 \u0420\u043e\u043c\u0430\u043d",
-"Name": "\u0418\u043c\u0435",
-"Anchor": "Anchor",
-"You have unsaved changes are you sure you want to navigate away?": "\u0418\u043c\u0430\u0442\u0435 \u043d\u0435\u0437\u0430\u0447\u0443\u0432\u0430\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438. \u0414\u0430\u043b\u0438 \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u0435 \u043f\u043e\u043d\u0430\u0442\u0430\u043c\u0443?",
-"Restore last draft": "\u0412\u0440\u0430\u0442\u0438 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430 \u043f\u0440\u0438\u043f\u0440\u0435\u043c\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0458\u0430\u043b\u0435\u043d \u043a\u0430\u0440\u0430\u043a\u0442\u0435\u0440",
-"Source code": "\u0418\u0437\u0432\u043e\u0440\u0435\u043d \u043a\u043e\u0434",
-"B": "\u0411",
-"R": "\u0420",
-"G": "\u0413",
-"Color": "\u0411\u043e\u0458\u0430",
-"Right to left": "\u0414\u0435\u0441\u043d\u043e \u043d\u0430 \u043b\u0435\u0432\u043e",
-"Left to right": "\u041b\u0435\u0432\u043e \u043d\u0430 \u0434\u0435\u0441\u043d\u043e",
-"Emoticons": "\u0421\u043c\u0430\u0458\u043b\u0438",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
-"Document properties": "\u041f\u043e\u0434\u0430\u0442\u043e\u0446\u0438 \u0437\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0442",
-"Title": "\u041d\u0430\u0441\u043b\u043e\u0432",
-"Keywords": "\u041a\u043b\u0443\u0447\u043d\u0438 \u0437\u0431\u043e\u0440\u043e\u0432\u0438",
-"Encoding": "\u0415\u043d\u043a\u043e\u0434\u0438\u043d\u0433",
-"Description": "\u041e\u043f\u0438\u0441",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Fullscreen": "\u0426\u0435\u043b \u0435\u043a\u0440\u0430\u043d",
-"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u043b\u0438\u043d\u0438\u0458\u0430",
-"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0435\u043d \u043f\u0440\u043e\u0441\u0442\u043e\u0440",
-"Insert\/edit image": "\u0412\u043d\u0435\u0441\u0438\/\u0438\u0437\u043c\u0435\u043d\u0438 \u0441\u043b\u0438\u043a\u0430",
-"General": "\u0413\u0435\u043d\u0435\u0440\u0430\u043b\u043d\u043e",
-"Advanced": "\u041d\u0430\u043f\u0440\u0435\u0434\u043d\u043e",
-"Source": "\u0418\u0437\u0432\u043e\u0440",
-"Border": "\u0420\u0430\u043c\u043a\u0430",
-"Constrain proportions": "\u0421\u0440\u0430\u0437\u043c\u0435\u0440\u043d\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0435\u043d \u043f\u0440\u043e\u0441\u0442\u043e\u0440",
-"Image description": "\u041e\u0431\u0458\u0430\u0441\u043d\u0443\u0432\u0430\u045a\u0435 \u043d\u0430 \u0441\u043b\u0438\u043a\u0430",
-"Style": "\u0421\u0442\u0438\u043b",
-"Dimensions": "\u0414\u0438\u043c\u0435\u043d\u0437\u0438\u0438",
-"Insert image": "\u0412\u043d\u0435\u0441\u0438 \u0441\u043b\u0438\u043a\u0430",
-"Zoom in": "\u0417\u0433\u043e\u043b\u0435\u043c\u0438 \u043f\u043e\u0433\u043b\u0435\u0434",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Gamma": "\u0413\u0430\u043c\u0430",
-"Flip horizontally": "\u0421\u0432\u0440\u0442\u0438 \u0445\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e",
-"Resize": "\u0420\u0435\u0434\u0438\u043c\u0435\u043d\u0437\u0438\u043e\u043d\u0438\u0440\u0430\u0458",
-"Sharpen": "\u041e\u0441\u0442\u0440\u0438\u043d\u0430",
-"Zoom out": "\u041d\u0430\u043c\u0430\u043b\u0438 \u043f\u043e\u0433\u043b\u0435\u0434",
-"Image options": "\u041e\u043f\u0446\u0438\u0438 \u0437\u0430 \u0441\u043b\u0438\u043a\u0430",
-"Apply": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438",
-"Brightness": "\u0421\u0432\u0435\u0442\u043b\u043e\u0441\u0442",
-"Rotate clockwise": "\u0421\u0432\u0440\u0442\u0438 \u0432\u043e \u043f\u0440\u0430\u0432\u0435\u0446 \u043d\u0430 \u0441\u0442\u0440\u0435\u043b\u043a\u0430\u0442\u0430",
-"Rotate counterclockwise": "\u0421\u0432\u0440\u0442\u0438 \u043e\u0431\u0440\u0430\u0442\u043d\u043e \u043e\u0434 \u0441\u0442\u0440\u0435\u043b\u043a\u0430\u0442\u0430",
-"Edit image": "\u0423\u0440\u0435\u0434\u0438 \u0441\u043b\u0438\u043a\u0430",
-"Color levels": "\u041d\u0438\u0432\u043e\u0430 \u043d\u0430 \u0431\u043e\u0438",
-"Crop": "\u041e\u0442\u0441\u0435\u0447\u0438",
-"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u0458\u0430",
-"Flip vertically": "\u0421\u0432\u0440\u0442\u0438 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e",
-"Invert": "\u0418\u043d\u0432\u0435\u0440\u0437\u043d\u043e",
-"Insert date\/time": "\u0412\u043d\u0435\u0441\u0438 \u0434\u0430\u0442\u0443\u043c\/\u0432\u0440\u0435\u043c\u0435",
-"Remove link": "\u041e\u0442\u0441\u0442\u0440\u0430\u043d\u0438 \u043b\u0438\u043d\u043a",
-"Url": "Url",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0437\u0430 \u043f\u0440\u0438\u043a\u0430\u0437",
-"Anchors": "Anchors",
-"Insert link": "\u0412\u043d\u0435\u0441\u0438 \u043b\u0438\u043d\u043a",
-"New window": "\u043d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446",
-"None": "\u043d\u0438\u0448\u0442\u043e",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0435 \u0447\u0438\u043d\u0438 \u0434\u0435\u043a\u0430 \u0430\u0434\u0440\u0435\u0441\u0430\u0442\u0430 \u0448\u0442\u043e \u0458\u0430 \u0432\u043d\u0435\u0441\u043e\u0432\u0442\u0435 \u0435 \u043d\u0430\u0434\u0432\u043e\u0440\u0435\u0448\u0435\u043d \u043b\u0438\u043d\u043a. \u0414\u0430\u043b\u0438 \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0431\u0438\u0434\u0435 \u0434\u043e\u0434\u0430\u0434\u0435\u043d \u043f\u043e\u0442\u0440\u0435\u0431\u043d\u0438\u043e\u0442 http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"Target": "\u0446\u0435\u043b",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0435 \u0447\u0438\u043d\u0438 \u0434\u0435\u043a\u0430 \u0430\u0434\u0440\u0435\u0441\u0430\u0442\u0430 \u0448\u0442\u043e \u0458\u0430 \u0432\u043d\u0435\u0441\u043e\u0432\u0442\u0435 \u0435 \u0435-\u043f\u043e\u0448\u0442\u0430. \u0414\u0430\u043b\u0438 \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0431\u0438\u0434\u0435 \u0434\u043e\u0434\u0430\u0434\u0435\u043d \u043f\u043e\u0442\u0440\u0435\u0431\u043d\u0438\u043e\u0442 mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"Insert\/edit link": "\u0412\u043d\u0435\u0441\u0438\/\u0443\u0440\u0435\u0434\u0438 \u043b\u0438\u043d\u043a",
-"Insert\/edit video": "\u0412\u043d\u0435\u0441\u0438\/\u0443\u0440\u0435\u0434\u0438 \u0432\u0438\u0434\u0435\u043e",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
-"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0438\u0437\u0432\u043e\u0440",
-"Paste your embed code below:": "\u041f\u043e\u0434\u043e\u043b\u0443 \u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u0433\u043e \u0432\u0430\u0448\u0438\u043e\u0442 \u043a\u043e\u0434 \u0437\u0430 \u0432\u043c\u0435\u0442\u043d\u0443\u0432\u0430\u045a\u0435:",
-"Insert video": "\u0412\u043d\u0435\u0441\u0438 \u0432\u0438\u0434\u0435\u043e",
-"Embed": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043a\u043e\u0434",
-"Nonbreaking space": "\u041d\u0435\u043f\u0440\u0435\u043a\u0440\u0448\u0443\u0432\u0430\u0447\u043a\u0438 \u043f\u0440\u043e\u0441\u0442\u043e\u0440",
-"Page break": "\u041f\u0440\u0435\u043a\u0440\u0448\u0443\u0432\u0430\u045a\u0435",
-"Paste as text": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043a\u0430\u043a\u043e \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0433\u043b\u0435\u0434",
-"Print": "\u041f\u0435\u0447\u0430\u0442\u0438",
-"Save": "\u0417\u0430\u0447\u0443\u0432\u0430\u0458",
-"Could not find the specified string.": "\u041d\u0435\u043c\u043e\u0436\u043d\u043e \u043d\u0430\u043e\u0453\u0430\u045a\u0435 \u043d\u0430 \u043f\u043e\u0441\u043e\u0447\u0435\u043d\u0438\u043e\u0442 \u043f\u043e\u0438\u043c",
-"Replace": "\u0417\u0430\u043c\u0435\u043d\u0438",
-"Next": "\u041f\u043e",
-"Whole words": "\u0426\u0435\u043b\u0438 \u0437\u0431\u043e\u0440\u043e\u0432\u0438",
-"Find and replace": "\u041d\u0430\u0458\u0434\u0438 \u0438 \u0437\u0430\u043c\u0435\u043d\u0438",
-"Replace with": "\u0417\u0430\u043c\u0435\u043d\u0438 \u0441\u043e",
-"Find": "\u041d\u0430\u0458\u0434\u0438",
-"Replace all": "\u0417\u0430\u043c\u0435\u043d\u0438 \u0441\u00e8",
-"Match case": "\u0426\u0435\u043b\u043e\u0441\u043d\u043e \u0441\u043e\u0432\u043f\u0430\u0453\u0430\u045a\u0435",
-"Prev": "\u041f\u0440\u0435\u0434",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441",
-"Finish": "\u0424\u0438\u043d\u0438\u0448",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u0458 \u0441\u00e8",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u0458",
-"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0434\u0438 \u0432\u043e \u0440\u0435\u0447\u043d\u0438\u043a",
-"Insert row before": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043d\u0430\u0434",
-"Rows": "\u0420\u0435\u0434\u043e\u0432\u0438",
-"Height": "\u0412\u0438\u0441\u0438\u043d\u0430",
-"Paste row after": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043f\u043e\u0434",
-"Alignment": "\u041f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
-"Border color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430",
-"Row": "\u0420\u0435\u0434",
-"Insert column before": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043a\u043e\u043b\u043e\u043d\u0430 \u043d\u0430\u0434",
-"Split cell": "\u041f\u043e\u0434\u0435\u043b\u0438 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Cell padding": "\u0411\u0435\u043b\u0438\u043d\u0430 \u0432\u043e \u045c\u0435\u043b\u0438\u0458\u0430",
-"Cell spacing": "\u041f\u0440\u043e\u0441\u0442\u043e\u0440 \u043d\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434",
-"Insert table": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0442\u0430\u0431\u0435\u043b\u0430",
-"Body": "\u0422\u0435\u043b\u043e",
-"Caption": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435",
-"Footer": "\u041f\u043e\u0434\u043d\u043e\u0436\u0458\u0435",
-"Delete row": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u0440\u0435\u0434",
-"Paste row before": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043d\u0430\u0434",
-"Scope": "Scope",
-"Delete table": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u0442\u0430\u0431\u0435\u043b\u0430",
-"H Align": "H Align",
-"Top": "\u0433\u043e\u0440\u0435",
-"Header cell": "\u041d\u0430\u0441\u043b\u043e\u0432\u043d\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u043d\u0430 \u0440\u0435\u0434",
-"Cell": "\u040c\u0435\u043b\u0438\u0458\u0430",
-"Middle": "\u0441\u0440\u0435\u0434\u0438\u043d\u0430",
-"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u0458 \u0440\u0435\u0434",
-"Row properties": "\u041f\u043e\u0434\u0430\u0442\u043e\u0446\u0438 \u0437\u0430 \u0440\u0435\u0434",
-"Table properties": "\u041f\u043e\u0434\u0430\u0442\u043e\u0446\u0438 \u0437\u0430 \u0442\u0430\u0431\u0435\u043b\u0430\u0442\u0430",
-"Bottom": "\u0434\u043e\u043b\u0443",
-"V Align": "V Align",
-"Header": "\u041d\u0430\u0441\u043b\u043e\u0432",
-"Right": "\u0434\u0435\u0441\u043d\u043e",
-"Insert column after": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u043e\u0434",
-"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
-"Insert row after": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043f\u043e\u0434",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Cell properties": "\u041f\u043e\u0434\u0430\u0442\u043e\u0446\u0438 \u0437\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Left": "\u043b\u0435\u0432\u043e",
-"Cut row": "\u041e\u0442\u0441\u0435\u0447\u0438 \u0440\u0435\u0434",
-"Delete column": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u043a\u043e\u043b\u043e\u043d\u0430",
-"Center": "\u0446\u0435\u043d\u0442\u0430\u0440",
-"Merge cells": "\u0421\u043f\u043e\u0438 \u045c\u0435\u043b\u0438\u0438",
-"Insert template": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Background color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u043f\u043e\u0437\u0430\u0434\u0438\u043d\u0430",
-"Custom...": "\u041f\u043e \u0436\u0435\u043b\u0431\u0430...",
-"Custom color": "\u0411\u043e\u0458\u0430 \u043f\u043e \u0436\u0435\u043b\u0431\u0430",
-"No color": "\u0411\u0435\u0437 \u0431\u043e\u0458\u0430",
-"Text color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u0442\u0435\u043a\u0441\u0442",
-"Show blocks": "\u041f\u0440\u0438\u043a\u0430\u0436\u0438 \u0431\u043b\u043e\u043a\u043e\u0432\u0438",
-"Show invisible characters": "\u041f\u0440\u0438\u043a\u0430\u0436\u0438 \u043d\u0435\u0432\u0438\u0434\u043b\u0438\u0432\u0438 \u043a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438",
-"Words: {0}": "\u0417\u0431\u043e\u0440\u043e\u0432\u0438: {0}",
-"Insert": "\u0412\u043c\u0435\u0442\u043d\u0438",
-"File": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Edit": "\u0423\u0440\u0435\u0434\u0438",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041f\u043e\u043b\u0435 \u0437\u0430 Rich Text. \u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0438 ALT-F9 \u0437\u0430 \u043c\u0435\u043d\u0438. \u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0438 ALT-F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441\u043e \u0430\u043b\u0430\u0442\u043a\u0438. \u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0438 ALT-0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0448.",
-"Tools": "\u0410\u043b\u0430\u0442\u043a\u0438",
-"View": "\u041f\u043e\u0433\u043b\u0435\u0434",
-"Table": "\u0422\u0430\u0431\u0435\u043b\u0430",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/ml_IN.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('ml_IN',{
-"Redo": "\u0d35\u0d40\u0d23\u0d4d\u0d1f\u0d41\u0d02 \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15",
-"Undo": "\u0d1a\u0d46\u0d2f\u0d4d\u0d24\u0d24\u0d4d \u0d24\u0d3f\u0d30\u0d3f\u0d1a\u0d4d\u0d1a\u0d46\u0d1f\u0d41\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Cut": "\u0d2e\u0d41\u0d31\u0d3f\u0d2f\u0d4d\u0d15\u0d4d\u0d15\u0d41\u0d15 ",
-"Copy": "\u0d2a\u0d15\u0d30\u0d4d\u200d\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"Paste": "\u0d12\u0d1f\u0d4d\u0d1f\u0d3f\u0d2f\u0d4d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Select all": "\u0d0e\u0d32\u0d4d\u0d32\u0d3e\u0d02 \u0d24\u0d3f\u0d30\u0d1e\u0d4d\u0d1e\u0d46\u0d1f\u0d41\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"New document": "\u0d2a\u0d41\u0d24\u0d3f\u0d2f \u0d30\u0d1a\u0d28",
-"Ok": "\u0d36\u0d30\u0d3f",
-"Cancel": "\u0d31\u0d26\u0d4d\u0d26\u0d3e\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Visual aids": "\u0d26\u0d43\u0d36\u0d4d\u0d2f\u0d38\u0d39\u0d3e\u0d2f\u0d3f\u0d15\u0d33\u0d4d\u200d",
-"Bold": "\u0d15\u0d28\u0d2a\u0d4d\u0d2a\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Italic": "\u0d1a\u0d46\u0d30\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Underline": "\u0d05\u0d1f\u0d3f\u0d35\u0d30\u0d2f\u0d3f\u0d1f\u0d41\u0d15",
-"Strikethrough": "\u0d35\u0d46\u0d1f\u0d4d\u0d1f\u0d41\u0d15",
-"Superscript": "\u0d38\u0d42\u0d2a\u0d4d\u0d2a\u0d30\u0d4d\u200d\u0d38\u0d4d\u0d15\u0d4d\u0d30\u0d3f\u0d2a\u0d4d\u0d31\u0d4d\u0d31\u0d4d",
-"Subscript": "\u0d38\u0d2c\u0d4d\u200c\u0d38\u0d4d\u0d15\u0d4d\u0d30\u0d3f\u0d2a\u0d4d\u0d31\u0d4d\u0d31\u0d4d",
-"Clear formatting": "\u0d35\u0d46\u0d1f\u0d3f\u0d2a\u0d4d\u0d2a\u0d3e\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Align left": "\u0d07\u0d1f\u0d24\u0d4d\u0d24\u0d4b\u0d1f\u0d4d\u0d1f\u0d41\u0d4d \u0d2a\u0d3f\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Align center": "\u0d28\u0d1f\u0d41\u0d35\u0d3f\u0d32\u0d4b\u0d1f\u0d4d\u0d1f\u0d41\u0d4d \u0d2a\u0d3f\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Align right": "\u0d35\u0d32\u0d24\u0d4d\u0d24\u0d4b\u0d1f\u0d4d\u0d1f\u0d41\u0d4d \u0d2a\u0d3f\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Justify": "\u0d38\u0d28\u0d4d\u0d24\u0d41\u0d32\u0d3f\u0d24\u0d2e\u0d3e\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Bullet list": "\u0d05\u0d1f\u0d2f\u0d3e\u0d33\u0d2e\u0d3f\u0d1f\u0d4d\u0d1f \u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15",
-"Numbered list": "\u0d0e\u0d23\u0d4d\u0d23\u0d2e\u0d3f\u0d1f\u0d4d\u0d1f \u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15",
-"Decrease indent": "\u0d35\u0d3f\u0d1f\u0d35\u0d41\u0d4d \u0d15\u0d41\u0d31\u0d2f\u0d4d\u0d15\u0d4d\u0d15\u0d41\u0d15 ",
-"Increase indent": "\u0d35\u0d3f\u0d1f\u0d35\u0d41\u0d4d \u0d15\u0d42\u0d1f\u0d4d\u0d1f\u0d41\u0d15",
-"Close": "\u0d05\u0d1f\u0d2f\u0d4d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Formats": "\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d41\u0d02\u0d2e\u0d1f\u0d4d\u0d1f\u0d41\u0d02",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0d28\u0d3f\u0d19\u0d4d\u0d19\u0d33\u0d41\u0d1f\u0d46 \u0d2c\u0d4d\u0d30\u0d4c\u0d38\u0d30\u0d4d\u200d \u0d15\u0d4d\u0d32\u0d3f\u0d2a\u0d4d\u0d2a\u0d4d\u0d2c\u0d4b\u0d30\u0d4d\u200d\u0d21\u0d3f\u0d32\u0d47\u0d15\u0d4d\u0d15\u0d4d \u0d2a\u0d4d\u0d30\u0d35\u0d47\u0d36\u0d28\u0d02 \u0d28\u0d32\u0d4d\u200d\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d3f\u0d32\u0d4d\u0d32. \u0d26\u0d2f\u0d35\u0d41 \u0d1a\u0d46\u0d2f\u0d4d\u0d24 CTRL+X\/C\/V \u0d37\u0d4b\u0d30\u0d4d\u200d\u0d1f\u0d4d\u0d1f\u0d4d\u0d15\u0d1f\u0d4d\u0d1f\u0d41\u0d15\u0d33\u0d4d\u200d \u0d09\u0d2a\u0d2f\u0d4b\u0d17\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Headers": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d41\u0d15\u0d33\u0d4d\u200d",
-"Header 1": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d\u200c1",
-"Header 2": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d\u200c2",
-"Header 3": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d\u200c3",
-"Header 4": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d\u200c4",
-"Header 5": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d\u200c5",
-"Header 6": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d\u200c6",
-"Headings": "\u0d36\u0d40\u0d7c\u0d37\u0d15\u0d19\u0d4d\u0d19\u0d7e",
-"Heading 1": "\u0d36\u0d40\u0d7c\u0d37\u0d15\u0d02 1",
-"Heading 2": "\u0d36\u0d40\u0d7c\u0d37\u0d15\u0d02 2",
-"Heading 3": "\u0d36\u0d40\u0d7c\u0d37\u0d15\u0d02 3",
-"Heading 4": "\u0d36\u0d40\u0d7c\u0d37\u0d15\u0d02 4",
-"Heading 5": "\u0d36\u0d40\u0d7c\u0d37\u0d15\u0d02 5",
-"Heading 6": "\u0d36\u0d40\u0d7c\u0d37\u0d15\u0d02 6",
-"Preformatted": "\u0d2a\u0d42\u0d7c\u0d35\u0d4d\u0d35\u0d38\u0d02\u0d30\u0d1a\u0d3f\u0d24\u0d02",
-"Div": "\u0d21\u0d3f\u0d35\u0d4d",
-"Pre": "\u0d2a\u0d4d\u0d30\u0d40",
-"Code": "\u0d15\u0d4b\u0d21\u0d4d",
-"Paragraph": "\u0d16\u0d23\u0d4d\u200c\u0d21\u0d3f\u0d15",
-"Blockquote": "\u0d15\u0d42\u0d1f\u0d4d\u0d1f\u0d09\u0d26\u0d4d\u0d27\u0d30\u0d23\u0d3f",
-"Inline": "\u0d35\u0d30\u0d3f\u0d2f\u0d3f\u0d32\u0d4d\u200d",
-"Blocks": "\u0d15\u0d42\u0d1f\u0d4d\u0d1f\u0d02",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0d12\u0d1f\u0d4d\u0d1f\u0d3f\u0d2a\u0d4d\u0d2a\u0d4d \u0d07\u0d2a\u0d4d\u0d2a\u0d4b\u0d33\u0d4d\u200d \u0d32\u0d33\u0d3f\u0d24\u0d2e\u0d3e\u0d2f \u0d1f\u0d46\u0d15\u0d4d\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4d\u200c  \u0d06\u0d2f\u0d3f\u0d1f\u0d4d\u0d1f\u0d3e\u0d23\u0d4d. \u0d28\u0d3f\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d \u0d08 \u0d38\u0d57\u0d15\u0d30\u0d4d\u0d2f\u0d02 \u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d41\u0d28\u0d4d\u0d28\u0d24\u0d4d \u0d35\u0d30\u0d46 \u0d09\u0d33\u0d4d\u0d33\u0d1f\u0d15\u0d4d\u0d15\u0d02 \u0d32\u0d33\u0d3f\u0d24 \u0d1f\u0d46\u0d15\u0d4d\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4d\u200c \u0d06\u0d2f\u0d3f\u0d1f\u0d4d\u0d1f\u0d3e\u0d2f\u0d3f\u0d30\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d02 \u0d12\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d24\u0d4d. ",
-"Font Family": "\u0d2b\u0d4b\u0d23\u0d4d\u0d1f\u0d4d \u0d15\u0d41\u0d1f\u0d41\u0d02\u0d2c\u0d02",
-"Font Sizes": "\u0d2b\u0d4b\u0d23\u0d4d\u0d1f\u0d4d \u0d35\u0d32\u0d3f\u0d2a\u0d4d\u0d2a\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Class": "\u0d36\u0d4d\u0d30\u0d47\u0d23\u0d3f",
-"Browse for an image": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d24\u0d4d\u0d24\u0d3f\u0d28\u0d3e\u0d2f\u0d3f \u0d24\u0d3f\u0d30\u0d2f\u0d41\u0d15 ",
-"OR": "\u0d05\u0d25\u0d35\u0d3e",
-"Drop an image here": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d02 \u0d07\u0d35\u0d3f\u0d1f\u0d46 \u0d07\u0d1f\u0d41\u0d15",
-"Upload": "\u0d05\u0d2a\u0d4d\u0d2a\u0d4d\u0d32\u0d4b\u0d21\u0d4d \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15",
-"Block": "\u0d16\u0d23\u0d4d\u0d21\u0d02",
-"Align": "\u0d35\u0d3f\u0d28\u0d4d\u0d2f\u0d38\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Default": "\u0d09\u0d2a\u0d47\u0d15\u0d4d\u0d37",
-"Circle": "\u0d35\u0d1f\u0d4d\u0d1f\u0d02",
-"Disc": "\u0d1a\u0d15\u0d4d\u0d30\u0d02",
-"Square": "\u0d38\u0d2e\u0d1a\u0d24\u0d41\u0d30\u0d02",
-"Lower Alpha": "\u0d1a\u0d46\u0d31\u0d3f\u0d2f \u0d05\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Lower Greek": "\u0d1a\u0d46\u0d31\u0d3f\u0d2f \u0d17\u0d4d\u0d30\u0d40\u0d15\u0d4d\u0d15\u0d4d\u200c \u0d05\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Lower Roman": "\u0d1a\u0d46\u0d31\u0d3f\u0d2f \u0d31\u0d4b\u0d2e\u0d28\u0d4d\u200d \u0d05\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Upper Alpha": "\u0d35\u0d32\u0d3f\u0d2f \u0d06\u0d32\u0d4d\u0d2b\u0d3e \u0d05\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Upper Roman": "\u0d35\u0d32\u0d3f\u0d2f \u0d31\u0d4b\u0d2e\u0d28\u0d4d\u200d \u0d05\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Anchor": "\u0d28\u0d19\u0d4d\u0d15\u0d42\u0d30\u0d02",
-"Name": "\u0d2a\u0d47\u0d30\u0d4d",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0d30\u0d15\u0d4d\u0d37\u0d2a\u0d4d\u0d2a\u0d46\u0d1f\u0d41\u0d24\u0d4d\u0d24\u0d3e\u0d24\u0d4d\u0d24 \u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d \u0d28\u0d3f\u0d32\u0d28\u0d3f\u0d32\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d41. \u0d2a\u0d41\u0d31\u0d24\u0d4d\u0d24\u0d41 \u0d15\u0d1f\u0d15\u0d4d\u0d15\u0d23\u0d4b?",
-"Restore last draft": "\u0d2a\u0d34\u0d2f \u0d21\u0d4d\u0d30\u0d3e\u0d2b\u0d4d\u0d31\u0d4d\u0d31\u0d4d\u200c \u0d24\u0d3f\u0d30\u0d3f\u0d1a\u0d4d\u0d1a\u0d41 \u0d15\u0d4a\u0d23\u0d4d\u0d1f\u0d4d \u0d35\u0d30\u0d3f\u0d15",
-"Special character": "\u0d2a\u0d4d\u0d30\u0d24\u0d4d\u0d2f\u0d47\u0d15\u0d3e\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Source code": "\u0d38\u0d4b\u0d34\u0d4d\u0d38\u0d4d \u0d15\u0d4b\u0d21\u0d4d",
-"Insert\/Edit code sample": "Insert\/Edit code sample",
-"Language": "\u0d2d\u0d3e\u0d37",
-"Code sample": "Code sample",
-"Color": "\u0d28\u0d3f\u0d31\u0d02",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0d07\u0d1f\u0d24\u0d4d\u0d24\u0d4d \u0d28\u0d3f\u0d28\u0d4d\u0d28\u0d41\u0d02 \u0d35\u0d32\u0d24\u0d4d\u0d24\u0d47\u0d15\u0d4d\u0d15\u0d4d",
-"Right to left": "\u0d35\u0d32\u0d24\u0d4d\u0d24\u0d41 \u0d28\u0d3f\u0d28\u0d4d\u0d28\u0d41\u0d02 \u0d07\u0d1f\u0d24\u0d4d\u0d24\u0d47\u0d15\u0d4d\u0d15\u0d4d",
-"Emoticons": "\u0d1a\u0d3f\u0d39\u0d4d\u0d28 \u0d2d\u0d3e\u0d37",
-"Document properties": "\u0d21\u0d4b\u0d15\u0d4d\u0d15\u0d41\u0d2e\u0d46\u0d28\u0d4d\u0d31\u0d4d \u0d17\u0d41\u0d23\u0d35\u0d3f\u0d36\u0d47\u0d37\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Title": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d",
-"Keywords": "\u0d38\u0d42\u0d1a\u0d15\u0d2a\u0d26\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Description": "\u0d35\u0d3f\u0d35\u0d30\u0d23\u0d02",
-"Robots": "\u0d2f\u0d28\u0d4d\u0d24\u0d4d\u0d30\u0d2e\u0d28\u0d41\u0d37\u0d4d\u0d2f\u0d28\u0d4d\u200d",
-"Author": "\u0d32\u0d47\u0d16\u0d15\u0d28\u0d4d\u200d",
-"Encoding": "\u0d0e\u0d7b\u0d15\u0d4b\u0d21\u0d3f\u0d02\u0d17\u0d4d",
-"Fullscreen": "\u0d2b\u0d41\u0d33\u0d4d\u200d\u0d38\u0d4d\u0d15\u0d4d\u0d30\u0d40\u0d28\u0d4d\u200d",
-"Action": "Action",
-"Shortcut": "Shortcut",
-"Help": "Help",
-"Address": "Address",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Insert link (if link plugin activated)",
-"Save (if save plugin activated)": "Save (if save plugin activated)",
-"Find (if searchreplace plugin activated)": "Find (if searchreplace plugin activated)",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "\u0d36\u0d3e\u0d16\u0d3e\u0d2a\u0d3e\u0d24",
-"Insert\/edit image": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15\/ \u0d24\u0d3f\u0d30\u0d41\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"Image description": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30 \u0d35\u0d3f\u0d35\u0d30\u0d23\u0d02",
-"Source": "\u0d09\u0d31\u0d35\u0d3f\u0d1f\u0d02",
-"Dimensions": "\u0d05\u0d33\u0d35\u0d41\u0d15\u0d33\u0d4d\u200d",
-"Constrain proportions": "\u0d28\u0d3f\u0d30\u0d4d\u200d\u0d2c\u0d28\u0d4d\u0d27\u0d3e\u0d28\u0d41\u0d2a\u0d3e\u0d24\u0d02",
-"General": "\u0d2a\u0d4a\u0d24\u0d41\u0d35\u0d3e\u0d2f",
-"Advanced": "\u0d2a\u0d41\u0d30\u0d47\u0d3e\u0d17\u0d2e\u0d3f\u0d1a\u0d4d\u0d1a",
-"Style": "\u0d36\u0d48\u0d32\u0d3f",
-"Vertical space": "\u0d32\u0d02\u0d2c\u0d2e\u0d3e\u0d28\u0d2e\u0d3e\u0d2f \u0d36\u0d42\u0d28\u0d4d\u0d2f\u0d38\u0d4d\u0d25\u0d32\u0d02",
-"Horizontal space": "\u0d24\u0d3f\u0d30\u0d36\u0d4d\u0d1a\u0d40\u0d28\u0d2e\u0d3e\u0d2f \u0d36\u0d42\u0d28\u0d4d\u0d2f\u0d38\u0d4d\u0d25\u0d32\u0d02",
-"Border": "\u0d05\u0d24\u0d3f\u0d30\u0d4d",
-"Insert image": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Image": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d02",
-"Image list": "Image list",
-"Rotate counterclockwise": "\u0d0e\u0d24\u0d3f\u0d7c \u0d18\u0d1f\u0d3f\u0d15\u0d3e\u0d30\u0d26\u0d3f\u0d36\u0d2f\u0d3f\u0d7d \u0d24\u0d3f\u0d30\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Rotate clockwise": "\u0d18\u0d1f\u0d3f\u0d15\u0d3e\u0d30\u0d26\u0d3f\u0d36\u0d2f\u0d3f\u0d7d \u0d24\u0d3f\u0d30\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Flip vertically": "\u0d32\u0d02\u0d2c\u0d2e\u0d3e\u0d2f\u0d3f \u0d24\u0d3f\u0d30\u0d3f\u0d1a\u0d4d\u0d1a\u0d3f\u0d1f\u0d41\u0d15",
-"Flip horizontally": "\u0d24\u0d3f\u0d30\u0d36\u0d4d\u0d1a\u0d40\u0d28\u0d2e\u0d3e\u0d2f\u0d3f \u0d24\u0d3f\u0d30\u0d3f\u0d1a\u0d4d\u0d1a\u0d3f\u0d1f\u0d41\u0d15",
-"Edit image": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d02 \u0d0e\u0d21\u0d3f\u0d31\u0d4d\u0d31\u0d4d \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15",
-"Image options": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30 \u0d38\u0d3e\u0d27\u0d4d\u0d2f\u0d24\u0d15\u0d7e",
-"Zoom in": "\u0d38\u0d42\u0d15\u0d4d\u0d37\u0d4d\u0d2e \u0d35\u0d40\u0d15\u0d4d\u0d37\u0d23\u0d02",
-"Zoom out": "\u0d38\u0d4d\u0d25\u0d42\u0d32 \u0d35\u0d40\u0d15\u0d4d\u0d37\u0d23\u0d02",
-"Crop": "\u0d35\u0d46\u0d1f\u0d4d\u0d1f\u0d3f \u0d1a\u0d41\u0d30\u0d41\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Resize": "\u0d05\u0d33\u0d35\u0d41\u0d15\u0d7e \u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d41\u0d15",
-"Orientation": "\u0d05\u0d2d\u0d3f\u0d35\u0d3f\u0d28\u0d4d\u0d2f\u0d3e\u0d38\u0d02",
-"Brightness": "\u0d2e\u0d3f\u0d34\u0d3f\u0d35\u0d4d",
-"Sharpen": "\u0d24\u0d46\u0d33\u0d3f\u0d2e \u0d15\u0d42\u0d1f\u0d4d\u0d1f\u0d41\u0d15 ",
-"Contrast": "\u0d35\u0d4d\u0d2f\u0d24\u0d3f\u0d30\u0d3f\u0d15\u0d4d\u0d24\u0d24",
-"Color levels": "\u0d35\u0d7c\u0d23\u0d4d\u0d23 \u0d28\u0d3f\u0d32\u0d15\u0d7e",
-"Gamma": "\u0d17\u0d3e\u0d2e\u0d3e",
-"Invert": "\u0d07\u0d7b\u0d35\u0d46\u0d7c\u0d1f\u0d4d \u0d1a\u0d46\u0d2f\u0d4d\u0d2f\u0d41\u0d15",
-"Apply": "\u0d2a\u0d4d\u0d30\u0d2f\u0d4b\u0d17\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Back": "\u0d2a\u0d3f\u0d7b\u0d35\u0d3e\u0d19\u0d4d\u0d19\u0d41\u0d15",
-"Insert date\/time": "\u0d38\u0d2e\u0d2f\u0d02\/\u0d24\u0d40\u0d2f\u0d24\u0d3f \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Date\/time": "Date\/time",
-"Insert link": "\u0d15\u0d23\u0d4d\u0d23\u0d3f \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Insert\/edit link": "\u0d15\u0d23\u0d4d\u0d23\u0d3f \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15\/ \u0d15\u0d23\u0d4d\u0d23\u0d3f \u0d24\u0d3f\u0d30\u0d41\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"Text to display": "\u0d15\u0d3e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d3e\u0d28\u0d41\u0d33\u0d4d\u0d33 \u0d05\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Url": "\u0d2f\u0d42\u0d06\u0d30\u0d4d\u200d\u0d0e\u0d32\u0d4d\u200d",
-"Target": "\u0d32\u0d15\u0d4d\u0d37\u0d4d\u0d2f\u0d02",
-"None": "\u0d12\u0d28\u0d4d\u0d28\u0d41\u0d2e\u0d3f\u0d32\u0d4d\u0d32",
-"New window": "\u0d2a\u0d41\u0d24\u0d3f\u0d2f \u0d1c\u0d3e\u0d32\u0d15\u0d02",
-"Remove link": "\u0d15\u0d23\u0d4d\u0d23\u0d3f \u0d12\u0d34\u0d3f\u0d35\u0d3e\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Anchors": "\u0d28\u0d19\u0d4d\u0d15\u0d42\u0d30\u0d19\u0d4d\u0d19\u0d7e",
-"Link": "\u0d15\u0d23\u0d4d\u0d23\u0d3f ",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Link list": "Link list",
-"Insert video": "\u0d35\u0d40\u0d21\u0d3f\u0d2f\u0d4b \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Insert\/edit video": "\u0d35\u0d40\u0d21\u0d3f\u0d2f\u0d4b \u0d1a\u0d46\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15\/\u0d35\u0d40\u0d21\u0d3f\u0d2f\u0d4b \u0d24\u0d3f\u0d30\u0d41\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"Insert\/edit media": "Insert\/edit media",
-"Alternative source": "\u0d07\u0d24\u0d30 \u0d38\u0d4d\u0d30\u0d4b\u0d24\u0d38\u0d4d\u0d38\u0d4d\u200c",
-"Poster": "\u0d1a\u0d3f\u0d24\u0d4d\u0d30\u0d02",
-"Paste your embed code below:": "\u0d28\u0d3f\u0d19\u0d33\u0d41\u0d1f\u0d46 \u0d0e\u0d02\u0d2c\u0d21\u0d4d \u0d15\u0d4b\u0d21\u0d4d \u0d12\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Embed": "\u0d0e\u0d02\u0d2c\u0d46\u0d21\u0d4d\u200c",
-"Media": "Media",
-"Nonbreaking space": "\u0d2d\u0d02\u0d17\u0d2e\u0d3f\u0d32\u0d4d\u0d32\u0d3e\u0d24\u0d4d\u0d24 \u0d36\u0d42\u0d28\u0d4d\u0d2f\u0d38\u0d4d\u0d25\u0d32\u0d02",
-"Page break": "\u0d24\u0d3e\u0d33\u0d4d\u200d \u0d2d\u0d02\u0d17\u0d02",
-"Paste as text": "\u0d1f\u0d46\u0d15\u0d4d\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4d\u200c \u0d06\u0d2f\u0d3f \u0d12\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Preview": "\u0d15\u0d30\u0d1f\u0d41\u0d2a\u0d24\u0d3f\u0d2a\u0d4d\u0d2a\u0d4d",
-"Print": "\u0d05\u0d1a\u0d4d\u0d1a\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Save": "\u0d30\u0d15\u0d4d\u0d37\u0d2a\u0d4d\u0d2a\u0d46\u0d1f\u0d41\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"Find": "\u0d24\u0d3f\u0d30\u0d2f\u0d41\u0d15",
-"Replace with": "\u0d2e\u0d31\u0d4d\u0d31\u0d4a\u0d28\u0d4d\u0d28\u0d3f\u0d28\u0d4b\u0d1f\u0d4d \u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d3f\u0d35\u0d2f\u0d4d\u200c\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Replace": "\u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d3f\u0d35\u0d2f\u0d4d\u200c\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Replace all": "\u0d0e\u0d32\u0d4d\u0d32\u0d3e\u0d02 \u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d3f\u0d35\u0d2f\u0d4d\u200c\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Prev": "\u0d2a\u0d3f\u0d28\u0d4d\u0d28\u0d4b\u0d1f\u0d4d\u0d1f\u0d4d",
-"Next": "\u0d2e\u0d41\u0d28\u0d4d\u0d28\u0d4b\u0d1f\u0d4d\u0d1f\u0d4d",
-"Find and replace": "\u0d15\u0d23\u0d4d\u0d1f\u0d41\u0d2a\u0d3f\u0d1f\u0d3f\u0d1a\u0d4d\u0d1a\u0d41 \u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d3f\u0d35\u0d2f\u0d4d\u200c\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Could not find the specified string.": "\u0d09\u0d26\u0d4d\u0d26\u0d47\u0d36\u0d3f\u0d1a\u0d4d\u0d1a \u0d35\u0d3e\u0d1a\u0d15\u0d02 \u0d15\u0d23\u0d4d\u0d1f\u0d41\u0d2a\u0d3f\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d3e\u0d28\u0d3e\u0d2f\u0d3f\u0d32\u0d4d\u0d32.",
-"Match case": "\u0d24\u0d41\u0d32\u0d4d\u0d2f\u0d2e\u0d3e\u0d2f\u0d24\u0d4d",
-"Whole words": "\u0d0e\u0d32\u0d4d\u0d32\u0d3e \u0d35\u0d3e\u0d15\u0d4d\u0d15\u0d41\u0d15\u0d33\u0d41\u0d02",
-"Spellcheck": "\u0d05\u0d15\u0d4d\u0d37\u0d30\u0d35\u0d3f\u0d28\u0d4d\u0d2f\u0d3e\u0d38\u0d02 \u0d2a\u0d30\u0d3f\u0d36\u0d4b\u0d27\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Ignore": "\u0d05\u0d35\u0d17\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Ignore all": "\u0d0e\u0d32\u0d4d\u0d32\u0d3e\u0d02 \u0d05\u0d35\u0d17\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Finish": "\u0d05\u0d35\u0d38\u0d3e\u0d28\u0d3f\u0d2a\u0d4d\u0d2a\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Add to Dictionary": "Add to Dictionary",
-"Insert table": "\u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15 \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Table properties": "\u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d2f\u0d41\u0d1f\u0d46 \u0d38\u0d4d\u0d35\u0d2d\u0d3e\u0d35\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Delete table": "\u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15 \u0d15\u0d33\u0d2f\u0d41\u0d15",
-"Cell": "\u0d05\u0d31",
-"Row": "\u0d28\u0d3f\u0d30",
-"Column": "\u0d35\u0d30\u0d3f",
-"Cell properties": "\u0d05\u0d31\u0d2f\u0d41\u0d1f\u0d46 \u0d38\u0d4d\u0d35\u0d2d\u0d3e\u0d35\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Merge cells": "\u0d05\u0d31\u0d15\u0d33\u0d4d\u200d \u0d15\u0d42\u0d1f\u0d4d\u0d1f\u0d3f\u0d2f\u0d4b\u0d1c\u0d3f\u0d2a\u0d4d\u0d2a\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Split cell": "\u0d05\u0d31\u0d15\u0d33\u0d4d\u200d \u0d35\u0d3f\u0d2d\u0d1c\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Insert row before": "\u0d2e\u0d41\u0d2e\u0d4d\u0d2a\u0d3f\u0d32\u0d4d\u200d \u0d2a\u0d41\u0d24\u0d3f\u0d2f \u0d28\u0d3f\u0d30 \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Insert row after": "\u0d2a\u0d3f\u0d31\u0d15\u0d3f\u0d32\u0d4d\u200d \u0d2a\u0d41\u0d24\u0d3f\u0d2f \u0d28\u0d3f\u0d30 \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Delete row": "\u0d28\u0d3f\u0d30 \u0d24\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d33\u0d2f\u0d41\u0d15",
-"Row properties": "\u0d28\u0d3f\u0d30\u0d2f\u0d41\u0d1f\u0d46 \u0d38\u0d4d\u0d35\u0d2d\u0d3e\u0d35\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d",
-"Cut row": "\u0d28\u0d3f\u0d30 \u0d35\u0d46\u0d1f\u0d4d\u0d1f\u0d3f\u0d2e\u0d3e\u0d31\u0d4d\u0d31\u0d41\u0d15",
-"Copy row": "\u0d28\u0d3f\u0d30 \u0d2a\u0d15\u0d30\u0d4d\u200d\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"Paste row before": "\u0d28\u0d3f\u0d30 \u0d2e\u0d41\u0d2e\u0d4d\u0d2a\u0d3e\u0d2f\u0d3f \u0d12\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Paste row after": "\u0d28\u0d3f\u0d30 \u0d36\u0d47\u0d37\u0d02 \u0d12\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Insert column before": "\u0d2e\u0d41\u0d2e\u0d4d\u0d2a\u0d3f\u0d32\u0d4d\u200d \u0d2a\u0d41\u0d24\u0d3f\u0d2f \u0d35\u0d30\u0d3f \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Insert column after": "\u0d2a\u0d3f\u0d31\u0d15\u0d3f\u0d32\u0d4d\u200d \u0d2a\u0d41\u0d24\u0d3f\u0d2f \u0d35\u0d30\u0d3f \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Delete column": "\u0d35\u0d30\u0d3f \u0d24\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d33\u0d2f\u0d41\u0d15",
-"Cols": "\u0d35\u0d30\u0d3f\u0d15\u0d33\u0d4d\u200d",
-"Rows": "\u0d28\u0d3f\u0d30\u0d15\u0d33\u0d4d\u200d",
-"Width": "\u0d28\u0d40\u0d33\u0d02",
-"Height": "\u0d09\u0d2f\u0d30\u0d02",
-"Cell spacing": "\u0d05\u0d31\u0d15\u0d33\u0d4d\u200d \u0d24\u0d2e\u0d4d\u0d2e\u0d3f\u0d32\u0d41\u0d33\u0d4d\u0d33 \u0d05\u0d15\u0d32\u0d02",
-"Cell padding": "\u0d05\u0d31 \u0d2a\u0d3e\u0d21\u0d3f\u0d02\u0d17\u0d4d",
-"Caption": "\u0d24\u0d32\u0d35\u0d3e\u0d1a\u0d15\u0d02",
-"Left": "\u0d07\u0d1f\u0d24\u0d4d",
-"Center": "\u0d28\u0d1f\u0d41\u0d35\u0d3f\u0d32\u0d4d\u200d",
-"Right": "\u0d35\u0d32\u0d24\u0d4d",
-"Cell type": "\u0d05\u0d31\u0d2f\u0d41\u0d1f\u0d46 \u0d2e\u0d3e\u0d24\u0d43\u0d15",
-"Scope": "\u0d35\u0d4d\u0d2f\u0d3e\u0d2a\u0d4d\u200c\u0d24\u0d3f",
-"Alignment": "\u0d05\u0d23\u0d3f\u0d28\u0d3f\u0d30\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"H Align": "H Align",
-"V Align": "V Align",
-"Top": "Top",
-"Middle": "Middle",
-"Bottom": "Bottom",
-"Header cell": "\u0d24\u0d32 \u0d05\u0d31",
-"Row group": "\u0d28\u0d3f\u0d30 \u0d17\u0d23\u0d02",
-"Column group": "\u0d35\u0d30\u0d3f \u0d17\u0d23\u0d02",
-"Row type": "\u0d28\u0d3f\u0d30 \u0d2e\u0d3e\u0d24\u0d43\u0d15",
-"Header": "\u0d24\u0d32\u0d15\u0d4d\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d4d\u200c",
-"Body": "\u0d36\u0d30\u0d40\u0d30\u0d02",
-"Footer": "\u0d05\u0d1f\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d31\u0d3f\u0d2a\u0d4d\u0d2a\u0d4d\u200c",
-"Border color": "Border color",
-"Insert template": "\u0d05\u0d1a\u0d4d\u0d1a\u0d41\u0d15\u0d33\u0d4d\u200d \u0d1a\u0d47\u0d30\u0d4d\u200d\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Templates": "\u0d05\u0d1a\u0d4d\u0d1a\u0d41\u0d15\u0d33\u0d4d\u200d",
-"Template": "Template",
-"Text color": "\u0d05\u0d15\u0d4d\u0d37\u0d30 \u0d28\u0d3f\u0d31\u0d02",
-"Background color": "\u0d2a\u0d36\u0d4d\u0d1a\u0d3e\u0d24\u0d4d\u0d24\u0d32 \u0d28\u0d3f\u0d31\u0d02",
-"Custom...": "Custom...",
-"Custom color": "Custom color",
-"No color": "No color",
-"Table of Contents": "Table of Contents",
-"Show blocks": "\u0d2c\u0d4d\u0d32\u0d4b\u0d15\u0d4d\u0d15\u0d41\u0d15\u0d33\u0d4d\u200d \u0d15\u0d3e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Show invisible characters": "\u0d05\u0d26\u0d43\u0d36\u0d4d\u0d2f\u0d2e\u0d3e\u0d2f \u0d05\u0d15\u0d4d\u0d37\u0d30\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d \u0d15\u0d3e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"Words: {0}": "\u0d35\u0d3e\u0d15\u0d4d\u0d15\u0d41\u0d15\u0d33\u0d4d\u200d: {0}",
-"{0} words": "{0} words",
-"File": "\u0d2b\u0d2f\u0d32\u0d4d\u200d",
-"Edit": "\u0d24\u0d3f\u0d30\u0d41\u0d24\u0d4d\u0d24\u0d41\u0d15",
-"Insert": "\u0d2a\u0d24\u0d3f\u0d15\u0d4d\u0d15\u0d41\u0d15",
-"View": "\u0d26\u0d30\u0d4d\u200d\u0d36\u0d28\u0d02",
-"Format": "\u0d15\u0d46\u0d1f\u0d4d\u0d1f\u0d41\u0d02\u0d2e\u0d1f\u0d4d\u0d1f\u0d41\u0d02",
-"Table": "\u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15",
-"Tools": "\u0d09\u0d2a\u0d15\u0d30\u0d23\u0d19\u0d4d\u0d19\u0d33\u0d4d\u200d ",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0d31\u0d3f\u0d1a\u0d4d\u0d1a\u0d4d \u0d1f\u0d46\u0d15\u0d4d\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4d\u200c \u0d2e\u0d47\u0d16\u0d32.  \u0d35\u0d3f\u0d37\u0d2f \u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15 \u0d15\u0d4d\u0d15\u0d3e\u0d2f\u0d3f ALT-F9  \u0d05\u0d2e\u0d30\u0d4d\u0d24\u0d4d\u0d24\u0d41\u0d15. \u0d09\u0d2a\u0d15\u0d30\u0d23 \u0d2a\u0d1f\u0d4d\u0d1f\u0d3f\u0d15\u0d15\u0d4d\u0d15\u0d3e\u0d2f\u0d3f ALT-F10 \u0d05\u0d2e\u0d30\u0d4d\u200d\u0d24\u0d4d\u0d24\u0d41\u0d15.  \u0d38\u0d39\u0d3e\u0d2f\u0d24\u0d4d\u0d24\u0d3f\u0d28\u0d41 ALT-0 \u0d09\u0d02"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/nl_BE.js Added

@@ -0,0 +1,445 @@
+tinymce.addI18n('nl_BE',{
+"Redo": "Opnieuw doen",
+"Undo": "Ongedaan maken",
+"Cut": "Knippen",
+"Copy": "Kopi\u00ebren",
+"Paste": "Plakken",
+"Select all": "Alles selecteren",
+"New document": "Nieuw document",
+"Ok": "Ok",
+"Cancel": "Annuleren",
+"Visual aids": "Visuele hulpmiddelen",
+"Bold": "Vet",
+"Italic": "Cursief",
+"Underline": "Onderlijnd",
+"Strikethrough": "Doorstreept",
+"Superscript": "Superscript",
+"Subscript": "Subscript",
+"Clear formatting": "Opmaak verwijderen",
+"Align left": "Links uitlijnen",
+"Align center": "Centreren",
+"Align right": "Rechts uitlijnen",
+"Justify": "Distribueren",
+"Bullet list": "Ongeordende lijst",
+"Numbered list": "Geordende lijst",
+"Decrease indent": "Inspringing verkleinen",
+"Increase indent": "Inspringing vergroten",
+"Close": "Sluiten",
+"Formats": "Formaten",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Uw browser ondersteunt geen directe toegang tot het klembord. Gelieve de CTRL+X\/C\/V toetsen te gebruiken.",
+"Headers": "Kopteksten",
+"Header 1": "Koptekst 1",
+"Header 2": "Koptekst 2",
+"Header 3": "Koptekst 3",
+"Header 4": "Koptekst 4",
+"Header 5": "Koptekst 5",
+"Header 6": "Koptekst 6",
+"Headings": "Hoofdingen",
+"Heading 1": "Hoofding 1",
+"Heading 2": "Hoofding 2",
+"Heading 3": "Hoofding 3",
+"Heading 4": "Hoofding 4",
+"Heading 5": "Hoofding 5",
+"Heading 6": "Hoofding 6",
+"Preformatted": "Gepreformateerd",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "Code",
+"Paragraph": "Paragraaf",
+"Blockquote": "Citaat",
+"Inline": "In tekstregel",
+"Blocks": "Blokken",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Plakken is nu in gewone tekst modus. Elementen zullen nu als gewone tekst geplakt worden tot u deze optie uit schakelt.",
+"Fonts": "Lettertypen",
+"Font Sizes": "Lettergrootte",
+"Class": "Class",
+"Browse for an image": "Een afbeelding zoeken",
+"OR": "OF",
+"Drop an image here": "Plaats hier een afbeelding",
+"Upload": "Uploaden",
+"Block": "Vierkant",
+"Align": "Aligneer",
+"Default": "Standaard",
+"Circle": "Cirkel",
+"Disc": "Schijf",
+"Square": "Vierkant",
+"Lower Alpha": "Kleine letters",
+"Lower Greek": "Klein Grieks schrift",
+"Lower Roman": "Klein Latijns schrift",
+"Upper Alpha": "Hoofdletters",
+"Upper Roman": "Hoofdletters Latijns",
+"Anchor...": "Anker...",
+"Name": "Naam",
+"Id": "Id",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Een id moet met een letter beginnen, gevolgd door letters, nummers, strepen, punten, dubbele punten of liggende streepjes.",
+"You have unsaved changes are you sure you want to navigate away?": "U heeft niet opgeslagen wijzigingen bent u zeker dat u de pagina wilt verlaten?",
+"Restore last draft": "Laatste concept herstellen",
+"Special character...": "Speciaal karakter...",
+"Source code": "Broncode",
+"Insert\/Edit code sample": "Codevoorbeeld invoegen\/bewerken",
+"Language": "Taal",
+"Code sample...": "Codevoorbeeld...",
+"Color Picker": "Kleurenkiezer",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "Links naar rechts",
+"Right to left": "Rechts naar links",
+"Emoticons": "Emoticons",
+"Emoticons...": "Emoticons...",
+"Metadata and Document Properties": "Metadata en Document Eigenschappen",
+"Title": "Titel",
+"Keywords": "Sleutelwoorden",
+"Description": "Omschrijving",
+"Robots": "Robots",
+"Author": "Auteur",
+"Encoding": "Bestandscodering",
+"Fullscreen": "Schermvullend",
+"Action": "Actie",
+"Shortcut": "Snelkoppeling",
+"Help": "Help",
+"Address": "Adres",
+"Focus to menubar": "Focus naar menubalk",
+"Focus to toolbar": "Focus naar werkbalk",
+"Focus to element path": "Focus naar elementenpad",
+"Focus to contextual toolbar": "Focus naar contextuele werkbalk",
+"Insert link (if link plugin activated)": "Link invoegen (als link plug-in geactiveerd is)",
+"Save (if save plugin activated)": "Opslaan (als opslaan plug-in geactiveerd is)",
+"Find (if searchreplace plugin activated)": "Zoeken (als zoeken\/vervangen plug-in geactiveerd is)",
+"Plugins installed ({0}):": "Ge\u00efnstalleerde plugins ({0}):",
+"Premium plugins:": "Premium plug-ins:",
+"Learn more...": "Leer meer...",
+"You are using {0}": "U gebruikt {0}",
+"Plugins": "Plug-ins",
+"Handy Shortcuts": "Handige snelkoppelingen",
+"Horizontal line": "Horizontale lijn",
+"Insert\/edit image": "Afbeelding invoegen\/bewerken",
+"Alternative description": "Alternatieve beschrijving",
+"Accessibility": "Toegankelijkheid",
+"Image is decorative": "Afbeelding is decoratief",
+"Source": "Bron",
+"Dimensions": "Afmetingen",
+"Constrain proportions": "Verhoudingen begrenzen",
+"General": "Algemeen",
+"Advanced": "Geavanceerd",
+"Style": "Stijl",
+"Vertical space": "Verticale ruimte",
+"Horizontal space": "Horizontale ruimte",
+"Border": "Rand",
+"Insert image": "Afbeelding invoegen",
+"Image...": "Afbeelding...",
+"Image list": "Afbeeldingenlijst",
+"Rotate counterclockwise": "Linksom draaien",
+"Rotate clockwise": "Rechtsom draaien",
+"Flip vertically": "Verticaal spiegelen",
+"Flip horizontally": "Horizontaal spiegelen",
+"Edit image": "Afbeelding bewerken",
+"Image options": "Afbeeldingsopties",
+"Zoom in": "Inzoomen",
+"Zoom out": "Uitzoomen",
+"Crop": "Bijsnijden",
+"Resize": "Herschalen",
+"Orientation": "Ori\u00ebntatie",
+"Brightness": "Helderheid",
+"Sharpen": "Verscherpen",
+"Contrast": "Contrast",
+"Color levels": "Kleurniveau's",
+"Gamma": "Gamma",
+"Invert": "Omkeren",
+"Apply": "Toepassen",
+"Back": "Terug",
+"Insert date\/time": "Datum\/tijd invoegen",
+"Date\/time": "Datum\/tijd",
+"Insert\/edit link": "Link invoegen\/bewerken",
+"Text to display": "Weer te geven tekst",
+"Url": "Url",
+"Open link in...": "Link openen in...",
+"Current window": "Huidig venster",
+"None": "Geen",
+"New window": "Nieuw venster",
+"Open link": "Link openen",
+"Remove link": "Link verwijderen",
+"Anchors": "Ankers",
+"Link...": "Link...",
+"Paste or type a link": "Link plakken of typen",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "De ingevoerde URL lijkt op een e-mailadres. Wilt u er het vereiste voorvoegsel mailto: aan toevoegen?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "De ingevoerde URL lijkt op een externe link. Wilt u er het vereiste voorvoegsel http:\/\/ aan toevoegen?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "De ingevoerde URL lijkt op een externe link. Wilt u er het vereiste voorvoegsel https:\/\/ aan toevoegen?",
+"Link list": "Link lijst",
+"Insert video": "Video invoegen",
+"Insert\/edit video": "Video invoegen\/bewerken",
+"Insert\/edit media": "Media invoegen\/bewerken",
+"Alternative source": "Alternatieve bron",
+"Alternative source URL": "Alternatieve bron URL",
+"Media poster (Image URL)": "Mediaposter (Afbeelding URL)",
+"Paste your embed code below:": "Plak de in te sluiten code hieronder:",
+"Embed": "Insluiten",
+"Media...": "Media...",
+"Nonbreaking space": "Vaste spatie",
+"Page break": "Pagina-einde",
+"Paste as text": "Plakken als tekst",
+"Preview": "Voorbeeld",
+"Print...": "Afdrukken...",
+"Save": "Opslaan",
+"Find": "Zoeken",
+"Replace with": "Vervangen door",
+"Replace": "Vervangen",
+"Replace all": "Alles vervangen",
+"Previous": "Vorige",
+"Next": "Volgende",
+"Find and Replace": "Zoeken en Vervangen",
+"Find and replace...": "Zoeken en vervangen...",
+"Could not find the specified string.": "Kon de gespecificeerde string niet vinden.",
+"Match case": "Hoofdlettergevoelig",
+"Find whole words only": "Enkel volledige woorden",
+"Find in selection": "Zoeken in selectie",
+"Spellcheck": "Spellingscontrole",
+"Spellcheck Language": "Spellingscontrole Taal",
+"No misspellings found.": "Geen spelfouten gevonden.",
+"Ignore": "Negeren",
+"Ignore all": "Alles negeren",
+"Finish": "Voltooien",
+"Add to Dictionary": "Aan woordenboek toevoegen",
+"Insert table": "Tabel invoegen",
+"Table properties": "Tabeleigenschappen",
+"Delete table": "Tabel verwijderen",
+"Cell": "Cel",
+"Row": "Rij",
+"Column": "Kolom",
+"Cell properties": "Celeigenschappen",
+"Merge cells": "Cellen samenvoegen",
+"Split cell": "Cel splitsen",
+"Insert row before": "Rij boven invoegen",
+"Insert row after": "Rij onder invoegen",
+"Delete row": "Rij verwijderen",
+"Row properties": "Rijeigenschappen",
+"Cut row": "Rij knippen",
+"Copy row": "Rij kopi\u00ebren",
+"Paste row before": "Rij boven plakken",
+"Paste row after": "Rij onder plakken",
+"Insert column before": "Kolom invoegen voor",
+"Insert column after": "Kolom invoegen na",
+"Delete column": "Kolom verwijderen",
+"Cols": "Kolommen",
+"Rows": "Rijen",
+"Width": "Breedte\\v",
+"Height": "Hoogte",
+"Cell spacing": "Celafstand",
+"Cell padding": "Celopvulling",
+"Caption": "Bijschrift",
+"Show caption": "Bijschrift tonen",
+"Left": "Links",
+"Center": "Midden",
+"Right": "Rechts",
+"Cell type": "Celtype",
+"Scope": "Bereik",
+"Alignment": "Uitlijning",
+"H Align": "H uitlijnen",
+"V Align": "V uitlijnen",
+"Top": "Boven",
+"Middle": "Midden",
+"Bottom": "Onder",
+"Header cell": "Koptekstcel",
+"Row group": "Rijgroep",
+"Column group": "Kolomgroep",
+"Row type": "Rijtype",
+"Header": "Koptekst",
+"Body": "Hoofdtekst",
+"Footer": "Voettekst",
+"Border color": "Randkleur",
+"Insert template...": "Sjabloon invoegen...",
+"Templates": "Sjablonen",
+"Template": "Sjabloon",
+"Text color": "Tekstkleur",
+"Background color": "Achtergrondkleur",
+"Custom...": "Aangepast...",
+"Custom color": "Aangepaste kleur",
+"No color": "Geen kleur",
+"Remove color": "Kleur verwijderen",
+"Table of Contents": "Inhoudsopgave",
+"Show blocks": "Blokken tonen",
+"Show invisible characters": "Onzichtbare tekens tonen",
+"Word count": "Aantal woorden",
+"Count": "Tellen",
+"Document": "Document",
+"Selection": "Selectie",
+"Words": "Woorden",
+"Words: {0}": "Woorden: {0}",
+"{0} words": "{0} woorden",
+"File": "Bestand",
+"Edit": "Bewerken",
+"Insert": "Invoegen",
+"View": "Tonen",
+"Format": "Formaat",
+"Table": "Tabel",
+"Tools": "Gereedschappen",
+"Powered by {0}": "Aangedreven door {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Druk op Alt-F9 voor menu. Druk op Alt-F10 voor gereedschapsbalk. Druk op Alt-0 voor help",
+"Image title": "Afbeeldingstitel",
+"Border width": "Randbreedte",
+"Border style": "Randstijl",
+"Error": "Fout",
+"Warn": "Waarschuwen",
+"Valid": "Geldig",
+"To open the popup, press Shift+Enter": "Druk op Shift+Enter om de pop-up te openen",
+"Rich Text Area. Press ALT-0 for help.": "Rich Text Area. Druk op Alt-0 voor help.",
+"System Font": "Systeemlettertype",
+"Failed to upload image: {0}": "Afbeelding uploaden niet gelukt: {0}",
+"Failed to load plugin: {0} from url {1}": "Plug-in laden niet gelukt: {0} vanaf url {1}",
+"Failed to load plugin url: {0}": "Plug-in URL laden niet gelukt: {0}",
+"Failed to initialize plugin: {0}": "Plug-in initialiseren niet gelukt: {0}",
+"example": "voorbeeld",
+"Search": "Zoeken",
+"All": "Alle",
+"Currency": "Valuta",
+"Text": "Tekst",
+"Quotations": "Citaten",
+"Mathematical": "Wiskundig",
+"Extended Latin": "Latijn uitgebreid",
+"Symbols": "Symbolen",
+"Arrows": "Pijlen",
+"User Defined": "Gebruiker Gedefinieerd",
+"dollar sign": "dollar teken",
+"currency sign": "valuta teken",
+"euro-currency sign": "euro valuta teken",
+"colon sign": "colon teken",
+"cruzeiro sign": "cruzeiro teken",
+"french franc sign": "franse frank teken",
+"lira sign": "lire teken",
+"mill sign": "mill teken",
+"naira sign": "naira teken",
+"peseta sign": "peseta teken",
+"rupee sign": "roepie teken",
+"won sign": "won teken",
+"new sheqel sign": "nieuwe shekel teken",
+"dong sign": "dong teken",
+"kip sign": "kip teken",
+"tugrik sign": "tugrik teken",
+"drachma sign": "drachme teken",
+"german penny symbol": "duitse pfennig teken",
+"peso sign": "peso teken",
+"guarani sign": "guarani teken",
+"austral sign": "austral teken",
+"hryvnia sign": "hryvnia teken",
+"cedi sign": "cedi teken",
+"livre tournois sign": "tours pond teken",
+"spesmilo sign": "spesmilo teken",
+"tenge sign": "tenge teken",
+"indian rupee sign": "indische roepie teken",
+"turkish lira sign": "turkse lira teken",
+"nordic mark sign": "noordse mark teken",
+"manat sign": "manat teken",
+"ruble sign": "roebel teken",
+"yen character": "yen karakter",
+"yuan character": "yuan karakter",
+"yuan character, in hong kong and taiwan": "yuan karakter, in hong kong en taiwan",
+"yen\/yuan character variant one": "yen\/yuan karakter variant een",
+"Loading emoticons...": "Emoticons laden...",
+"Could not load emoticons": "Kon emoticons niet laden",
+"People": "Mensen",
+"Animals and Nature": "Dieren en natuur",
+"Food and Drink": "Voedsel en drank",
+"Activity": "Activiteit",
+"Travel and Places": "Reizen en plaatsen",
+"Objects": "Voorwerpen",
+"Flags": "Vlaggen",
+"Characters": "Karakters",
+"Characters (no spaces)": "Karakters (zonder spaties)",
+"{0} characters": "{0} karakters",
+"Error: Form submit field collision.": "Fout: Veldconflict bij versturen formulier.",
+"Error: No form element found.": "Fout: Geen formulierelement gevonden.",
+"Update": "Updaten",
+"Color swatch": "Kleurenstaal",
+"Turquoise": "Turkoois",
+"Green": "Groen",
+"Blue": "Blauw",
+"Purple": "Paars",
+"Navy Blue": "Marineblauw",
+"Dark Turquoise": "Donker turkoois",
+"Dark Green": "Donker groen",
+"Medium Blue": "Middelblauw",
+"Medium Purple": "Middelpaars",
+"Midnight Blue": "Middernachtblauw",
+"Yellow": "Geel",
+"Orange": "Oranje",
+"Red": "Rood",
+"Light Gray": "Lichtgrijs",
+"Gray": "Grijs",
+"Dark Yellow": "Donker Geel",
+"Dark Orange": "Donker Oranje",
+"Dark Red": "Donker Rood",
+"Medium Gray": "Middel Grijs",
+"Dark Gray": "Donker Grijs",
+"Light Green": "Licht Groen",
+"Light Yellow": "Licht Geel",
+"Light Red": "Licht Rood",
+"Light Purple": "Licht Paars",
+"Light Blue": "Licht Blauw",
+"Dark Purple": "Donker Paars",
+"Dark Blue": "Donker Blauw",
+"Black": "Zwart",
+"White": "Wit",
+"Switch to or from fullscreen mode": "Schakelen naar of vanuit volledige schermmodus",
+"Open help dialog": "Helpdialoog openen",
+"history": "geschiedenis",
+"styles": "stijlen",
+"formatting": "opmaak",
+"alignment": "uitlijning",
+"indentation": "inspringing",
+"Font": "Lettertype",
+"Size": "Grootte",
+"More...": "Meer...",
+"Select...": "Selecteren...",
+"Preferences": "Voorkeuren",
+"Yes": "Ja",
+"No": "Nee",
+"Keyboard Navigation": "Toetsenbord navigatie",
+"Version": "Versie",
+"Code view": "Codeweergave",
+"Open popup menu for split buttons": "Open pop-up menu voor gesplitste knoppen",
+"List Properties": "Lijst Eigenschappen",
+"List properties...": "Lijst eigenschappen...",
+"Start list at number": "Begin lijst bij nummer",
+"Line height": "Regelhoogte",
+"comments": "opmerkingen",
+"Format Painter": "Format Painter",
+"Insert\/edit iframe": "iFrame invoegen\/bewerken",
+"Capitalization": "Hoofdlettergebruik",
+"lowercase": "kleine letters",
+"UPPERCASE": "HOOFDLETTERS",
+"Title Case": "Titel hoofdlettergebruik",
+"permanent pen": "permanente pen",
+"Permanent Pen Properties": "Permanent Pen Eigenschappen",
+"Permanent pen properties...": "Permanent pen eigenschappen...",
+"case change": "hoofdlettergebruik veranderen",
+"page embed": "pagina insluiten",
+"Advanced sort...": "Geavanceerd sorteren...",
+"Advanced Sort": "Geavanceerd Sorteren",
+"Sort table by column ascending": "Sorteer tabel per kolom in oplopende volgorde",
+"Sort table by column descending": "Sorteer tabel per kolom in aflopende volgorde",
+"Sort": "Sorteren",
+"Order": "Ordenen",
+"Sort by": "Sorteren op",
+"Ascending": "Oplopend",
+"Descending": "Aflopend",
+"Column {0}": "Kolom {0}",
+"Row {0}": "Rij {0}",
+"Spellcheck...": "Spellingscontrole...",
+"Misspelled word": "Fout gespeld woord",
+"Suggestions": "Suggesties",
+"Change": "Wijzigen",
+"Finding word suggestions": "Woordsuggesties zoeken",
+"Success": "Gelukt",
+"Repair": "Herstellen",
+"Issue {0} of {1}": "Probleem {0} van {1}",
+"Images must be marked as decorative or have an alternative text description": "Afbeeldingen markeren als decoratief of alternatieve tekstbeschrijving geven",
+"Images must have an alternative text description. Decorative images are not allowed.": "Afbeeldingen moeten een alternatieve tekstbeschrijving hebben. Decoratieve afbeeldingen zijn niet toegelaten.",
+"Or provide alternative text:": "Of voorzie alternatieve tekst:",
+"Make image decorative:": "Afbeelding decoratief maken",
+"ID attribute must be unique": "ID attribuut moet uniek zijn",
+"Make ID unique": "ID uniek maken",
+"Keep this ID and remove all others": "Dit ID behouden en alle andere verwijderen",
+"Remove this ID": "Dit ID verwijderen",
+"Remove all IDs": "Alle IDs verwijderen",
+"Checklist": "Controlelijst"
+});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/oc.js Deleted

@@ -1,415 +0,0 @@
-tinymce.addI18n('oc',{
-"Redo": "Refar",
-"Undo": "Desfar",
-"Cut": "Talhar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar tot",
-"New document": "Document nov\u00e8l",
-"Ok": "D'ac\u00f2rdi",
-"Cancel": "Anullar",
-"Visual aids": "Ajudas visualas",
-"Bold": "Gras",
-"Italic": "Italica",
-"Underline": "Solinhat",
-"Strikethrough": "Ralhat",
-"Superscript": "Exponent",
-"Subscript": "Indici",
-"Clear formatting": "Escafar la mesa en forma",
-"Align left": "Alinhar a esqu\u00e8rra",
-"Align center": "Alinhar al centre",
-"Align right": "Alinhar a drecha",
-"Justify": "Justificar",
-"Bullet list": "Piuses",
-"Numbered list": "Lista numerotada",
-"Decrease indent": "Demesir l'alin\u00e8a",
-"Increase indent": "Aumentar l'alin\u00e8a",
-"Close": "Tampar",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00f2stre navigador sup\u00f2rta pas la c\u00f2pia dir\u00e8cta. Merc\u00e9 d'utilizar las t\u00f2cas Ctrl+X\/C\/V.",
-"Headers": "Ent\u00e8stas",
-"Header 1": "Ent\u00e8sta 1",
-"Header 2": "Ent\u00e8sta 2",
-"Header 3": "Ent\u00e8sta 3",
-"Header 4": "Ent\u00e8sta 4",
-"Header 5": "Ent\u00e8sta 5",
-"Header 6": "Ent\u00e8sta 6",
-"Headings": "T\u00edtols",
-"Heading 1": "T\u00edtol 1",
-"Heading 2": "T\u00edtol 2",
-"Heading 3": "T\u00edtol 3",
-"Heading 4": "T\u00edtol 4",
-"Heading 5": "T\u00edtol 5",
-"Heading 6": "T\u00edtol 6",
-"Preformatted": "Preformatat",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f2de",
-"Paragraph": "Paragraf",
-"Blockquote": "Citacion",
-"Inline": "En linha",
-"Blocks": "Bl\u00f2ts",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Lo quichapapi\u00e8rs es ara en m\u00f2de \"t\u00e8xte plen\". Los contenguts ser\u00e0n pegats sens ret\u00e9ner los formatatges fins al moment que desactivaretz aquesta opcion.",
-"Fonts": "Polissas",
-"Font Sizes": "Talhas de poli\u00e7a",
-"Class": "Class",
-"Browse for an image": "Cercar un imatge",
-"OR": "O",
-"Drop an image here": "Depausatz un imatge aqu\u00ed",
-"Upload": "Enviar",
-"Block": "Bl\u00f2c",
-"Align": "Alinhament",
-"Default": "Per defaut",
-"Circle": "Cercle",
-"Disc": "Disc",
-"Square": "Carrat",
-"Lower Alpha": "Alfa minuscula",
-"Lower Greek": "Gr\u00e8c minuscula",
-"Lower Roman": "Roman minuscula",
-"Upper Alpha": "Alfa majuscula",
-"Upper Roman": "Roman majuscula",
-"Anchor...": "Ancora...",
-"Name": "Nom",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Los ID devon comen\u00e7ar amb una letra e \u00e8sser seguit per de letras, nombres, jonhent, punts o  punt-virgulas.",
-"You have unsaved changes are you sure you want to navigate away?": "Av\u00e8tz de modificacions pas enregistradas, s\u00e8tz segur que vol\u00e8tz quitar la pagina ?",
-"Restore last draft": "Restablir lo darri\u00e8r borrolhon",
-"Special character...": "Caract\u00e8r especial...",
-"Source code": "C\u00f2de font",
-"Insert\/Edit code sample": "Inserir\/Modificar exemple de c\u00f2di",
-"Language": "Lenga",
-"Code sample...": "Exemple de c\u00f2di...",
-"Color Picker": "Trapador de color",
-"R": "R",
-"G": "V",
-"B": "B",
-"Left to right": "D'esqu\u00e8rra cap a drecha",
-"Right to left": "De drecha cap a esqu\u00e8rra",
-"Emoticons...": "Emoticons...",
-"Metadata and Document Properties": "Metadonadas e proprietats del document",
-"Title": "T\u00edtol",
-"Keywords": "Mots claus",
-"Description": "Descripcion",
-"Robots": "Rob\u00f2ts",
-"Author": "Autor",
-"Encoding": "Encodatge",
-"Fullscreen": "Ecran complet",
-"Action": "Accion",
-"Shortcut": "Acorchi",
-"Help": "Ajuda",
-"Address": "Adre\u00e7as",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Inserir un ligam (se l\u2019extension Ligam es activada)",
-"Save (if save plugin activated)": "Enregistrar (se l\u2019exension Enregistrar es activada)",
-"Find (if searchreplace plugin activated)": "Cercar (se l\u2019extension Searchreplace es activada)",
-"Plugins installed ({0}):": "Extensions installadas ({0})\u202f:",
-"Premium plugins:": "Extensions Premium\u202f:",
-"Learn more...": "Ne saber mai...",
-"You are using {0}": "Utilizatz {0}",
-"Plugins": "Extensions",
-"Handy Shortcuts": "Acorchis utils",
-"Horizontal line": "Linha orizontala",
-"Insert\/edit image": "Inserir\/modificar un imatge",
-"Image description": "Descripcion de l'imatge",
-"Source": "Font",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Conservar las proporcions",
-"General": "General",
-"Advanced": "Avan\u00e7at",
-"Style": "Estil",
-"Vertical space": "Espa\u00e7ament vertical",
-"Horizontal space": "Espa\u00e7ament orizontal",
-"Border": "Bordadura",
-"Insert image": "Inserir un imatge",
-"Image...": "Imatge...",
-"Image list": "Lista d\u2019imatges",
-"Rotate counterclockwise": "Rotacion anti-or\u00e0ria",
-"Rotate clockwise": "Rotacion or\u00e0ria",
-"Flip vertically": "Revirament vertical",
-"Flip horizontally": "Revirament orizontal",
-"Edit image": "Modificar l'imatge",
-"Image options": "Opcions de l'imatge",
-"Zoom in": "Zoom avant",
-"Zoom out": "Zoom arri\u00e8r",
-"Crop": "Retalhar",
-"Resize": "Redimensionar",
-"Orientation": "Orientacion",
-"Brightness": "Luminositat",
-"Sharpen": "Afinar",
-"Contrast": "Contraste",
-"Color levels": "Niv\u00e8ls de color",
-"Gamma": "Gamma",
-"Invert": "Inversar",
-"Apply": "Aplicar",
-"Back": "Retorn",
-"Insert date\/time": "Inserir data\/ora",
-"Date\/time": "Data\/ora",
-"Insert\/Edit Link": "Inserir\/Modificar un ligam",
-"Insert\/edit link": "Inserir\/modificar un ligam",
-"Text to display": "T\u00e8xte d'afichar",
-"Url": "Url",
-"Open link in...": "Dobrir lo ligam dins...",
-"Current window": "Fen\u00e8stra actuala",
-"None": "Pas cap",
-"New window": "Fen\u00e8stra nov\u00e8la",
-"Remove link": "Suprimir lo ligam",
-"Anchors": "Anc\u00f2ras",
-"Link...": "Ligam...",
-"Paste or type a link": "Pegatz o picatz un ligam",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Sembla que l'URL qu'av\u00e8tz entrada es una adre\u00e7a e-mail. Vol\u00e8tz apondre lo prefix mailto: necessari ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Sembla que l'URL qu'av\u00e8tz entrada es un ligam ext\u00e8rne. Vol\u00e8tz apondre lo prefix http:\/\/ necessari ?",
-"Link list": "Lista de ligams",
-"Insert video": "Inserir una vid\u00e8o",
-"Insert\/edit video": "Inserir\/modificar una vid\u00e8o",
-"Insert\/edit media": "Inserir\/modificar un m\u00e8dia",
-"Alternative source": "Font alternativa",
-"Alternative source URL": "URL font alternativa",
-"Media poster (Image URL)": "Media poster (Image URL)",
-"Paste your embed code below:": "Pegatz v\u00f2tre c\u00f2di d'integracion \u00e7aij\u00f3s :",
-"Embed": "Integrat",
-"Media...": "M\u00e8dia...",
-"Nonbreaking space": "Espaci insecable",
-"Page break": "Pagina copada",
-"Paste as text": "Pegar coma de t\u00e8xte",
-"Preview": "Previsualizar",
-"Print...": "Imprimir...",
-"Save": "Enregistrar",
-"Find": "Recercar",
-"Replace with": "Rempla\u00e7ar per",
-"Replace": "Rempla\u00e7ar",
-"Replace all": "Rempla\u00e7ar tot",
-"Previous": "Precedent",
-"Next": "Seg",
-"Find and replace...": "Trobar e rempla\u00e7ar...",
-"Could not find the specified string.": "Impossible de trobar la cadena especificada.",
-"Match case": "Respectar la cassa",
-"Find whole words only": "Cercar mot enti\u00e8r sonque",
-"Spell check": "Verificacion ortografica",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar tot",
-"Finish": "Acabar",
-"Add to Dictionary": "Apondre al diccionari",
-"Insert table": "Inserir un tabl\u00e8u",
-"Table properties": "Proprietats del tabl\u00e8u",
-"Delete table": "Suprimir lo tabl\u00e8u",
-"Cell": "Cellula",
-"Row": "Linha",
-"Column": "Colomna",
-"Cell properties": "Proprietats de la cellula",
-"Merge cells": "Fusionar las cellulas",
-"Split cell": "Devesir la cellula",
-"Insert row before": "Inserir una linha abans",
-"Insert row after": "Inserir una linha apr\u00e8p",
-"Delete row": "Suprimir la linha",
-"Row properties": "Proprietats de la linha",
-"Cut row": "Talhar la linha",
-"Copy row": "Copiar la linha",
-"Paste row before": "Pegar la linha abans",
-"Paste row after": "Pegar la linha apr\u00e8p",
-"Insert column before": "Inserir una colomna abans",
-"Insert column after": "Inserir una colomna apr\u00e8p",
-"Delete column": "Suprimir la colomna",
-"Cols": "Colomnas",
-"Rows": "Linhas",
-"Width": "Largor",
-"Height": "Nautor",
-"Cell spacing": "Cell spacing",
-"Cell padding": "Cell padding",
-"Show caption": "Mostrar legenda",
-"Left": "Esqu\u00e8rra",
-"Center": "Centre",
-"Right": "Drecha",
-"Cell type": "Tipe de cellula",
-"Scope": "Scope",
-"Alignment": "Alinhament",
-"H Align": "H Align",
-"V Align": "V Align",
-"Top": "Top",
-"Middle": "Mitan",
-"Bottom": "Bottom",
-"Header cell": "Header cell",
-"Row group": "Row group",
-"Column group": "Column group",
-"Row type": "Tipe de linha",
-"Header": "Ent\u00e8sta",
-"Body": "C\u00f2s",
-"Footer": "P\u00e8 de pagina",
-"Border color": "Color de la bordadura",
-"Insert template...": "Inserir un mod\u00e8l...",
-"Templates": "Mod\u00e8ls",
-"Template": "Mod\u00e8l",
-"Text color": "Color del t\u00e8xte",
-"Background color": "Color de r\u00e8ireplan",
-"Custom...": "Personalizar...",
-"Custom color": "Color personalizada",
-"No color": "Pas de color",
-"Remove color": "Tirar la color",
-"Table of Contents": "Ensenhador",
-"Show blocks": "Afichar los bl\u00f2ts",
-"Show invisible characters": "Far veire los caract\u00e8rs invisibles",
-"Word count": "Comptador mot",
-"Count": "Comptador",
-"Document": "Document",
-"Selection": "Seleccion",
-"Words": "Mots",
-"Words: {0}": "Mots : {0}",
-"{0} words": "{0} mots",
-"File": "Fichi\u00e8r",
-"Edit": "Editar",
-"Insert": "Inserir",
-"View": "Veire",
-"Format": "Format",
-"Table": "Tabl\u00e8u",
-"Tools": "Aisinas",
-"Powered by {0}": "Propulsat per {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Z\u00f2na T\u00e8xte Ric. Quichar sus ALT-F9 pel men\u00fa. Quichar sus ALT-F10 per la barra d'aisinas. Quichar sus ALT-0 per d'ajuda.",
-"Image title": "T\u00edtol imatge",
-"Border width": "Largor bordadura",
-"Border style": "Estil bordadura",
-"Error": "Error",
-"Warn": "Av\u00eds",
-"Valid": "Valid",
-"To open the popup, press Shift+Enter": "Per dobrir dins una fen\u00e8stra sorgissenta, quichatz Maj+Entrada",
-"Rich Text Area. Press ALT-0 for help.": "Rich Text Area. Press ALT-0 for help.",
-"System Font": "Polissa sist\u00e8ma",
-"Failed to upload image: {0}": "Frac\u00e0s mandad\u00eds imatge : {0}",
-"Failed to load plugin: {0} from url {1}": "Failed to load plugin: {0} from url {1}",
-"Failed to load plugin url: {0}": "Failed to load plugin url: {0}",
-"Failed to initialize plugin: {0}": "Failed to initialize plugin: {0}",
-"example": "exemple",
-"Search": "Cercar",
-"All": "Tot",
-"Currency": "Moneda",
-"Text": "T\u00e8xte",
-"Quotations": "Citacions",
-"Mathematical": "Mathematical",
-"Extended Latin": "Extended Latin",
-"Symbols": "Simb\u00f2ls",
-"Arrows": "Fl\u00e8chas",
-"User Defined": "User Defined",
-"dollar sign": "signe d\u00f2lar",
-"currency sign": "Signe devisa",
-"euro-currency sign": "signe devisa europenca ",
-"colon sign": "signe colon",
-"cruzeiro sign": "signe cruzeiro",
-"french franc sign": "signe franc",
-"lira sign": "signe lira",
-"mill sign": "signe mill",
-"naira sign": "signe naira",
-"peseta sign": "signe peseta",
-"rupee sign": "signe roble",
-"won sign": "signe won",
-"new sheqel sign": "signe sheqel",
-"dong sign": "signe dong",
-"kip sign": "signe kip",
-"tugrik sign": "signe tugrik",
-"drachma sign": "signe drachma",
-"german penny symbol": "signe devisa germana",
-"peso sign": "signe peso",
-"guarani sign": "signe guarani",
-"austral sign": "signe austral",
-"hryvnia sign": "signe hryvnia",
-"cedi sign": "signe cedi",
-"livre tournois sign": "signe livre tournois",
-"spesmilo sign": "signe spesmilo",
-"tenge sign": "signe tenge",
-"indian rupee sign": "signe roble india",
-"turkish lira sign": "signe lira de Turquia",
-"nordic mark sign": "signe marc nordic",
-"manat sign": "signe manat",
-"ruble sign": "signe roble",
-"yen character": "signe yen",
-"yuan character": "signe yuan",
-"yuan character, in hong kong and taiwan": "yuan character, in hong kong and taiwan",
-"yen\/yuan character variant one": "yen\/yuan character variant one",
-"Loading emoticons...": "Cargament emoticons...",
-"Could not load emoticons": "Cargament impossible de las emoticons",
-"People": "Gents",
-"Animals and Nature": "Animals e Natura",
-"Food and Drink": "Beure e manjar",
-"Activity": "Activitat",
-"Travel and Places": "Viatge e L\u00f2cs",
-"Objects": "Obj\u00e8ctes",
-"Flags": "Drap\u00e8us",
-"Characters": "Caract\u00e8rs",
-"Characters (no spaces)": "Caract\u00e8rs (sens espaci)",
-"{0} characters": "{0} caract\u00e8rs",
-"Error: Form submit field collision.": "Error: Form submit field collision.",
-"Error: No form element found.": "Error\u202f: cap d\u2019element formulari pas trobat.",
-"Update": "Actualizar",
-"Color swatch": "Cambiament de color",
-"Turquoise": "Turquesa",
-"Green": "Verd",
-"Blue": "Blau",
-"Purple": "Violet",
-"Navy Blue": "Blau marin",
-"Dark Turquoise": "Turquesa escur",
-"Dark Green": "Verd escur",
-"Medium Blue": "Blau mejan",
-"Medium Purple": "Violet mejan",
-"Midnight Blue": "Blau nu\u00e8ch",
-"Yellow": "Jaune",
-"Orange": "Irange",
-"Red": "Roge",
-"Light Gray": "Gris clar",
-"Gray": "Gris",
-"Dark Yellow": "Jaune escur",
-"Dark Orange": "Irange escur",
-"Dark Red": "Roge escur",
-"Medium Gray": "Gris mejan",
-"Dark Gray": "Gris escur",
-"Light Green": "Verd clar",
-"Light Yellow": "Jaune clar",
-"Light Red": "Roge clar",
-"Light Purple": "Violet clar",
-"Light Blue": "Blau clar",
-"Dark Purple": "Violet escur",
-"Dark Blue": "Blau escur",
-"Black": "Negre",
-"White": "Blanc",
-"Switch to or from fullscreen mode": "Switch to or from fullscreen mode",
-"Open help dialog": "Open help dialog",
-"history": "istoric",
-"styles": "estils",
-"formatting": "formatting",
-"alignment": "alinhament",
-"indentation": "indentacion",
-"permanent pen": "permanent pen",
-"comments": "comentaris",
-"Format Painter": "Format Painter",
-"Insert\/edit iframe": "Insert\/edit iframe",
-"Capitalization": "Capitalization",
-"lowercase": "lowercase",
-"UPPERCASE": "UPPERCASE",
-"Title Case": "Title Case",
-"Permanent Pen Properties": "Permanent Pen Properties",
-"Permanent pen properties...": "Permanent pen properties...",
-"Font": "Polissa",
-"Size": "Talha",
-"More...": "Mai...",
-"Spellcheck Language": "Lenga del verificador ortografic",
-"Select...": "Seleccionar...",
-"Preferences": "Prefer\u00e9ncias",
-"Yes": "\u00d2c",
-"No": "Non",
-"Keyboard Navigation": "Acorchis clavi\u00e8r",
-"Version": "Version",
-"Anchor": "Anc\u00f2ra",
-"Special character": "Caract\u00e8r especial",
-"Color": "Color",
-"Emoticons": "Emotic\u00f2nas",
-"Document properties": "Proprietats del document",
-"Insert link": "Inserir un ligam",
-"Target": "Cibla",
-"Poster": "Publicar",
-"Print": "Imprimir",
-"Whole words": "Mots enti\u00e8rs",
-"Find and replace": "Recercar e rempla\u00e7ar",
-"Prev": "Prec",
-"Spellcheck": "Corrector ortografic",
-"Caption": "Caption",
-"Insert template": "Inserir un mod\u00e8l"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/ru_RU.js Added

@@ -0,0 +1,445 @@
+tinymce.addI18n('ru_RU',{
+"Redo": "\u041f\u043e\u0432\u0442\u043e\u0440",
+"Undo": "\u041e\u0442\u043c\u0435\u043d\u0430",
+"Cut": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c",
+"Copy": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c",
+"Select all": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0435",
+"New document": "\u041d\u043e\u0432\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
+"Ok": "\u041f\u0440\u0438\u043d\u044f\u0442\u044c",
+"Cancel": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
+"Visual aids": "\u0412\u0438\u0437\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u043f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0438",
+"Bold": "\u0416\u0438\u0440\u043d\u044b\u0439",
+"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
+"Underline": "\u041f\u043e\u0434\u0447\u0451\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
+"Strikethrough": "\u041f\u0435\u0440\u0435\u0447\u0451\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
+"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0438\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440",
+"Subscript": "\u041d\u0438\u0436\u043d\u0438\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440",
+"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
+"Align left": "\u0412\u044b\u0440\u043e\u0432\u043d\u044f\u0442\u044c \u043f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Align center": "\u0412\u044b\u0440\u043e\u0432\u043d\u044f\u0442\u044c \u043f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
+"Align right": "\u0412\u044b\u0440\u043e\u0432\u043d\u044f\u0442\u044c \u043f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Justify": "\u0412\u044b\u0440\u043e\u0432\u043d\u044f\u0442\u044c \u043f\u043e \u0448\u0438\u0440\u0438\u043d\u0435",
+"Bullet list": "\u041c\u0430\u0440\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
+"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
+"Decrease indent": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
+"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
+"Close": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
+"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043f\u0440\u044f\u043c\u043e\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0435\u043d\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u043c\u0435\u0441\u0442\u043e \u044d\u0442\u043e\u0433\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f \u043a\u043b\u0430\u0432\u0438\u0448 Ctrl + X \/ C \/ V.",
+"Headers": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
+"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
+"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
+"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
+"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
+"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
+"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
+"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
+"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
+"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
+"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
+"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
+"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
+"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
+"Preformatted": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u043e\u0442\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439",
+"Div": "<div>\u0411\u043b\u043e\u043a<\/div>",
+"Pre": "<pre>\u0411\u043b\u043e\u043a<\/pre>",
+"Code": "\u041a\u043e\u0434",
+"Paragraph": "\u0410\u0431\u0437\u0430\u0446",
+"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
+"Inline": "\u0412\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0439",
+"Blocks": "\u0411\u043b\u043e\u043a\u0438",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u0432 \u0440\u0435\u0436\u0438\u043c\u0435 \u043d\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0430. \u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0431\u0443\u0434\u0435\u0442 \u0432\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c\u0441\u044f \u043a\u0430\u043a \u043e\u0431\u044b\u0447\u043d\u044b\u0439 \u0442\u0435\u043a\u0441\u0442, \u043f\u043e\u043a\u0430 \u0432\u044b \u043d\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u044d\u0442\u0443 \u043e\u043f\u0446\u0438\u044e.",
+"Fonts": "\u0428\u0440\u0438\u0444\u0442\u044b",
+"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440\u044b \u0448\u0440\u0438\u0444\u0442\u0430",
+"Class": "\u041a\u043b\u0430\u0441\u0441",
+"Browse for an image": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"OR": "\u0418\u041b\u0418",
+"Drop an image here": "\u041f\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0441\u044e\u0434\u0430",
+"Upload": "\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c",
+"Block": "\u0411\u043b\u043e\u043a",
+"Align": "\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"Default": "\u041f\u043e-\u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e",
+"Circle": "\u041a\u0440\u0443\u0433",
+"Disc": "\u0422\u043e\u0447\u043a\u0430",
+"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442",
+"Lower Alpha": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0439 \u041b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0439",
+"Lower Greek": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0439 \u0413\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0439",
+"Lower Roman": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0439 \u0420\u0438\u043c\u0441\u043a\u0438\u0439",
+"Upper Alpha": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0439 \u041b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0439",
+"Upper Roman": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0439 \u0420\u0438\u043c\u0441\u043a\u0438\u0439",
+"Anchor...": "\u042f\u043a\u043e\u0440\u044c",
+"Name": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
+"Id": "\u0410\u0442\u0440\u0438\u0431\u0443\u0442 Id",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0410\u0442\u0440\u0438\u0431\u0443\u0442 Id \u0434\u043e\u043b\u0436\u0435\u043d \u043d\u0430\u0447\u0438\u043d\u0430\u0442\u044c\u0441\u044f \u0441 \u0431\u0443\u043a\u0432\u044b, \u0437\u0430 \u043a\u043e\u0442\u043e\u0440\u043e\u0439 \u0441\u043b\u0435\u0434\u0443\u044e\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u0431\u0443\u043a\u0432\u044b, \u0446\u0438\u0444\u0440\u044b, \u0442\u0438\u0440\u0435, \u0442\u043e\u0447\u043a\u0438, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u044f \u0438\u043b\u0438 \u043f\u043e\u0434\u0447\u0435\u0440\u043a\u0438\u0432\u0430\u043d\u0438\u044f.",
+"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043d\u0435\u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f, \u0432\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u0439\u0442\u0438?",
+"Restore last draft": "\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0447\u0435\u0440\u043d\u043e\u0432\u0438\u043a",
+"Special character...": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0439 \u0441\u0438\u043c\u0432\u043e\u043b...",
+"Source code": "\u0418\u0441\u0445\u043e\u0434\u043d\u044b\u0439 \u043a\u043e\u0434",
+"Insert\/Edit code sample": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \/ \u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u0440\u0438\u043c\u0435\u0440 \u043a\u043e\u0434\u0430",
+"Language": "\u042f\u0437\u044b\u043a",
+"Code sample...": "\u041f\u0440\u0438\u043c\u0435\u0440 \u043a\u043e\u0434\u0430",
+"Color Picker": "\u041f\u0430\u043b\u0438\u0442\u0440\u0430 \u0446\u0432\u0435\u0442\u043e\u0432",
+"R": "\u041a",
+"G": "\u0417",
+"B": "\u0421",
+"Left to right": "\u0421\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
+"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u043e",
+"Emoticons": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u043c\u0430\u0439\u043b",
+"Emoticons...": "\u0421\u043c\u0430\u0439\u043b\u044b...",
+"Metadata and Document Properties": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 \u0438 \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
+"Title": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435",
+"Keywords": "\u041a\u043b\u044e\u0447\u0435\u0432\u044b\u0435 \u0441\u043b\u043e\u0432\u0430",
+"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+"Robots": "\u0420\u043e\u0431\u043e\u0442\u044b",
+"Author": "\u0410\u0432\u0442\u043e\u0440",
+"Encoding": "\u041a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430",
+"Fullscreen": "\u0412\u043e \u0432\u0435\u0441\u044c \u044d\u043a\u0440\u0430\u043d",
+"Action": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435",
+"Shortcut": "\u042f\u0440\u043b\u044b\u043a",
+"Help": "\u041f\u043e\u043c\u043e\u0449\u044c",
+"Address": "\u0410\u0434\u0440\u0435\u0441",
+"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043f\u0430\u043d\u0435\u043b\u0438 \u043c\u0435\u043d\u044e",
+"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043f\u0430\u043d\u0435\u043b\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432",
+"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0435 \u043f\u0443\u0442\u0438",
+"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u043d\u043e\u043c \u043c\u0435\u043d\u044e",
+"Insert link (if link plugin activated)": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443 (\u0435\u0441\u043b\u0438 \u043f\u043b\u0430\u0433\u0438\u043d \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d)",
+"Save (if save plugin activated)": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c (\u0435\u0441\u043b\u0438 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d \u043f\u043b\u0430\u0433\u0438\u043d \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f)",
+"Find (if searchreplace plugin activated)": "\u041d\u0430\u0439\u0442\u0438 (\u0435\u0441\u043b\u0438 \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d \u043f\u043b\u0430\u0433\u0438\u043d \u043f\u043e\u0438\u0441\u043a\u0430 \u0438 \u0437\u0430\u043c\u0435\u043d\u044b)",
+"Plugins installed ({0}):": "\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e \u043f\u043b\u0430\u0433\u0438\u043d\u043e\u0432 ({0}):",
+"Premium plugins:": "Premium \u043f\u043b\u0430\u0433\u0438\u043d\u044b:",
+"Learn more...": "\u0423\u0437\u043d\u0430\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435...",
+"You are using {0}": "\u0412\u044b \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0435 {0}",
+"Plugins": "\u041f\u043b\u0430\u0433\u0438\u043d\u044b",
+"Handy Shortcuts": "\u0411\u044b\u0441\u0442\u0440\u044b\u0439 \u0434\u043e\u0441\u0442\u0443\u043f",
+"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0438\u043d\u0438\u044f",
+"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Alternative description": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+"Accessibility": "\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0441\u0442\u044c",
+"Image is decorative": "\u0414\u0435\u043a\u043e\u0440\u0430\u0442\u0438\u0432\u043d\u043e\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Source": "\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
+"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440\u044b",
+"Constrain proportions": "\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",
+"General": "\u041e\u0431\u0449\u0438\u0435",
+"Advanced": "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e",
+"Style": "\u0421\u0442\u0438\u043b\u044c",
+"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0435 \u043e\u0442\u0441\u0442\u0443\u043f\u044b",
+"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u044b\u0435 \u043e\u0442\u0441\u0442\u0443\u043f\u044b",
+"Border": "\u0420\u0430\u043c\u043a\u0438",
+"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Image...": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435...",
+"Image list": "\u0421\u043f\u0438\u0441\u043e\u043a \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0439",
+"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043e\u0439",
+"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u0440\u043e\u0442\u0438\u0432 \u0447\u0430\u0441\u043e\u0432\u043e\u0439",
+"Flip vertically": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0438",
+"Flip horizontally": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0438",
+"Edit image": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
+"Image options": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
+"Zoom in": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c",
+"Zoom out": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c",
+"Crop": "\u041e\u0431\u0440\u0435\u0437\u0430\u0442\u044c",
+"Resize": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0430\u0437\u043c\u0435\u0440\u044b",
+"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
+"Brightness": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c",
+"Sharpen": "\u0420\u0435\u0437\u043a\u043e\u0441\u0442\u044c",
+"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442\u043d\u043e\u0441\u0442\u044c",
+"Color levels": "\u0426\u0432\u0435\u0442\u043e\u0432\u044b\u0435 \u0443\u0440\u043e\u0432\u043d\u0438",
+"Gamma": "\u0413\u0430\u043c\u043c\u0430",
+"Invert": "\u0418\u043d\u0432\u0435\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0446\u0432\u0435\u0442",
+"Apply": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c",
+"Back": "\u041d\u0430\u0437\u0430\u0434",
+"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0434\u0430\u0442\u0443\/\u0432\u0440\u0435\u043c\u044f",
+"Date\/time": "\u0414\u0430\u0442\u0430\/\u0432\u0440\u0435\u043c\u044f",
+"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
+"Text to display": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u044b\u0439 \u0442\u0435\u043a\u0441\u0442",
+"Url": "Url",
+"Open link in...": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443 \u0432...",
+"Current window": "\u0422\u0435\u043a\u0443\u0449\u0435\u0435 \u043e\u043a\u043d\u043e",
+"None": "-",
+"New window": "\u041d\u043e\u0432\u043e\u0435 \u043e\u043a\u043d\u043e",
+"Open link": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
+"Remove link": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
+"Anchors": "\u042f\u043a\u043e\u0440\u044c",
+"Link...": "\u0421\u0441\u044b\u043b\u043a\u0430...",
+"Paste or type a link": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0438\u043b\u0438 \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0441\u0441\u044b\u043b\u043a\u0443",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0412\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u0412\u0430\u043c\u0438 URL-\u0430\u0434\u0440\u0435\u0441 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b. \u0412\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u044b\u0439 \u043f\u0440\u0435\u0444\u0438\u043a\u0441 mailto:?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0412\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u0412\u0430\u043c\u0438 URL-\u0430\u0434\u0440\u0435\u0441 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0441\u0441\u044b\u043b\u043a\u043e\u0439. \u0425\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u044b\u0439 \u043f\u0440\u0435\u0444\u0438\u043a\u0441 http: \/\/?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u0412\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u0412\u0430\u043c\u0438 URL-\u0430\u0434\u0440\u0435\u0441 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0441\u0441\u044b\u043b\u043a\u043e\u0439. \u0425\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u044b\u0439 \u043f\u0440\u0435\u0444\u0438\u043a\u0441 https: \/\/?",
+"Link list": "\u0421\u043f\u0438\u0441\u043e\u043a \u0441\u0441\u044b\u043b\u043e\u043a",
+"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
+"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
+"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043c\u0435\u0434\u0438\u0430-\u043a\u043e\u043d\u0442\u0435\u043d\u0442",
+"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
+"Alternative source URL": "URL \u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u043e\u0433\u043e \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430",
+"Media poster (Image URL)": "\u041c\u0435\u0434\u0438\u0430-\u043a\u043e\u043d\u0442\u0435\u043d\u0442 (URL \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f)",
+"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u043a\u043e\u0434 \u0432\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0435\u043c\u043e\u0433\u043e \u043a\u043e\u043d\u0442\u0435\u043d\u0442\u0430 \u043d\u0438\u0436\u0435:",
+"Embed": "\u0412\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0439",
+"Media...": "\u041c\u0435\u0434\u0438\u0430-\u043a\u043e\u043d\u0442\u0435\u043d\u0442...",
+"Nonbreaking space": "\u041d\u0435\u0440\u0430\u0437\u0440\u044b\u0432\u043d\u044b\u0439 \u0443\u0447\u0430\u0441\u0442\u043e\u043a",
+"Page break": "\u0420\u0430\u0437\u0440\u044b\u0432 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b",
+"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043a\u0430\u043a \u043e\u0431\u044b\u0447\u043d\u044b\u0439 \u0442\u0435\u043a\u0441\u0442",
+"Preview": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440",
+"Print...": "\u041f\u0435\u0447\u0430\u0442\u044c...",
+"Save": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c",
+"Find": "\u041d\u0430\u0439\u0442\u0438",
+"Replace with": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e",
+"Replace": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c",
+"Replace all": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0435",
+"Previous": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439",
+"Next": "\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439",
+"Find and Replace": "\u041d\u0430\u0439\u0442\u0438 \u0438 \u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c",
+"Find and replace...": "\u041d\u0430\u0439\u0442\u0438 \u0438 \u0437\u0430\u043c\u0435\u043d\u0438\u0442\u044c...",
+"Could not find the specified string.": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443.",
+"Match case": "\u0423\u0447\u0438\u0442\u044b\u0432\u0430\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440",
+"Find whole words only": "\u041d\u0430\u0439\u0442\u0438 \u0442\u043e\u043b\u044c\u043a\u043e \u0441\u043b\u043e\u0432\u0430 \u0446\u0435\u043b\u0438\u043a\u043e\u043c",
+"Find in selection": "\u0418\u0441\u043a\u0430\u0442\u044c \u0432 \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u043c",
+"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+"Spellcheck Language": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u044f \u043f\u043e \u044f\u0437\u044b\u043a\u0443",
+"No misspellings found.": "\u041e\u0448\u0438\u0431\u043e\u043a \u043d\u0435 \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u043e.",
+"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0441\u0435",
+"Finish": "\u041a\u043e\u043d\u0435\u0446",
+"Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0421\u043b\u043e\u0432\u0430\u0440\u044c",
+"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
+"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u044b",
+"Delete table": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
+"Cell": "\u042f\u0447\u0435\u0439\u043a\u0430",
+"Row": "\u0421\u0442\u0440\u043e\u043a\u0430",
+"Column": "\u0421\u0442\u043e\u043b\u0431\u0435\u0446",
+"Cell properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u044f\u0447\u0435\u0439\u043a\u0438",
+"Merge cells": "\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0438",
+"Split cell": "\u0420\u0430\u0437\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0438",
+"Insert row before": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u0434\u043e",
+"Insert row after": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u043f\u043e\u0441\u043b\u0435",
+"Delete row": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
+"Row properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0441\u0442\u0440\u043e\u043a\u0438",
+"Cut row": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
+"Copy row": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
+"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u043f\u0435\u0440\u0435\u0434",
+"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u043f\u043e\u0441\u043b\u0435",
+"Insert column before": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u0434\u043e",
+"Insert column after": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u043f\u043e\u0441\u043b\u0435",
+"Delete column": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446",
+"Cols": "\u0421\u0442\u043e\u043b\u0431\u0446\u044b",
+"Rows": "\u0421\u0442\u0440\u043e\u043a\u0438",
+"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
+"Height": "\u0412\u044b\u0441\u043e\u0442\u0430",
+"Cell spacing": "\u0420\u0430\u0441\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043c\u0435\u0436\u0434\u0443 \u044f\u0447\u0435\u0439\u043a\u0430\u043c\u0438",
+"Cell padding": "\u041e\u0442\u0441\u0442\u0443\u043f\u044b \u0432 \u044f\u0447\u0435\u0439\u043a\u0430\u0445",
+"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Show caption": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043f\u043e\u0434\u043f\u0438\u0441\u044c",
+"Left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
+"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
+"Cell type": "\u0422\u0438\u043f \u044f\u0447\u0435\u0439\u043a\u0438",
+"Scope": "\u041e\u0431\u043b\u0430\u0441\u0442\u044c",
+"Alignment": "\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"Top": "\u0421\u0432\u0435\u0440\u0445\u0443",
+"Middle": "\u041f\u043e\u0441\u0435\u0440\u0435\u0434\u0438\u043d\u0435",
+"Bottom": "\u0421\u043d\u0438\u0437\u0443",
+"Header cell": "\u0421\u0442\u0440\u043e\u043a\u0430-\u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Row group": "\u0421\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0438",
+"Column group": "\u0421\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0446\u044b",
+"Row type": "\u0422\u0438\u043f \u0441\u0442\u0440\u043e\u043a\u0438",
+"Header": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
+"Body": "\u0422\u0435\u043b\u043e",
+"Footer": "\u041f\u043e\u0434\u0432\u0430\u043b",
+"Border color": "\u0426\u0432\u0435\u0442 \u0440\u0430\u043c\u043a\u0438",
+"Insert template...": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d...",
+"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
+"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
+"Text color": "\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430",
+"Background color": "\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430",
+"Custom...": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439...",
+"Custom color": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0446\u0432\u0435\u0442",
+"No color": "\u0411\u0435\u0437 \u0446\u0432\u0435\u0442\u0430",
+"Remove color": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0446\u0432\u0435\u0442",
+"Table of Contents": "\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435",
+"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0431\u043b\u043e\u043a\u0438",
+"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0441\u043a\u0440\u044b\u0442\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b",
+"Word count": "\u0421\u0447\u0451\u0442\u0447\u0438\u043a \u0441\u043b\u043e\u0432",
+"Count": "\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e",
+"Document": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
+"Selection": "\u0412\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435",
+"Words": "\u0421\u043b\u043e\u0432\u0430",
+"Words: {0}": "\u0421\u043b\u043e\u0432: {0}",
+"{0} words": "{0} \u0441\u043b\u043e\u0432",
+"File": "\u0424\u0430\u0439\u043b",
+"Edit": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+"Insert": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430",
+"View": "\u0412\u0438\u0434",
+"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
+"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
+"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b",
+"Powered by {0}": "\u0420\u0430\u0431\u043e\u0442\u0430\u0435\u0442 \u043d\u0430 {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041e\u0431\u043b\u0430\u0441\u0442\u044c \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0433\u043e \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 ALT-F9 \u0434\u043b\u044f \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0430 \u0432 \u043c\u0435\u043d\u044e. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 ALT-F10 \u0434\u043b\u044f \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0430 \u0432 \u043f\u0430\u043d\u0435\u043b\u044c \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 ALT-0 \u0434\u043b\u044f \u0441\u043f\u0440\u0430\u0432\u043a\u0438",
+"Image title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
+"Border width": "\u0428\u0438\u0440\u0438\u043d\u0430 \u0440\u0430\u043c\u043a\u0438",
+"Border style": "\u0421\u0442\u0438\u043b\u044c \u0440\u0430\u043c\u043a\u0438",
+"Error": "\u041e\u0448\u0438\u0431\u043a\u0430",
+"Warn": "\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435",
+"Valid": "\u0421\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435",
+"To open the popup, press Shift+Enter": "\u0427\u0442\u043e\u0431\u044b \u043e\u0442\u043a\u0440\u044b\u0442\u044c \u0432\u0441\u043f\u043b\u044b\u0432\u0430\u044e\u0449\u0435\u0435 \u043e\u043a\u043d\u043e, \u043d\u0430\u0436\u043c\u0438\u0442\u0435 Shift + Enter",
+"Rich Text Area. Press ALT-0 for help.": "\u041e\u0431\u043b\u0430\u0441\u0442\u044c \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0433\u043e \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 ALT-0 \u0434\u043b\u044f \u0441\u043f\u0440\u0430\u0432\u043a\u0438.",
+"System Font": "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0428\u0440\u0438\u0444\u0442",
+"Failed to upload image: {0}": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435: {0}",
+"Failed to load plugin: {0} from url {1}": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043f\u043b\u0430\u0433\u0438\u043d: {0} \u0438\u0437 url {1}",
+"Failed to load plugin url: {0}": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c url \u043f\u043b\u0430\u0433\u0438\u043d\u0430: {0}",
+"Failed to initialize plugin: {0}": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043b\u0430\u0433\u0438\u043d: {0}",
+"example": "\u043f\u0440\u0438\u043c\u0435\u0440",
+"Search": "\u041f\u043e\u0438\u0441\u043a",
+"All": "\u0412\u0441\u0435",
+"Currency": "\u0412\u0430\u043b\u044e\u0442\u0430",
+"Text": "\u0422\u0435\u043a\u0441\u0442",
+"Quotations": "\u0426\u0438\u0442\u0430\u0442\u044b",
+"Mathematical": "\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439",
+"Extended Latin": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0439 \u041b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0439",
+"Symbols": "\u0421\u0438\u043c\u0432\u043e\u043b\u044b",
+"Arrows": "\u0421\u0442\u0440\u0435\u043b\u043a\u0438",
+"User Defined": "\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0451\u043d\u043d\u044b\u0439 \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c",
+"dollar sign": "\u0434\u043e\u043b\u043b\u0430\u0440",
+"currency sign": "\u0432\u0430\u043b\u044e\u0442\u0430",
+"euro-currency sign": "\u0435\u0432\u0440\u043e",
+"colon sign": "\u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u0435",
+"cruzeiro sign": "\u043a\u0440\u0443\u0437\u0435\u0439\u0440\u043e",
+"french franc sign": "\u0444\u0440\u0430\u043d\u0446\u0443\u0437\u0441\u043a\u0438\u0439 \u0444\u0440\u0430\u043d\u043a",
+"lira sign": "\u043b\u0438\u0440\u0430",
+"mill sign": "\u043c\u0438\u043b\u043b\u044c",
+"naira sign": "\u043d\u0430\u0438\u0440\u0430",
+"peseta sign": "\u043f\u0435\u0441\u0435\u0442\u0430",
+"rupee sign": "\u0440\u0443\u043f\u0438\u044f",
+"won sign": "\u0432\u043e\u043d\u0430",
+"new sheqel sign": "\u043d\u043e\u0432\u044b\u0439 \u0448\u0435\u043a\u0435\u043b\u044c",
+"dong sign": "\u0434\u043e\u043d\u0433",
+"kip sign": "\u043a\u0438\u043f",
+"tugrik sign": "\u0442\u0443\u0433\u0440\u0438\u043a",
+"drachma sign": "\u0434\u0440\u0430\u0445\u043c\u0430",
+"german penny symbol": "\u043f\u0444\u0435\u043d\u043d\u0438\u043d\u0433",
+"peso sign": "\u043f\u0435\u0441\u043e",
+"guarani sign": "\u0433\u0443\u0430\u0440\u0430\u043d\u0438",
+"austral sign": "\u0430\u0443\u0441\u0442\u0440\u0430\u043b\u044c",
+"hryvnia sign": "\u0433\u0440\u0438\u0432\u043d\u0430",
+"cedi sign": "\u0441\u0435\u0434\u0438",
+"livre tournois sign": "\u0442\u0443\u0440\u0441\u043a\u0438\u0439 \u043b\u0438\u0432\u0440",
+"spesmilo sign": "\u0441\u043f\u0435\u0441\u043c\u0438\u043b\u043e",
+"tenge sign": "\u0442\u0435\u043d\u0433\u0435",
+"indian rupee sign": "\u0438\u043d\u0434\u0438\u0439\u0441\u043a\u0430\u044f \u0440\u0443\u043f\u0438\u044f",
+"turkish lira sign": "\u0442\u0443\u0440\u0435\u0446\u043a\u0430\u044f \u043b\u0438\u0440\u0430",
+"nordic mark sign": "\u0441\u043a\u0430\u043d\u0434\u0438\u043d\u0430\u0432\u0441\u043a\u0430\u044f \u043c\u0430\u0440\u043a\u0430",
+"manat sign": "\u043c\u0430\u043d\u0430\u0442",
+"ruble sign": "\u0440\u0443\u0431\u043b\u044c",
+"yen character": "\u0438\u0435\u043d\u0430",
+"yuan character": "\u044e\u0430\u043d\u044c",
+"yuan character, in hong kong and taiwan": "\u0413\u043e\u043d\u043a\u043e\u043d\u0433\u0441\u043a\u0438\u0439 \/ \u0422\u0430\u0439\u0432\u0430\u043d\u044c\u0441\u043a\u0438\u0439 \u044e\u0430\u043d\u044c",
+"yen\/yuan character variant one": "\u0438\u0435\u043d\u0430\/\u044e\u0430\u043d\u044c",
+"Loading emoticons...": "\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u043c\u0430\u0439\u043b\u043e\u0432 ...",
+"Could not load emoticons": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0441\u043c\u0430\u0439\u043b\u044b",
+"People": "\u041b\u044e\u0434\u0438",
+"Animals and Nature": "\u0416\u0438\u0432\u043e\u0442\u043d\u044b\u0435 \u0438 \u041f\u0440\u0438\u0440\u043e\u0434\u0430",
+"Food and Drink": "\u0415\u0434\u0430 \u0438 \u041d\u0430\u043f\u0438\u0442\u043a\u0438",
+"Activity": "\u041c\u0435\u0440\u043e\u043f\u0440\u0438\u044f\u0442\u0438\u044f",
+"Travel and Places": "\u041f\u0443\u0442\u0435\u0448\u0435\u0441\u0442\u0432\u0438\u044f \u0438 \u041c\u0435\u0441\u0442\u0430",
+"Objects": "\u041e\u0431\u044a\u0435\u043a\u0442\u044b",
+"Flags": "\u0424\u043b\u0430\u0433\u0438",
+"Characters": "\u0421\u0438\u043c\u0432\u043e\u043b\u044b",
+"Characters (no spaces)": "\u0421\u0438\u043c\u0432\u043e\u043b\u044b (\u0431\u0435\u0437 \u043f\u0440\u043e\u0431\u0435\u043b\u043e\u0432)",
+"{0} characters": "{0} \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432",
+"Error: Form submit field collision.": "\u041e\u0448\u0438\u0431\u043a\u0430: \u043d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u043e\u043b\u044f \u0424\u043e\u0440\u043c\u044b \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438.",
+"Error: No form element found.": "\u041e\u0448\u0438\u0431\u043a\u0430: \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u0444\u043e\u0440\u043c\u044b \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d.",
+"Update": "\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c",
+"Color swatch": "\u041e\u0431\u0440\u0430\u0437\u0435\u0446 \u0446\u0432\u0435\u0442\u0430",
+"Turquoise": "\u0411\u0438\u0440\u044e\u0437\u043e\u0432\u044b\u0439",
+"Green": "\u0417\u0435\u043b\u0451\u043d\u044b\u0439",
+"Blue": "\u0421\u0438\u043d\u0438\u0439",
+"Purple": "\u0424\u0438\u043e\u043b\u0435\u0442\u043e\u0432\u044b\u0439",
+"Navy Blue": "\u0422\u0435\u043c\u043d\u043e-\u0441\u0438\u043d\u0438\u0439",
+"Dark Turquoise": "\u0422\u0435\u043c\u043d\u043e-\u0431\u0438\u0440\u044e\u0437\u043e\u0432\u044b\u0439",
+"Dark Green": "\u0422\u0435\u043c\u043d\u043e-\u0437\u0435\u043b\u0435\u043d\u044b\u0439",
+"Medium Blue": "\u0421\u0440\u0435\u0434\u043d\u0438\u0439 \u0441\u0438\u043d\u0438\u0439",
+"Medium Purple": "\u0421\u0440\u0435\u0434\u043d\u0438\u0439 \u0444\u0438\u043e\u043b\u0435\u0442\u043e\u0432\u044b\u0439",
+"Midnight Blue": "\u0422\u0435\u043c\u043d\u043e-\u0441\u0438\u043d\u0438\u0439",
+"Yellow": "\u0416\u0435\u043b\u0442\u044b\u0439",
+"Orange": "\u041e\u0440\u0430\u043d\u0436\u0435\u0432\u044b\u0439",
+"Red": "\u041a\u0440\u0430\u0441\u043d\u044b\u0439",
+"Light Gray": "\u0421\u0432\u0435\u0442\u043b\u043e-\u0441\u0435\u0440\u044b\u0439",
+"Gray": "\u0421\u0435\u0440\u044b\u0439",
+"Dark Yellow": "\u0422\u0435\u043c\u043d\u043e-\u0436\u0435\u043b\u0442\u044b\u0439",
+"Dark Orange": "\u0422\u0435\u043c\u043d\u043e-\u043e\u0440\u0430\u043d\u0436\u0435\u0432\u044b\u0439",
+"Dark Red": "\u0422\u0435\u043c\u043d\u043e-\u043a\u0440\u0430\u0441\u043d\u044b\u0439",
+"Medium Gray": "\u0421\u0440\u0435\u0434\u043d\u0438\u0439 \u0441\u0435\u0440\u044b\u0439",
+"Dark Gray": "\u0422\u0435\u043c\u043d\u043e-\u0441\u0435\u0440\u044b\u0439",
+"Light Green": "\u0421\u0432\u0435\u0442\u043b\u043e-\u0437\u0435\u043b\u0435\u043d\u044b\u0439",
+"Light Yellow": "\u0421\u0432\u0435\u0442\u043b\u043e-\u0436\u0435\u043b\u0442\u044b\u0439",
+"Light Red": "\u0421\u0432\u0435\u0442\u043b\u043e-\u043a\u0440\u0430\u0441\u043d\u044b\u0439",
+"Light Purple": "\u0421\u0432\u0435\u0442\u043b\u043e-\u0444\u0438\u043e\u043b\u0435\u0442\u043e\u0432\u044b\u0439",
+"Light Blue": "\u0413\u043e\u043b\u0443\u0431\u043e\u0439",
+"Dark Purple": "\u0422\u0435\u043c\u043d\u043e-\u0444\u0438\u043e\u043b\u0435\u0442\u043e\u0432\u044b\u0439",
+"Dark Blue": "\u0422\u0435\u043c\u043d\u043e-\u0441\u0438\u043d\u0438\u0439",
+"Black": "\u0427\u0435\u0440\u043d\u044b\u0439",
+"White": "\u0411\u0435\u043b\u044b\u0439",
+"Switch to or from fullscreen mode": "\u041f\u0435\u0440\u0435\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u0432 \u0438\u043b\u0438 \u0438\u0437 \u043f\u043e\u043b\u043d\u043e\u044d\u043a\u0440\u0430\u043d\u043d\u043e\u0433\u043e \u0440\u0435\u0436\u0438\u043c\u0430",
+"Open help dialog": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043e\u043a\u043d\u043e \u0441\u043f\u0440\u0430\u0432\u043a\u0438",
+"history": "\u0438\u0441\u0442\u043e\u0440\u0438\u044f",
+"styles": "\u0441\u0442\u0438\u043b\u0438",
+"formatting": "\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
+"alignment": "\u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
+"indentation": "\u043e\u0442\u0441\u0442\u0443\u043f\u044b",
+"Font": "\u0428\u0440\u0438\u0444\u0442",
+"Size": "\u0420\u0430\u0437\u043c\u0435\u0440",
+"More...": "\u0415\u0449\u0451...",
+"Select...": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c...",
+"Preferences": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438",
+"Yes": "\u0414\u0430",
+"No": "\u041d\u0435\u0442",
+"Keyboard Navigation": "\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u043a\u043b\u0430\u0432\u0438\u0430\u0442\u0443\u0440\u044b",
+"Version": "\u0412\u0435\u0440\u0441\u0438\u044f",
+"Code view": "\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043a\u043e\u0434\u0430",
+"Open popup menu for split buttons": "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0432\u0441\u043f\u043b\u044b\u0432\u0430\u044e\u0449\u0435\u0435 \u043c\u0435\u043d\u044e \u0434\u043b\u044f \u0440\u0430\u0437\u0434\u0435\u043b\u0435\u043d\u0438\u044f \u043a\u043d\u043e\u043f\u043e\u043a",
+"List Properties": "\u0421\u043f\u0438\u0441\u043e\u043a \u0441\u0432\u043e\u0439\u0441\u0442\u0432",
+"List properties...": "\u0421\u043f\u0438\u0441\u043e\u043a \u0441\u0432\u043e\u0439\u0441\u0442\u0432...",
+"Start list at number": "\u041d\u0430\u0447\u0430\u0442\u044c \u043d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044e \u0441",
+"Line height": "\u0412\u044b\u0441\u043e\u0442\u0430 \u0441\u0442\u0440\u043e\u043a\u0438",
+"comments": "\u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438",
+"Format Painter": "\u0421\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
+"Insert\/edit iframe": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0440\u0435\u0439\u043c",
+"Capitalization": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0435 \u043f\u0435\u0440\u0432\u044b\u0435",
+"lowercase": "\u043d\u0438\u0436\u043d\u0438\u0439 \u0440\u0435\u0433\u0438\u0441\u0442\u0440",
+"UPPERCASE": "\u0412\u0415\u0420\u0425\u041d\u0418\u0419 \u0420\u0415\u0413\u0418\u0421\u0422\u0420",
+"Title Case": "\u0420\u0435\u0433\u0438\u0441\u0442\u0440 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044f",
+"permanent pen": "\u0440\u0443\u0447\u043a\u0430",
+"Permanent Pen Properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043f\u0435\u0440\u043c\u0430\u043d\u0435\u043d\u0442\u043d\u043e\u0433\u043e \u043f\u0435\u0440\u0430",
+"Permanent pen properties...": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043f\u0435\u0440\u043c\u0430\u043d\u0435\u043d\u0442\u043d\u043e\u0433\u043e \u043f\u0435\u0440\u0430...",
+"case change": "\u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430",
+"page embed": "\u0432\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443",
+"Advanced sort...": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u0430\u044f \u0441\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430...",
+"Advanced Sort": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u0430\u044f \u0441\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430",
+"Sort table by column ascending": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u044b \u043f\u043e \u0441\u0442\u043e\u043b\u0431\u0446\u0443 \u043f\u043e \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u0430\u043d\u0438\u044e",
+"Sort table by column descending": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u043a\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u044b \u043f\u043e \u0441\u0442\u043e\u043b\u0431\u0446\u0443 \u043f\u043e \u0443\u0431\u044b\u0432\u0430\u043d\u0438\u044e",
+"Sort": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
+"Order": "\u041f\u043e\u0440\u044f\u0434\u043e\u043a",
+"Sort by": "\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e",
+"Ascending": "\u041f\u043e \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u0430\u043d\u0438\u044e",
+"Descending": "\u041f\u043e \u0443\u0431\u044b\u0432\u0430\u043d\u0438\u044e",
+"Column {0}": "\u0421\u0442\u043e\u043b\u0431\u0435\u0446 {0}",
+"Row {0}": "\u0421\u0442\u0440\u043e\u043a\u0430 {0}",
+"Spellcheck...": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u044f...",
+"Misspelled word": "\u0421\u043b\u043e\u0432\u043e \u0441 \u043e\u0448\u0438\u0431\u043a\u043e\u0439",
+"Suggestions": "\u041f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
+"Change": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c",
+"Finding word suggestions": "\u041f\u043e\u0438\u0441\u043a \u043f\u043e\u0434\u0441\u043a\u0430\u0437\u043e\u043a \u0434\u043b\u044f \u0441\u043b\u043e\u0432\u0430",
+"Success": "\u0423\u0441\u043f\u0435\u0445",
+"Repair": "\u0418\u0441\u043f\u0440\u0430\u0432\u0438\u0442\u044c",
+"Issue {0} of {1}": "\u041f\u0440\u043e\u0431\u043b\u0435\u043c\u0430 {0} \u0438\u0437 {1}",
+"Images must be marked as decorative or have an alternative text description": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u043f\u043e\u043c\u0435\u0447\u0435\u043d\u044b \u0434\u0435\u043a\u043e\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u043c\u0438 \u0438\u043b\u0438 \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
+"Images must have an alternative text description. Decorative images are not allowed.": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435. \u0414\u0435\u043a\u043e\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f \u043d\u0435\u0434\u043e\u043f\u0443\u0441\u0442\u0438\u043c\u044b.",
+"Or provide alternative text:": "\u0418\u043b\u0438 \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0435 \u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435:",
+"Make image decorative:": "\u041e\u0442\u043c\u0435\u0442\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u043a\u0430\u043a \u0434\u0435\u043a\u043e\u0440\u0430\u0442\u0438\u0432\u043d\u043e\u0435:",
+"ID attribute must be unique": "\u0410\u0442\u0440\u0438\u0431\u0443\u0442 ID \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u043c",
+"Make ID unique": "\u0421\u0434\u0435\u043b\u0430\u0442\u044c \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u043c",
+"Keep this ID and remove all others": "\u041e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0438 \u0443\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0435 \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u0435",
+"Remove this ID": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440",
+"Remove all IDs": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0441\u0435 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b",
+"Checklist": "\u0421\u043f\u0438\u0441\u043e\u043a \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0438"
+});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/sl.js Added

@@ -0,0 +1,445 @@
+tinymce.addI18n('sl',{
+"Redo": "Ponovno uveljavi",
+"Undo": "Razveljavi",
+"Cut": "Izre\u017ei",
+"Copy": "Kopiraj",
+"Paste": "Prilepi",
+"Select all": "Izberi vse",
+"New document": "Nov dokument",
+"Ok": "V redu",
+"Cancel": "Prekli\u010di",
+"Visual aids": "Vizualni pripomo\u010dki",
+"Bold": "Krepko",
+"Italic": "Po\u0161evno",
+"Underline": "Pod\u010drtano",
+"Strikethrough": "Pre\u010drtano",
+"Superscript": "Nadpisano",
+"Subscript": "Podpisano",
+"Clear formatting": "Odstrani oblikovanje",
+"Align left": "Leva poravnava",
+"Align center": "Sredinska poravnava",
+"Align right": "Desna poravnava",
+"Justify": "Obojestranska poravnava",
+"Bullet list": "Ozna\u010den seznam",
+"Numbered list": "O\u0161tevil\u010den seznam",
+"Decrease indent": "Zmanj\u0161aj zamik",
+"Increase indent": "Pove\u010daj zamik",
+"Close": "Zapri",
+"Formats": "Oblika",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Varnostne nastavitve brskalnika ne dopu\u0161\u010dajo direktnega dostopa do odlo\u017ei\u0161\u010da. Uporabite kombinacijo tipk Ctrl + X\/C\/V na tipkovnici.",
+"Headers": "Naslovi",
+"Header 1": "Naslov 1",
+"Header 2": "Naslov 2",
+"Header 3": "Naslov 3",
+"Header 4": "Naslov 4",
+"Header 5": "Naslov 5",
+"Header 6": "Naslov 6",
+"Headings": "Naslovi",
+"Heading 1": "Naslov 1",
+"Heading 2": "Naslov 2",
+"Heading 3": "Naslov 3",
+"Heading 4": "Naslov 4",
+"Heading 5": "Naslov 5",
+"Heading 6": "Naslov 6",
+"Preformatted": "Predformatirano",
+"Div": "Div",
+"Pre": "Pre",
+"Code": "Koda",
+"Paragraph": "Odstavek",
+"Blockquote": "Blockquote",
+"Inline": "Med besedilom",
+"Blocks": "Bloki",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Odlagali\u0161\u010de je sedaj v tekstovnem na\u010dinu. Vsebina bo preslikana kot besedilo, dokler te mo\u017enosti ne izklju\u010dite.",
+"Fonts": "Pisave",
+"Font Sizes": "Velikosti pisave",
+"Class": "Razred",
+"Browse for an image": "Prebrskaj za sliko",
+"OR": "ALI",
+"Drop an image here": "Spusti sliko sem",
+"Upload": "Nalo\u017ei",
+"Block": "Blok",
+"Align": "Poravnava",
+"Default": "Privzeto",
+"Circle": "Krog",
+"Disc": "Disk",
+"Square": "Kvadrat",
+"Lower Alpha": "Mala alfa",
+"Lower Greek": "Male gr\u0161ke \u010drke",
+"Lower Roman": "Male rimske \u0161tevilke",
+"Upper Alpha": "Velika alfa",
+"Upper Roman": "Velike rimske \u0161tevilke",
+"Anchor...": "Sidro ...",
+"Name": "Naziv",
+"Id": "Id",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id se mora za\u010deti s \u010drko, sledijo samo \u010drke, \u0161tevilke, pomi\u0161ljaji, pike, dvopi\u010dja ali pod\u010drtaji.",
+"You have unsaved changes are you sure you want to navigate away?": "Imate neshranjene spremembe. Ste prepri\u010dati, da \u017eelite zapustiti stran?",
+"Restore last draft": "Obnovi zadnji osnutek",
+"Special character...": "Poseben znak ...",
+"Source code": "Izvorna koda",
+"Insert\/Edit code sample": "Vstavi\/Uredi vzor\u010dno kodo",
+"Language": "Jezik",
+"Code sample...": "Vzor\u010dna koda ...",
+"Color Picker": "Izbirnik barve",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "Od leve proti desni",
+"Right to left": "Od desne proti levi",
+"Emoticons": "\u010custveni simboli",
+"Emoticons...": "\u010custveni simboli ...",
+"Metadata and Document Properties": "Metapodatki in lastnosti dokumenta",
+"Title": "Naslov",
+"Keywords": "Klju\u010dne besede",
+"Description": "Opis",
+"Robots": "Robotki",
+"Author": "Avtor",
+"Encoding": "Kodiranje",
+"Fullscreen": "\u010cez cel zaslon",
+"Action": "Dejanje",
+"Shortcut": "Bli\u017enjica",
+"Help": "Pomo\u010d",
+"Address": "Naslov",
+"Focus to menubar": "Poudarek na menijski vrstici",
+"Focus to toolbar": "Poudarek na orodni vrstici",
+"Focus to element path": "Poudarek na poti elementa",
+"Focus to contextual toolbar": "Poudarek na kontekstualni orodni vrstici",
+"Insert link (if link plugin activated)": "Vstavi povezavo (\u010de je aktiviran vti\u010dnik za povezavo)",
+"Save (if save plugin activated)": "Shrani (\u010de je aktiviran vti\u010dnik za shranjevanje)",
+"Find (if searchreplace plugin activated)": "I\u0161\u010di (\u010de je aktiviran vti\u010dnik za iskanje\/zamenjavo)",
+"Plugins installed ({0}):": "Name\u0161\u010deni vti\u010dniki ({0}):",
+"Premium plugins:": "Premium vti\u010dniki:",
+"Learn more...": "Ve\u010d ...",
+"You are using {0}": "Uporabljate {0}",
+"Plugins": "Vti\u010dniki",
+"Handy Shortcuts": "Uporabne bli\u017enjice",
+"Horizontal line": "Vodoravna \u010drta",
+"Insert\/edit image": "Vstavi\/uredi sliko",
+"Alternative description": "Nadomestni opis",
+"Accessibility": "Dostopnost",
+"Image is decorative": "Slika je okrasna",
+"Source": "Pot",
+"Dimensions": "Dimenzije",
+"Constrain proportions": "Obdr\u017ei razmerje",
+"General": "Splo\u0161no",
+"Advanced": "Napredno",
+"Style": "Slog",
+"Vertical space": "Navpi\u010dni prostor",
+"Horizontal space": "Vodoravni prostor",
+"Border": "Meja",
+"Insert image": "Vnesi sliko",
+"Image...": "Slika ...",
+"Image list": "Seznam slik",
+"Rotate counterclockwise": "Zavrti v nasprotni smeri urnega kazalca",
+"Rotate clockwise": "Zavrti v smeri urnega kazalca",
+"Flip vertically": "Obrni navpi\u010dno",
+"Flip horizontally": "Obrni vodoravno",
+"Edit image": "Uredi sliko",
+"Image options": "Mo\u017enosti slike",
+"Zoom in": "Pove\u010daj",
+"Zoom out": "Pomanj\u0161aj",
+"Crop": "Obre\u017ei",
+"Resize": "Spremeni velikost",
+"Orientation": "Usmerjenost",
+"Brightness": "Svetlost",
+"Sharpen": "Izostri",
+"Contrast": "Kontrast",
+"Color levels": "Barvni nivo",
+"Gamma": "Gama",
+"Invert": "Obrni",
+"Apply": "Uporabi",
+"Back": "Nazaj",
+"Insert date\/time": "Vstavi datum\/\u010das",
+"Date\/time": "Datum\/\u010das",
+"Insert\/edit link": "Vstavi\/uredi povezavo",
+"Text to display": "Besedilo za prikaz",
+"Url": "Povezava",
+"Open link in...": "Odpri povezavo v ...",
+"Current window": "Trenutno okno",
+"None": "Brez",
+"New window": "Novo okno",
+"Open link": "Odpri povezavo",
+"Remove link": "Odstrani povezavo",
+"Anchors": "Sidra",
+"Link...": "Povezava ...",
+"Paste or type a link": "Prilepite ali vnesite povezavo",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Vneseni URL predstavlja e-po\u0161tni naslov. Ali \u017eelite dodati potrebno predpono \"mailto:\"?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Vneseni URL predstavlja zunanjo povezavo. Ali \u017eelite dodati predpono \"http:\/\/\"?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Vneseni URL naslov predstavlja zunanjo povezavo. Ali mu \u017eelite dodati predpono https:\/\/ ?",
+"Link list": "Seznam povezav",
+"Insert video": "Vstavi video",
+"Insert\/edit video": "Vstavi\/uredi video",
+"Insert\/edit media": "Vstavi\/uredi medij",
+"Alternative source": "Nadomestni vir",
+"Alternative source URL": "Nadomestni vir URL",
+"Media poster (Image URL)": "Medijski poster (URL slike)",
+"Paste your embed code below:": "Spodaj prilepite kodo za vdelavo:",
+"Embed": "Vdelaj",
+"Media...": "Mediji ...",
+"Nonbreaking space": "Nedeljivi presledek",
+"Page break": "Prelom strani",
+"Paste as text": "Vnesi kot besedilo",
+"Preview": "Predogled",
+"Print...": "Natisni ...",
+"Save": "Shrani",
+"Find": "Najdi",
+"Replace with": "Zamenjaj z",
+"Replace": "Zamenjaj",
+"Replace all": "Zamenjaj vse",
+"Previous": "Prej\u0161nja",
+"Next": "Naslednja",
+"Find and Replace": "Najdi in zamenjaj",
+"Find and replace...": "Najdi in zamenjaj ...",
+"Could not find the specified string.": "Iskanje ni vrnilo rezultatov.",
+"Match case": "Ujemanje malih in velikih \u010drk",
+"Find whole words only": "I\u0161\u010di samo cele besede",
+"Find in selection": "I\u0161\u010di v izboru",
+"Spellcheck": "\u010crkovalnik",
+"Spellcheck Language": "Jezik \u010drkovalnika",
+"No misspellings found.": "Ni najdenih napak v \u010drkovanju.",
+"Ignore": "Prezri",
+"Ignore all": "Prezri vse",
+"Finish": "Zaklju\u010di",
+"Add to Dictionary": "Dodaj v slovar",
+"Insert table": "Vstavi tabelo",
+"Table properties": "Lastnosti tabele",
+"Delete table": "Izbri\u0161i tabelo",
+"Cell": "Celica",
+"Row": "Vrstica",
+"Column": "Stolpec",
+"Cell properties": "Lastnosti celice",
+"Merge cells": "Zdru\u017ei celice",
+"Split cell": "Razdeli celico",
+"Insert row before": "Vstavi vrstico pred",
+"Insert row after": "Vstavi vrstico za",
+"Delete row": "Izbri\u0161i vrstico",
+"Row properties": "Lastnosti vrstice",
+"Cut row": "Izre\u017ei vrstico",
+"Copy row": "Kopiraj vrstico",
+"Paste row before": "Prilepi vrstico pred",
+"Paste row after": "Prilepi vrstico za",
+"Insert column before": "Vstavi stolpec pred",
+"Insert column after": "Vstavi stolpec za",
+"Delete column": "Izbri\u0161i stolpec",
+"Cols": "Stolpci",
+"Rows": "Vrstice",
+"Width": "\u0160irina",
+"Height": "Vi\u0161ina",
+"Cell spacing": "Razmik med celicami",
+"Cell padding": "Polnilo med celicami",
+"Caption": "Naslov",
+"Show caption": "Poka\u017ei napis",
+"Left": "Leva",
+"Center": "Sredinska",
+"Right": "Desna",
+"Cell type": "Tip celice",
+"Scope": "Obseg",
+"Alignment": "Poravnava",
+"H Align": "Vodoravna poravnava",
+"V Align": "Navpi\u010dna poravnava",
+"Top": "Vrh",
+"Middle": "Sredina",
+"Bottom": "Dno",
+"Header cell": "Celica glave",
+"Row group": "Grupiranje vrstic",
+"Column group": "Grupiranje stolpcev",
+"Row type": "Tip vrstice",
+"Header": "Header",
+"Body": "Vsebina",
+"Footer": "Footer",
+"Border color": "Barva obrobe",
+"Insert template...": "Vstavi predlogo ...",
+"Templates": "Predloge",
+"Template": "Predloga",
+"Text color": "Barva besedila",
+"Background color": "Barva ozadja",
+"Custom...": "Po meri ...",
+"Custom color": "Barva po meri",
+"No color": "Brezbarvno",
+"Remove color": "Odstrani barvo",
+"Table of Contents": "Kazalo",
+"Show blocks": "Prika\u017ei bloke",
+"Show invisible characters": "Prika\u017ei skrite znake",
+"Word count": "\u0160tevilo besed",
+"Count": "\u0160tevilo",
+"Document": "Dokument",
+"Selection": "Izbor",
+"Words": "Besede",
+"Words: {0}": "Besed: {0}",
+"{0} words": "{0} besed",
+"File": "Datoteka",
+"Edit": "Uredi",
+"Insert": "Vstavi",
+"View": "Pogled",
+"Format": "Oblika",
+"Table": "Tabela",
+"Tools": "Orodja",
+"Powered by {0}": "Uporablja tehnologijo {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Bogato besedilo. Pritisnite ALT-F9 za meni. Pritisnite ALT-F10 za orodno vrstico. Pritisnite ALT-0 za pomo\u010d",
+"Image title": "Naslov slike",
+"Border width": "\u0160irina obrobe",
+"Border style": "Slog obrobe",
+"Error": "Napaka",
+"Warn": "Opozorilo",
+"Valid": "Veljavno",
+"To open the popup, press Shift+Enter": "Za odpiranje pojavnega okna pritisnite Shift + Enter.",
+"Rich Text Area. Press ALT-0 for help.": "Bogato besedilo. Pritisnite ALT-0 za pomo\u010d.",
+"System Font": "Sistemska pisava",
+"Failed to upload image: {0}": "Napaka nalaganja slike: {0}",
+"Failed to load plugin: {0} from url {1}": "Napaka nalaganja vti\u010dnika: {0} z url {1}",
+"Failed to load plugin url: {0}": "Napaka nalaganja url: {0}",
+"Failed to initialize plugin: {0}": "Napaka inicializacije vti\u010dnika: {0}",
+"example": "primer",
+"Search": "Iskanje",
+"All": "Vse",
+"Currency": "Valuta",
+"Text": "Besedilo",
+"Quotations": "Citati",
+"Mathematical": "Matemati\u010dno",
+"Extended Latin": "Raz\u0161irjena latinica",
+"Symbols": "Simboli",
+"Arrows": "Pu\u0161\u010dice",
+"User Defined": "Uporabnik dolo\u010den",
+"dollar sign": "znak za dolar",
+"currency sign": "znak za valuto",
+"euro-currency sign": "znak za evro",
+"colon sign": "znak za dvopi\u010dje",
+"cruzeiro sign": "znak za cruzeiro",
+"french franc sign": "znak za francoski frank",
+"lira sign": "znak za liro",
+"mill sign": "znak za mill",
+"naira sign": "znak za nairo",
+"peseta sign": "znak za peseto",
+"rupee sign": "znak za rupijo",
+"won sign": "znak za won",
+"new sheqel sign": "znak za novi \u0161ekl",
+"dong sign": "znak za dong",
+"kip sign": "znak za kip",
+"tugrik sign": "znak za tugrik",
+"drachma sign": "znak za drahmo",
+"german penny symbol": "znak za nem\u0161ki peni",
+"peso sign": "znak za peso",
+"guarani sign": "znak za guarani",
+"austral sign": "znak za austral",
+"hryvnia sign": "znak za hrivnijo",
+"cedi sign": "znak za cedi",
+"livre tournois sign": "znak za livre tournois",
+"spesmilo sign": "znak za spesmilo",
+"tenge sign": "znak za tenge",
+"indian rupee sign": "znak za indijsko rupijo",
+"turkish lira sign": "znak za tur\u0161ko liro",
+"nordic mark sign": "znak za nordijsko marko",
+"manat sign": "znak za manat",
+"ruble sign": "znak za rubelj",
+"yen character": "znak za jen",
+"yuan character": "znak za yuan",
+"yuan character, in hong kong and taiwan": "znak za yuan, v Hongkongu in na Tajvanu",
+"yen\/yuan character variant one": "znak za jen\/yuan, prva razli\u010dica",
+"Loading emoticons...": "Nalaganje \u010dustvenih simbolov ...",
+"Could not load emoticons": "\u010custvenih simbolov ni mogo\u010de nalo\u017eiti.",
+"People": "Ljudje",
+"Animals and Nature": "\u017divali in narava",
+"Food and Drink": "Hrana in pija\u010da",
+"Activity": "Dejavnost",
+"Travel and Places": "Potovanja in kraji",
+"Objects": "Predmeti",
+"Flags": "Zastave",
+"Characters": "Znaki",
+"Characters (no spaces)": "Znaki (brez presledkov)",
+"{0} characters": "{0} znakov",
+"Error: Form submit field collision.": "Napaka: navzkri\u017eje polja za oddajo obrazca",
+"Error: No form element found.": "Napaka: elementa oblike ni mogo\u010de najti",
+"Update": "Posodobitev",
+"Color swatch": "Vzorec barv",
+"Turquoise": "Turkizna",
+"Green": "Zelena",
+"Blue": "Modra",
+"Purple": "\u0160krlatna",
+"Navy Blue": "Mornarsko modra",
+"Dark Turquoise": "Temno turkizna",
+"Dark Green": "Temno zelena",
+"Medium Blue": "Srednje modra",
+"Medium Purple": "Srednje \u0161krlatna",
+"Midnight Blue": "Polno\u010dno modra",
+"Yellow": "Rumena",
+"Orange": "Oran\u017ena",
+"Red": "Rde\u010da",
+"Light Gray": "Svetlo siva",
+"Gray": "Siva",
+"Dark Yellow": "Temno rumena",
+"Dark Orange": "Temno oran\u017ena",
+"Dark Red": "Temno rde\u010da",
+"Medium Gray": "Srednje siva",
+"Dark Gray": "Temno siva",
+"Light Green": "Svetlo zelena",
+"Light Yellow": "Svetlo rumena",
+"Light Red": "Svetlo rde\u010da",
+"Light Purple": "Svetlo vijoli\u010dna",
+"Light Blue": "Svetlo modra",
+"Dark Purple": "Temno vijoli\u010dna",
+"Dark Blue": "Temno modra",
+"Black": "\u010crna",
+"White": "Bela",
+"Switch to or from fullscreen mode": "Preklopi v ali iz celozaslonskega na\u010dina",
+"Open help dialog": "Odpri pogovorno okno za pomo\u010d",
+"history": "zgodovina",
+"styles": "slogi",
+"formatting": "oblikovanje",
+"alignment": "poravnava",
+"indentation": "zamik",
+"Font": "Pisava",
+"Size": "Velikost",
+"More...": "Ve\u010d ...",
+"Select...": "Izberi ...",
+"Preferences": "Preference",
+"Yes": "Da",
+"No": "Ne",
+"Keyboard Navigation": "Krmarjenje s tipkovnico",
+"Version": "Razli\u010dica",
+"Code view": "Prikaz kode",
+"Open popup menu for split buttons": "Odpri pojavni meni za razdeljene gumbe",
+"List Properties": "Lastnosti seznama",
+"List properties...": "Lastnosti seznama...",
+"Start list at number": "Za\u010dni seznam s \u0161tevilko",
+"Line height": "Vi\u0161ina vrstice",
+"comments": "komentarji",
+"Format Painter": "Preslikovalnik Oblik",
+"Insert\/edit iframe": "Vstavi\/uredi iFrame",
+"Capitalization": "Velika za\u010detnica",
+"lowercase": "male \u010drke",
+"UPPERCASE": "VELIKE \u010cRKE",
+"Title Case": "Velike za\u010detnice naslovov",
+"permanent pen": "permanentno pisalo",
+"Permanent Pen Properties": "Lastnosti permanentnega pisala",
+"Permanent pen properties...": "Lastnosti permanentnega pisala ...",
+"case change": "sprememba male\/velike \u010drke",
+"page embed": "vstavi stran",
+"Advanced sort...": "Napredno razvr\u0161\u010danje",
+"Advanced Sort": "Napredno razvr\u0161\u010danje...",
+"Sort table by column ascending": "Razvrsti tabelo po stolpcu nara\u0161\u010dajo\u010de",
+"Sort table by column descending": "Razvrsti tabelo po stolpcu padajo\u010de",
+"Sort": "Razvrsti",
+"Order": "Vrstni red",
+"Sort by": "Razvrsti po",
+"Ascending": "Nara\u0161\u010dajo\u010de",
+"Descending": "Padajo\u010de",
+"Column {0}": "Stolpec {0}",
+"Row {0}": "Vrstica {0}",
+"Spellcheck...": "\u010crkovalnik...",
+"Misspelled word": "\u00b8Nepravilno \u010drkovana beseda",
+"Suggestions": "Predlogi",
+"Change": "Spremeni",
+"Finding word suggestions": "Iskanje predlogov besed",
+"Success": "Uspe\u0161no",
+"Repair": "Popravi",
+"Issue {0} of {1}": "Te\u017eava {0} od {1}",
+"Images must be marked as decorative or have an alternative text description": "Slike morajo biti ozna\u010dene kot okrasne ali morajo imeti nadomestni opis v obliki besedila",
+"Images must have an alternative text description. Decorative images are not allowed.": "Slike morajo imeti nadomestni opis v obliki besedila.  Okrasne slike niso dovoljene.",
+"Or provide alternative text:": "Ali podajte nadomestno besedilo:",
+"Make image decorative:": "Dolo\u010di sliko kot okrasno:",
+"ID attribute must be unique": "ID atribut mora biti edinstven",
+"Make ID unique": "Ustvari edinstven ID",
+"Keep this ID and remove all others": "Obdr\u017ei ta ID in odstrani vse ostale",
+"Remove this ID": "Odstrani ta ID",
+"Remove all IDs": "Odstrani vse IDje",
+"Checklist": "Seznam preverjanj"
+});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/sl_SI.js Deleted

@@ -1,388 +0,0 @@
-tinymce.addI18n('sl_SI',{
-"Redo": "Ponovno uveljavi",
-"Undo": "Razveljavi",
-"Cut": "Izre\u017ei",
-"Copy": "Kopiraj",
-"Paste": "Prilepi",
-"Select all": "Izberi vse",
-"New document": "Nov dokument",
-"Ok": "V redu",
-"Cancel": "Prekli\u010di",
-"Visual aids": "Vizualni pripomo\u010dki",
-"Bold": "Krepko",
-"Italic": "Po\u0161evno",
-"Underline": "Pod\u010drtano",
-"Strikethrough": "Pre\u010drtano",
-"Superscript": "Nadpisano",
-"Subscript": "Podpisano",
-"Clear formatting": "Odstrani oblikovanje",
-"Align left": "Leva poravnava",
-"Align center": "Sredinska poravnava",
-"Align right": "Desna poravnava",
-"Justify": "Obojestranska poravnava",
-"Bullet list": "Ozna\u010den seznam",
-"Numbered list": "O\u0161tevil\u010den seznam",
-"Decrease indent": "Zmanj\u0161aj zamik",
-"Increase indent": "Pove\u010daj zamik",
-"Close": "Zapri",
-"Formats": "Oblika",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Varnostne nastavitve brskalnika ne dopu\u0161\u010dajo direktnega dostopa do odlo\u017ei\u0161\u010da. Uporabite kombinacijo tipk Ctrl + X\/C\/V na tipkovnici.",
-"Headers": "Naslovi",
-"Header 1": "Naslov 1",
-"Header 2": "Naslov 2",
-"Header 3": "Naslov 3",
-"Header 4": "Naslov 4",
-"Header 5": "Naslov 5",
-"Header 6": "Naslov 6",
-"Headings": "Naslovi",
-"Heading 1": "Naslov 1",
-"Heading 2": "Naslov 2",
-"Heading 3": "Naslov 3",
-"Heading 4": "Naslov 4",
-"Heading 5": "Naslov 5",
-"Heading 6": "Naslov 6",
-"Preformatted": "Predformatirano",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Koda",
-"Paragraph": "Odstavek",
-"Blockquote": "Blockquote",
-"Inline": "Med besedilom",
-"Blocks": "Bloki",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Odlagali\u0161\u010de je zdaj v tekstovnem na\u010dinu. Vsebina bo preslikana kot golo besedilo brez oblike, dokler te mo\u017enosti ne izklju\u010dite.",
-"Fonts": "Pisave",
-"Font Sizes": "Velikosti pisave",
-"Class": "Razred",
-"Browse for an image": "Prebrskaj za sliko",
-"OR": "ALI",
-"Drop an image here": "Spusti sliko sem",
-"Upload": "Nalo\u017ei",
-"Block": "Blok",
-"Align": "Poravnava",
-"Default": "Privzeto",
-"Circle": "Pikica",
-"Disc": "Kroglica",
-"Square": "Kvadratek",
-"Lower Alpha": "Male tiskane \u010drke",
-"Lower Greek": "Male gr\u0161ke \u010drke",
-"Lower Roman": "Male rimske \u0161tevilke",
-"Upper Alpha": "Velike tiskane \u010drke",
-"Upper Roman": "Velike rimske \u0161tevilke",
-"Anchor...": "Sidro ...",
-"Name": "Naziv zaznamka",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id se mora za\u010deti s \u010drko, sledijo samo \u010drke, \u0161tevilke, pomi\u0161ljaj, pike, dvopi\u010dje ali pod\u010drtaj.",
-"You have unsaved changes are you sure you want to navigate away?": "Imate neshranjene spremembe. Ste prepri\u010dati, da \u017eelite zapustiti stran?",
-"Restore last draft": "Obnovi zadnji osnutek",
-"Special characters...": "Posebni znaki ...",
-"Source code": "Izvorna koda",
-"Insert\/Edit code sample": "Vstavi\/Uredi vzor\u010dno kodo",
-"Language": "Jezik",
-"Code sample...": "Vzor\u010dna koda ...",
-"Color Picker": "Izbirnik barve",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Od leve proti desni",
-"Right to left": "Od desne proti levi",
-"Emoticons...": "\u010custveni simboli ...",
-"Metadata and Document Properties": "Metapodatki in lastnosti dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne besede",
-"Description": "Opis",
-"Robots": "Robotki",
-"Author": "Avtor",
-"Encoding": "Kodiranje",
-"Fullscreen": "\u010cez cel zaslon",
-"Action": "Dejanje",
-"Shortcut": "Bli\u017enjica",
-"Help": "Pomo\u010d",
-"Address": "Naslov",
-"Focus to menubar": "Poudarek na menijski vrstici",
-"Focus to toolbar": "Poudarek na orodni vrstici",
-"Focus to element path": "Poudarek na poti elementa",
-"Focus to contextual toolbar": "Poudarek na kontekstualni orodni vrstici",
-"Insert link (if link plugin activated)": "Vstavi povezavo (\u010de je aktiviran vti\u010dnik za povezavo)",
-"Save (if save plugin activated)": "Shrani (\u010de je aktiviran vti\u010dnik za shranjevanje)",
-"Find (if searchreplace plugin activated)": "I\u0161\u010di (\u010de je aktiviran vti\u010dnik za iskanje\/zamenjavo)",
-"Plugins installed ({0}):": "Name\u0161\u010deni vti\u010dniki ({0}):",
-"Premium plugins:": "Premium vti\u010dniki:",
-"Learn more...": "Ve\u010d ...",
-"You are using {0}": "Uporabljate {0}",
-"Plugins": "Vti\u010dniki",
-"Handy Shortcuts": "Uporabne bli\u017enjice",
-"Horizontal line": "Vodoravna \u010drta",
-"Insert\/edit image": "Vstavi\/uredi sliko",
-"Image description": "Opis slike",
-"Source": "Pot",
-"Dimensions": "Dimenzije",
-"Constrain proportions": "Obdr\u017ei razmerje",
-"General": "Splo\u0161no",
-"Advanced": "Napredno",
-"Style": "Slog",
-"Vertical space": "Navpi\u010dni prostor",
-"Horizontal space": "Vodoravni prostor",
-"Border": "Obroba",
-"Insert image": "Vnesi sliko",
-"Image...": "Slika ...",
-"Image list": "Seznam slik",
-"Rotate counterclockwise": "Zavrti v nasprotni smeri urnega kazalca",
-"Rotate clockwise": "Zavrti v smeri urinega kazalca",
-"Flip vertically": "Obrni navpi\u010dno",
-"Flip horizontally": "Obrni vodoravno",
-"Edit image": "Uredi sliko",
-"Image options": "Mo\u017enosti slike",
-"Zoom in": "Pove\u010daj",
-"Zoom out": "Pomanj\u0161aj",
-"Crop": "Obre\u017ei",
-"Resize": "Spremeni velikost",
-"Orientation": "Usmerjenost",
-"Brightness": "Svetlost",
-"Sharpen": "Izostri",
-"Contrast": "Kontrast",
-"Color levels": "Barvni nivo",
-"Gamma": "Gama",
-"Invert": "Obrni",
-"Apply": "Uporabi",
-"Back": "Nazaj",
-"Insert date\/time": "Vstavi datum\/\u010das",
-"Date\/time": "Datum\/\u010das",
-"Insert\/Edit Link": "Vstavi\/uredi povezavo",
-"Insert\/edit link": "Vstavi\/uredi povezavo",
-"Text to display": "Prikazno besedilo",
-"Url": "Povezava",
-"Open link in...": "Odpri povezavo v ...",
-"Current window": "Trenutno okno",
-"None": "Brez",
-"New window": "Novo okno",
-"Remove link": "Odstrani povezavo",
-"Anchors": "Sidra",
-"Link...": "Povezava ...",
-"Paste or type a link": "Prilepite ali vnesite povezavo",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Vne\u0161eni URL predstavlja e-po\u0161tni naslov. Ali \u017eelite dodati potrebno \"mailto:\" predpono?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Vne\u0161eni URL predstavlja zunanjo povezavo. Ali \u017eelite dodati \"http:\/\/\" predpono?",
-"Link list": "Seznam povezav",
-"Insert video": "Vstavi video",
-"Insert\/edit video": "Vstavi\/uredi video",
-"Insert\/edit media": "Vstavi\/uredi medij",
-"Alternative source": "Nadomestni vir",
-"Alternative source URL": "Nadomestni vir URL",
-"Media poster (Image URL)": "Medijski poster (URL slike)",
-"Paste your embed code below:": "Prilepite kodo za vdelavo:",
-"Embed": "Vdelaj",
-"Media...": "Mediji ...",
-"Nonbreaking space": "Nedeljivi presledek",
-"Page break": "Prelom strani",
-"Paste as text": "Vnesi kot besedilo",
-"Preview": "Predogled",
-"Print...": "Natisni ...",
-"Save": "Shrani",
-"Find": "I\u0161\u010di",
-"Replace with": "Zamenjaj z",
-"Replace": "Zamenjaj",
-"Replace all": "Zamenjaj vse",
-"Previous": "Prej\u0161nja",
-"Next": "Naprej",
-"Find and replace...": "Najdi in zamenjaj ...",
-"Could not find the specified string.": "Iskanje ni vrnilo rezultatov.",
-"Match case": "Ujemanje malih in velikih \u010drk",
-"Find whole words only": "I\u0161\u010di samo cele besede",
-"Spell check": "\u010crkovanje",
-"Ignore": "Prezri",
-"Ignore all": "Prezri vse",
-"Finish": "Zaklju\u010di",
-"Add to Dictionary": "Dodaj v slovar",
-"Insert table": "Vstavi tabelo",
-"Table properties": "Lastnosti tabele",
-"Delete table": "Izbri\u0161i tabelo",
-"Cell": "Celica",
-"Row": "Vrstica",
-"Column": "Stolpec",
-"Cell properties": "Lastnosti celice",
-"Merge cells": "Zdru\u017ei celice",
-"Split cell": "Razdeli celico",
-"Insert row before": "Vstavi vrstico pred",
-"Insert row after": "Vstavi vrstico za",
-"Delete row": "Izbri\u0161i vrstico",
-"Row properties": "Lastnosti vrstice",
-"Cut row": "Izre\u017ei vrstico",
-"Copy row": "Kopiraj vrstico",
-"Paste row before": "Prilepi vrstico pred",
-"Paste row after": "Prilepi vrstico za",
-"Insert column before": "Vstavi stolpec pred",
-"Insert column after": "Vstavi stolpec za",
-"Delete column": "Izbri\u0161i stolpec",
-"Cols": "Stolpci",
-"Rows": "Vrstice",
-"Width": "\u0160irina",
-"Height": "Vi\u0161ina",
-"Cell spacing": "Razmik med celicami",
-"Cell padding": "Polnilo med celicami",
-"Show caption": "Poka\u017ei napis",
-"Left": "Levo",
-"Center": "Sredinsko",
-"Right": "Desno",
-"Cell type": "Tip celice",
-"Scope": "Obseg",
-"Alignment": "Poravnava",
-"H Align": "Horizontalna poravnava",
-"V Align": "Vertikalna poravnava",
-"Top": "Vrh",
-"Middle": "Sredina",
-"Bottom": "Dno",
-"Header cell": "Celica glave",
-"Row group": "Grupiranje vrstic",
-"Column group": "Grupiranje stolpcev",
-"Row type": "Tip vrstice",
-"Header": "Glava",
-"Body": "Vsebina",
-"Footer": "Noga",
-"Border color": "Barva obrobe",
-"Insert template...": "Vstavi predlogo ...",
-"Templates": "Predloge",
-"Template": "Predloga",
-"Text color": "Barva besedila",
-"Background color": "Barva ozadja",
-"Custom...": "Po meri ...",
-"Custom color": "Barva po meri",
-"No color": "Brezbarvno",
-"Remove color": "Odstrani barvo",
-"Table of Contents": "Kazalo",
-"Show blocks": "Prika\u017ei bloke",
-"Show invisible characters": "Prika\u017ei skrite znake",
-"Word count": "\u0160tevilo besed",
-"Words: {0}": "Besed: {0}",
-"{0} words": "{0} besed",
-"File": "Datoteka",
-"Edit": "Uredi",
-"Insert": "Vstavi",
-"View": "Pogled",
-"Format": "Oblika",
-"Table": "Tabela",
-"Tools": "Orodja",
-"Powered by {0}": "Uporablja tehnologijo {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Bogato besedilo. Pritisnite ALT-F9 za meni. Pritisnite ALT-F10 za orodno vrstico. Pritisnite ALT-0 za pomo\u010d",
-"Image title": "Naslov slike",
-"Border width": "\u0160irina obrobe",
-"Border style": "Slog obrobe",
-"Error": "Napaka",
-"Warn": "Opozorilo",
-"Valid": "Veljavno",
-"To open the popup, press Shift+Enter": "Za odpiranje pojavnega okna pritisnite Shift + Enter.",
-"Rich Text Area. Press ALT-0 for help.": "Bogato besedilo. Pritisnite ALT-0 za pomo\u010d.",
-"System Font": "Sistemska pisava",
-"Failed to upload image: {0}": "Napaka nalaganja slike: {0}",
-"Failed to load plugin: {0} from url {1}": "Napaka nalaganja vti\u010dnika: {0} z url {1}",
-"Failed to load plugin url: {0}": "Napaka nalaganja url: {0}",
-"Failed to initialize plugin: {0}": "Napaka inicializacije vti\u010dnika: {0}",
-"example": "primer",
-"Search": "Iskanje",
-"All": "Vse",
-"Currency": "Valuta",
-"Text": "Besedilo",
-"Quotations": "Citati",
-"Mathematical": "Matemati\u010dno",
-"Extended Latin": "Raz\u0161irjena latinica",
-"Symbols": "Simboli",
-"Arrows": "Pu\u0161\u010dice",
-"User Defined": "Uporabnik dolo\u010den",
-"dollar sign": "znak za dolar",
-"currency sign": "znak za valuto",
-"euro-currency sign": "znak za evro",
-"colon sign": "znak za dvopi\u010dje",
-"cruzeiro sign": "znak za cruzeiro",
-"french franc sign": "znak za francoski frank",
-"lira sign": "znak za liro",
-"mill sign": "znak za mill",
-"naira sign": "znak za nairo",
-"peseta sign": "znak za peseto",
-"rupee sign": "znak za rupijo",
-"won sign": "znak za won",
-"new sheqel sign": "znak za novi \u0161ekl",
-"dong sign": "znak za dong",
-"kip sign": "znak za kip",
-"tugrik sign": "znak za tugrik",
-"drachma sign": "znak za drahmo",
-"german penny symbol": "znak za nem\u0161ki peni",
-"peso sign": "znak za peso",
-"guarani sign": "znak za guarani",
-"austral sign": "znak za austral",
-"hryvnia sign": "znak za hrivnijo",
-"cedi sign": "znak za cedi",
-"livre tournois sign": "znak za livre tournois",
-"spesmilo sign": "znak za spesmilo",
-"tenge sign": "znak za tenge",
-"indian rupee sign": "znak za indijsko rupijo",
-"turkish lira sign": "znak za tur\u0161ko liro",
-"nordic mark sign": "znak za nordijsko marko",
-"manat sign": "znak za manat",
-"ruble sign": "znak za rubelj",
-"yen character": "znak za jen",
-"yuan character": "znak za yuan",
-"yuan character, in hong kong and taiwan": "znak za yuan, v Hongkongu in na Tajvanu",
-"yen\/yuan character variant one": "znak za jen\/yuan, prva razli\u010dica",
-"Loading emoticons...": "Nalaganje \u010dustvenih simbolov ...",
-"Could not load emoticons": "\u010custvenih simbolov ni mogo\u010de nalo\u017eiti.",
-"People": "Ljudje",
-"Animals and Nature": "\u017divali in narava",
-"Food and Drink": "Hrana in pija\u010da",
-"Activity": "Dejavnost",
-"Travel and Places": "Potovanja in kraji",
-"Objects": "Predmeti",
-"Flags": "Zastave",
-"Characters": "Znaki",
-"Characters (no spaces)": "Znaki (brez presledkov)",
-"Error: Form submit field collision.": "Napaka: navzkri\u017eje polja za oddajo obrazca",
-"Error: No form element found.": "Napaka: elementa oblike ni mogo\u010de najti",
-"Update": "Posodobitev",
-"Color swatch": "Vzorec barv",
-"Turquoise": "Turkizna",
-"Green": "Zelena",
-"Blue": "Modra",
-"Purple": "\u0160krlatna",
-"Navy Blue": "Mornarsko modra",
-"Dark Turquoise": "Temno turkizna",
-"Dark Green": "Temno zelena",
-"Medium Blue": "Srednje modra",
-"Medium Purple": "Srednje \u0161krlatna",
-"Midnight Blue": "Polno\u010dno modra",
-"Yellow": "Rumena",
-"Orange": "Oran\u017ena",
-"Red": "Rde\u010da",
-"Light Gray": "Svetlo siva",
-"Gray": "Siva",
-"Dark Yellow": "Temno rumena",
-"Dark Orange": "Temno oran\u017ena",
-"Dark Red": "Temno rde\u010da",
-"Medium Gray": "Srednje siva",
-"Dark Gray": "Temno siva",
-"Black": "\u010crna",
-"White": "Bela",
-"Switch to or from fullscreen mode": "Preklopi v ali iz celozaslonskega na\u010dina",
-"Open help dialog": "Odpri pogovorno okno za pomo\u010d",
-"history": "zgodovina",
-"styles": "slogi",
-"formatting": "oblikovanje",
-"alignment": "poravnava",
-"indentation": "zamik",
-"permanent pen": "permanentno pisalo",
-"comments": "komentarji",
-"Anchor": "Zaznamek",
-"Special character": "Posebni znaki",
-"Color": "Barva",
-"Emoticons": "Sme\u0161ki",
-"Document properties": "Lastnosti dokumenta",
-"Image": "Slika",
-"Insert link": "Vstavi povezavo",
-"Link": "Povezava",
-"Target": "Cilj",
-"Media": "Medij",
-"Poster": "Poster",
-"Print": "Natisni",
-"Whole words": "Cele besede",
-"Find and replace": "Poi\u0161\u010di in zamenjaj",
-"Prev": "Nazaj",
-"Spellcheck": "Preverjanje \u010drkovanja",
-"Caption": "Naslov",
-"Insert template": "Vstavi predlogo"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/sq.js Added

@@ -0,0 +1,219 @@
+tinymce.addI18n('sq',{
+"Cut": "prerje",
+"Heading 5": "titull 5",
+"Header 2": "titull 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Shfletuesi juaj nuk supurton qasje t\u00eb drejtp\u00ebrdrejt\u00eb n\u00eb clipboard. Ju lutemi p\u00ebrdorni Ctrl+X\/C\/V shkurtesat e tastier\u00ebs n\u00eb vend. ",
+"Heading 4": "titull 4",
+"Div": "ndarje",
+"Heading 2": "titull 2",
+"Paste": "ngjit",
+"Close": "Mbylle",
+"Font Family": "soj g\u00ebrmave",
+"Pre": "para",
+"Align right": "Radhit djathtas",
+"New document": "Dokument i ri",
+"Blockquote": "citat",
+"Numbered list": "list\u00eb e num\u00ebruara",
+"Heading 1": "titull 1",
+"Headings": "titull",
+"Increase indent": "rrit gjurm\u00eb",
+"Formats": "form\u00eb",
+"Headers": "titull",
+"Select all": "Selektoj t\u00eb gjitha",
+"Header 3": "titull 3",
+"Blocks": "bllok",
+"Undo": "Anuloj",
+"Strikethrough": "Vij\u00eb nga",
+"Bullet list": "list\u00eb plumb",
+"Header 1": "titull 1",
+"Superscript": "indeks i sip\u00ebrm",
+"Clear formatting": "spastroj formate",
+"Font Sizes": "p\u00ebrmasa e germave",
+"Subscript": "Indeksin e",
+"Header 6": "titull 6",
+"Redo": "rib\u00ebj",
+"Paragraph": "paragraf",
+"Ok": "Ok",
+"Bold": "i zi",
+"Code": "kod",
+"Italic": "kursiv",
+"Align center": "Radhit n\u00eb mes",
+"Header 5": "titull 5",
+"Heading 6": "titull 6",
+"Heading 3": "titull 3",
+"Decrease indent": "ulja gjurm\u00eb",
+"Header 4": "titull 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
+"Underline": "n\u00ebnvizoj",
+"Cancel": "Moho",
+"Justify": "justifikuar",
+"Inline": "nj\u00ebshkolon\u00eb",
+"Copy": "kopjoj",
+"Align left": "Radhit majtas",
+"Visual aids": "ndihm\u00ebsit vizuale",
+"Lower Greek": "Lower Greek",
+"Square": "Katror",
+"Default": "Default",
+"Lower Alpha": "Lower Alpha",
+"Circle": "Rreth",
+"Disc": "Disc",
+"Upper Alpha": "Upper Alpha",
+"Upper Roman": "Upper Roman",
+"Lower Roman": "Lower Roman",
+"Name": "Emri",
+"Anchor": "Anchor",
+"You have unsaved changes are you sure you want to navigate away?": "You have unsaved changes are you sure you want to navigate away?",
+"Restore last draft": "Restore last draft",
+"Special character": "Karakter i veqant",
+"Source code": "Kodi burimor",
+"B": "Kalt\u00ebr",
+"R": "Kuqe",
+"G": "Gjelb\u00ebr",
+"Color": "Ngjyra",
+"Right to left": "Nga e djathta n\u00eb t\u00eb majt\u00eb",
+"Left to right": "Nga e majta n\u00eb t\u00eb djatht\u00eb",
+"Emoticons": "Emoticons",
+"Robots": "Robot\u00ebt",
+"Document properties": "Vetit\u00eb e dokumentit",
+"Title": "Titulli",
+"Keywords": "Fjal\u00ebt kyqe",
+"Encoding": "Encoding",
+"Description": "Description",
+"Author": "Autori",
+"Fullscreen": "Fullscreen",
+"Horizontal line": "Vij\u00eb horizontale",
+"Horizontal space": "Hapsir\u00eb horizontale",
+"Insert\/edit image": "Shto\/ndrysho imazh",
+"General": "General",
+"Advanced": "T\u00eb p\u00ebrparuar",
+"Source": "Burimi",
+"Border": "Border",
+"Constrain proportions": "Constrain proportions",
+"Vertical space": "Hapsir\u00eb vertikale",
+"Image description": "P\u00ebrshkrimi i imazhit",
+"Style": "Stili",
+"Dimensions": "Dimensions",
+"Insert image": "Shto imazh",
+"Zoom in": "Zoom in",
+"Contrast": "Contrast",
+"Back": "Back",
+"Gamma": "Gamma",
+"Flip horizontally": "Flip horizontally",
+"Resize": "Resize",
+"Sharpen": "Sharpen",
+"Zoom out": "Zoom out",
+"Image options": "Image options",
+"Apply": "Apply",
+"Brightness": "Brightness",
+"Rotate clockwise": "Rotate clockwise",
+"Rotate counterclockwise": "Rotate counterclockwise",
+"Edit image": "Edit image",
+"Color levels": "Color levels",
+"Crop": "Crop",
+"Orientation": "Orientation",
+"Flip vertically": "Flip vertically",
+"Invert": "Invert",
+"Insert date\/time": "Insert date\/time",
+"Remove link": "Remove link",
+"Url": "Url",
+"Text to display": "Text to display",
+"Anchors": "Anchors",
+"Insert link": "Insert link",
+"New window": "New window",
+"None": "None",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"Target": "Target",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
+"Insert\/edit link": "Insert\/edit link",
+"Insert\/edit video": "Insert\/edit video",
+"Poster": "Poster",
+"Alternative source": "Alternative source",
+"Paste your embed code below:": "Paste your embed code below:",
+"Insert video": "Insert video",
+"Embed": "Embed",
+"Nonbreaking space": "Nonbreaking space",
+"Page break": "Page break",
+"Paste as text": "Paste as text",
+"Preview": "Preview",
+"Print": "Print",
+"Save": "Save",
+"Could not find the specified string.": "Could not find the specified string.",
+"Replace": "Replace",
+"Next": "Next",
+"Whole words": "Whole words",
+"Find and replace": "Find and replace",
+"Replace with": "Replace with",
+"Find": "Find",
+"Replace all": "Replace all",
+"Match case": "Match case",
+"Prev": "Prev",
+"Spellcheck": "Spellcheck",
+"Finish": "Finish",
+"Ignore all": "Ignore all",
+"Ignore": "Ignore",
+"Add to Dictionary": "Add to Dictionary",
+"Insert row before": "Insert row before",
+"Rows": "Rows",
+"Height": "Height",
+"Paste row after": "Paste row after",
+"Alignment": "Alignment",
+"Border color": "Border color",
+"Column group": "Column group",
+"Row": "Row",
+"Insert column before": "Insert column before",
+"Split cell": "Split cell",
+"Cell padding": "Cell padding",
+"Cell spacing": "Cell spacing",
+"Row type": "Row type",
+"Insert table": "Insert table",
+"Body": "Body",
+"Caption": "Caption",
+"Footer": "Footer",
+"Delete row": "Delete row",
+"Paste row before": "Paste row before",
+"Scope": "Scope",
+"Delete table": "Delete table",
+"H Align": "H Align",
+"Top": "Top",
+"Header cell": "Header cell",
+"Column": "Column",
+"Row group": "Row group",
+"Cell": "Cell",
+"Middle": "Middle",
+"Cell type": "Cell type",
+"Copy row": "Copy row",
+"Row properties": "Row properties",
+"Table properties": "Table properties",
+"Bottom": "Bottom",
+"V Align": "V Align",
+"Header": "Header",
+"Right": "Right",
+"Insert column after": "Insert column after",
+"Cols": "Cols",
+"Insert row after": "Insert row after",
+"Width": "Width",
+"Cell properties": "Cell properties",
+"Left": "Left",
+"Cut row": "Cut row",
+"Delete column": "Delete column",
+"Center": "Center",
+"Merge cells": "Merge cells",
+"Insert template": "Insert template",
+"Templates": "Templates",
+"Background color": "Background color",
+"Custom...": "Custom...",
+"Custom color": "Custom color",
+"No color": "No color",
+"Text color": "Text color",
+"Show blocks": "Show blocks",
+"Show invisible characters": "Show invisible characters",
+"Words: {0}": "Words: {0}",
+"Insert": "Insert",
+"File": "File",
+"Edit": "Edit",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
+"Tools": "Tools",
+"View": "View",
+"Table": "Table",
+"Format": "Format"
+});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/tg.js Deleted

@@ -1,415 +0,0 @@
-tinymce.addI18n('tg',{
-"Redo": "\u0411\u0435\u043a\u043e\u0440 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Undo": "\u0411\u043e\u0437 \u0433\u0430\u0440\u0434\u043e\u043d\u0438\u0434\u0430\u043d",
-"Cut": "\u0411\u0443\u0440\u0438\u0434\u0430\u043d",
-"Copy": "\u041d\u0443\u0441\u0445\u0430\u0431\u043e\u0440\u0434\u043e\u043d\u0438 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Paste": "\u0413\u0443\u0437\u043e\u0448\u0442\u0430\u043d",
-"Select all": "\u0418\u043d\u0442\u0438\u0445\u043e\u0431\u0438 \u043a\u0443\u043b\u043b\u0438",
-"New document": "\u04b2\u0443\u04b7\u04b7\u0430\u0442\u0438 \u043d\u0430\u0432",
-"Ok": "\u041e\u043a",
-"Cancel": "\u0411\u0435\u043a\u043e\u0440 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Visual aids": "\u041a\u0443\u043c\u043c\u0430\u043a\u0438 \u0430\u0451\u043d\u04e3",
-"Bold": "\u0492\u0430\u0444\u0441",
-"Italic": "\u0418\u0442\u0430\u043b\u0438\u043a",
-"Underline": "\u0414\u0430\u0440 \u0442\u0430\u0433\u0430\u0448 \u0445\u0430\u0442 \u043a\u0430\u0448\u0438\u0434\u0430\u043d",
-"Strikethrough": "\u0410\u0437 \u043c\u043e\u0431\u0430\u0439\u043d\u0430\u0448 \u0445\u0430\u0442 \u043a\u0430\u0448\u0438\u0434\u0430\u043d",
-"Superscript": "\u0410\u0437 \u0445\u0430\u0442 \u0431\u043e\u043b\u043e\u0442\u0430\u0440",
-"Subscript": "\u0410\u0437 \u0445\u0430\u0442 \u043f\u043e\u0451\u043d\u0442\u0430\u0440",
-"Clear formatting": "\u0424\u043e\u0440\u043c\u0430\u0442\u04b3\u043e\u0440\u043e \u0431\u0435\u043a\u043e\u0440 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Align left": "\u0420\u043e\u0441 \u043a\u0430\u0440\u0434\u0430\u043d \u0430\u0437 \u0447\u0430\u043f",
-"Align center": "\u0420\u043e\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d \u0430\u0437 \u043c\u043e\u0431\u0430\u0439\u043d",
-"Align right": "\u0420\u043e\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d \u0430\u0437 \u0440\u043e\u0441\u0442",
-"Justify": "\u0410\u0437 \u04b3\u0430\u0440 \u0434\u0443 \u0442\u0430\u0440\u0430\u0444 \u0440\u043e\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Bullet list": "\u0420\u0443\u0439\u0445\u0430\u0442\u0438 \u0431\u0435 \u0442\u0430\u0440\u0442\u0438\u0431",
-"Numbered list": "\u0420\u0443\u0439\u0445\u0430\u0442\u0438 \u0431\u043e \u0442\u0430\u0440\u0442\u0438\u0431",
-"Decrease indent": "\u0410\u0431\u0437\u0430\u0441\u0442\u0440\u043e \u0445\u0443\u0440\u0434 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Increase indent": "\u0410\u0431\u0437\u0430\u0441\u0442\u0440\u043e \u0432\u0430\u0441\u0435\u044a \u043a\u0430\u0440\u0434\u0430\u043d",
-"Close": "\u041c\u0430\u04b3\u043a\u0430\u043c \u043a\u0430\u0440\u0434\u0430\u043d",
-"Formats": "\u0424\u0430\u0440\u043c\u0430\u0442\u04b3\u043e",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0411\u0430\u0440\u0438 \u0448\u0443\u0441\u0445\u0430\u0431\u0430\u0440\u0434\u043e\u0440\u0438 \u043a\u0430\u0440\u0434\u0430\u043d Ctrl+X\/C\/V \u0438\u0441\u0442\u0438\u0444\u043e\u0434\u0430 \u043a\u0443\u043d\u0435\u0434",
-"Headers": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u04b3\u043e",
-"Header 1": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 1",
-"Header 2": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 2",
-"Header 3": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 3",
-"Header 4": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 4",
-"Header 5": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 5",
-"Header 6": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 6",
-"Headings": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u04b3\u043e",
-"Heading 1": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 1",
-"Heading 2": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 2",
-"Heading 3": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 3",
-"Heading 4": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 4",
-"Heading 5": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 5",
-"Heading 6": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430\u0438 6",
-"Preformatted": "\u0411\u0430\u0440\u043e\u0431\u0430\u0440 \u043a\u0430\u0440\u0434\u0430 \u0448\u0443\u0434\u0430",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "\u0410\u0431\u0437\u0430\u0441\u0442",
-"Blockquote": "\u041d\u043e\u0445\u0443\u043d\u0430\u043a",
-"Inline": "\u0414\u0430\u0440 \u044f\u043a \u0445\u0430\u0442",
-"Blocks": "\u0425\u0430\u0442\u0438 \u0431\u043b\u043e\u043a\u04e3",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0422\u043e \u043e\u043d \u0437\u0430\u043c\u043e\u043d\u0435, \u043a\u0438 \u0438\u043d \u0445\u043e\u043c\u0443\u0448 \u0430\u0441\u0442, \u04b3\u0430\u043c\u0447\u0443\u043d \u043c\u0430\u043d\u0442 \u0432\u043e\u0440\u0438\u0434 \u043a\u0443\u043d\u0435\u0434.",
-"Fonts": "\u04b2\u0443\u0440\u0443\u0444\u04b3\u043e",
-"Font Sizes": "\u04b2\u0430\u04b7\u043c\u0438 \u0448\u0440\u0438\u0444\u0442",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u0418\u043b\u043e\u0432\u0430\u0438 \u0441\u0443\u0440\u0430\u0442",
-"OR": "\u0401",
-"Drop an image here": "\u0421\u0443\u0440\u0430\u0442\u0440\u043e \u0438\u043d \u04b7\u043e \u043f\u0430\u0440\u0442\u043e\u0435\u0434",
-"Upload": "\u0411\u043e\u0440\u043a\u0443\u043d\u04e3",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u04b2\u0430\u043c\u0432\u043e\u0440 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Default": "\u0411\u043e \u0442\u0430\u0440\u0437\u0438 \u0445\u043e\u043c\u0443\u0448\u04e3",
-"Circle": "\u0414\u043e\u0438\u0440\u0430",
-"Disc": "\u0414\u0438\u0441\u043a",
-"Square": "\u0427\u043e\u0440\u043a\u0443\u043d\u04b7\u0430",
-"Lower Alpha": "\u0425\u0443\u0440\u0434\u0438 \u044e\u043d\u043e\u043d\u04e3",
-"Lower Greek": "\u0425\u0443\u0440\u0434\u0438 \u042e\u043d\u043e\u043d\u04e3",
-"Lower Roman": "\u0425\u0443\u0440\u0434\u0438 \u0440\u043e\u043c\u0430\u043d\u04e3",
-"Upper Alpha": "\u041a\u0430\u043b\u043e\u043d\u0438 \u044e\u043d\u043e\u043d\u04e3",
-"Upper Roman": "\u041a\u0430\u043b\u043e\u043d\u0438 \u0440\u043e\u043c\u0430\u043d\u04e3",
-"Anchor...": "\u0410\u043d\u0447\u0443\u043c\u0430\u043d",
-"Name": "\u041d\u043e\u043c",
-"Id": "\u041c\u0443\u0430\u0439\u044f\u043d\u043a\u0443\u043d\u0430\u043d\u0434\u0430 (Id)",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0431\u043e\u044f\u0434 \u0431\u043e \u04b3\u0430\u0440\u0444 \u043e\u0493\u043e\u0437 \u0448\u0430\u0432\u0430\u0434 \u0432\u0430 \u0442\u0430\u043d\u04b3\u043e \u0430\u0437 \u04b3\u0430\u0440\u0444\u04b3\u043e, \u0430\u0434\u0430\u0434\u04b3\u043e, \u0442\u0438\u0440\u0447\u0430\u04b3\u043e, \u043d\u0443\u049b\u0442\u0430\u04b3\u043e, \u0441\u0443\u0442\u0443\u043d\u04b3\u043e \u0451 \u0437\u0435\u0440\u043d\u0438\u0448\u0438\u043d\u04b3\u043e \u0438\u0441\u0442\u0438\u0444\u043e\u0434\u0430 \u0448\u0430\u0432\u0430\u0434.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0422\u0430\u0493\u0438\u0440\u043e\u0442\u04b3\u043e\u0438 \u043a\u0430\u0440\u0434\u0430\u0430\u0442\u043e\u043d\u0440\u043e \u0442\u043e \u04b3\u043e\u043b \u043d\u0438\u0433\u043e\u04b3 \u043d\u0430\u0434\u043e\u0448\u0442\u0430\u0435\u0434!\n\u041e\u0451 \u0448\u0443\u043c\u043e \u0434\u0430\u0440 \u04b3\u0430\u049b\u0438\u049b\u0430\u0442 \u043c\u0435\u0445\u043e\u04b3\u0435\u0434 \u043a\u0438 \u0431\u0430 \u0434\u0438\u0433\u0430\u0440 \u049b\u0438\u0441\u043c \u0433\u0443\u0437\u0430\u0440\u0435\u0434?",
-"Restore last draft": "\u0422\u0430\u0493\u0438\u0440\u043e\u0442\u04b3\u043e\u0438 \u043e\u0445\u0438\u0440\u0438\u043d\u0440\u043e \u0431\u0435\u043a\u043e\u0440 \u043a\u0443\u043d",
-"Special character...": "\u0425\u0443\u0441\u0443\u0441\u0438\u044f\u0442\u0438 \u043c\u0430\u0445\u0441\u0443\u0441 ...",
-"Source code": "\u041a\u043e\u0434\u0438 \u0430\u0441\u043b\u0438",
-"Insert\/Edit code sample": "\u0418\u043b\u043e\u0432\u0430\/\u0442\u0430\u0493\u0439\u0438\u0440 \u0434\u043e\u0434\u0430\u043d\u0438 \u043d\u0430\u043c\u0443\u043d\u0430\u0438 \u043a\u043e\u0434",
-"Language": "\u0417\u0430\u0431\u043e\u043d",
-"Code sample...": "\u041d\u0430\u043c\u0443\u043d\u0430\u0438 \u043a\u043e\u0434 ...",
-"Color Picker": "\u0418\u043d\u0442\u0438\u0445\u043e\u0431\u043a\u0443\u043d\u0430\u043d\u0434\u0430\u0438 \u0440\u0430\u043d\u0433",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0410\u0437 \u0447\u0430\u043f \u0431\u0430 \u0440\u043e\u0441\u0442",
-"Right to left": "\u0410\u0437 \u0440\u043e\u0441\u0442 \u0431\u0430 \u0447\u0430\u043f",
-"Emoticons...": "\u0418\u043b\u043e\u0432\u0430\u0438 \u0441\u043c\u0430\u0439\u043b",
-"Metadata and Document Properties": "\u041c\u0435\u0442\u0430\u0434\u043e\u0434\u0430\u04b3\u043e \u0432\u0430 \u0425\u0443\u0441\u0443\u0441\u0438\u044f\u0442\u04b3\u043e\u0438 \u04b3\u0443\u04b7\u04b7\u0430\u0442",
-"Title": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430",
-"Keywords": "\u041a\u0430\u043b\u0438\u043c\u0430\u04b3\u043e\u0438 \u043c\u0443\u0442\u0430\u043d\u043e\u0441\u0438\u0431",
-"Description": "\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u0438 \u043c\u0443\u0445\u0442\u0430\u0441\u0430\u0440",
-"Robots": "Robots",
-"Author": "\u041c\u0443\u0430\u043b\u043b\u0438\u0444",
-"Encoding": "\u0411\u043e \u0440\u0430\u043c\u0437 \u0433\u0430\u0440\u0434\u043e\u043d\u0438\u0434\u0430\u043d",
-"Fullscreen": "\u041a\u0430\u043b\u043e\u043d \u043a\u0430\u0440\u0434\u0430\u043d",
-"Action": "\u0410\u043c\u0430\u043b",
-"Shortcut": "\u0428\u043e\u0440\u0442\u043a\u043e\u0434",
-"Help": "\u0401\u0440\u04e3",
-"Address": "\u0421\u0443\u0440\u043e\u0493\u0430",
-"Focus to menubar": "\u0422\u0430\u0432\u0430\u04b7\u04b7\u04ef\u04b3 (\u0424\u043e\u043a\u0443\u0441) \u0431\u0430 \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0422\u0430\u0432\u0430\u04b7\u04b7\u04ef\u04b3 (\u0424\u043e\u043a\u0443\u0441) \u0431\u0430 \u043f\u0430\u043d\u0435\u043b\u0438 \u0430\u0441\u0431\u043e\u0431\u04b3\u043e",
-"Focus to element path": "\u0422\u0430\u0432\u0430\u04b7\u04b7\u04ef\u04b3 (\u0424\u043e\u043a\u0443\u0441)  \u0431\u0430 \u0440\u043e\u04b3\u0438 \u044d\u043b\u0435\u043c\u0435\u043d\u0442",
-"Focus to contextual toolbar": "\u0422\u0430\u0432\u0430\u04b7\u04b7\u04ef\u04b3 (\u0424\u043e\u043a\u0443\u0441) \u0431\u0430 \u043f\u0430\u043d\u0435\u043b\u0438 \u0430\u0441\u0431\u043e\u0431\u04b3\u043e\u0438 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u04e3",
-"Insert link (if link plugin activated)": "\u0412\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u043f\u0430\u0439\u0432\u0430\u043d\u0434\u0430\u043a (\u0430\u0433\u0430\u0440 \u043f\u043b\u0430\u0433\u0438\u043d\u0438 \u043f\u0430\u0439\u0432\u0430\u043d\u0434 \u0444\u0430\u044a\u043e\u043b \u0431\u043e\u0448\u0430\u0434)",
-"Save (if save plugin activated)": "\u0421\u0430\u0431\u0442 \u043a\u0430\u0440\u0434\u0430\u043d (\u0430\u0433\u0430\u0440 \u043f\u043b\u0430\u0433\u0438\u043d\u0438 \u0441\u0430\u0431\u0442 \u0444\u0430\u044a\u043e\u043b \u0431\u043e\u0448\u0430\u0434)",
-"Find (if searchreplace plugin activated)": "\u04b6\u0443\u0441\u0442\u0443\u04b7\u04ef (\u0430\u0433\u0430\u0440 \u043f\u043b\u0430\u0433\u0438\u043d\u0438 \u04b7\u043e\u0438 \u04b7\u0443\u0441\u0442\u0443\u04b7\u04ef \u0444\u0430\u044a\u043e\u043b \u0431\u043e\u0448\u0430\u0434)",
-"Plugins installed ({0}):": "\u041f\u043b\u0430\u0433\u0438\u043d\u04b3\u043e\u0438 \u043d\u0430\u0441\u0431\u0448\u0443\u0434\u0430 ({0}):",
-"Premium plugins:": "\u041f\u043b\u0430\u0433\u0438\u043d\u04b3\u043e\u0438 \u043f\u0440\u0435\u043c\u0438\u0443\u043c:",
-"Learn more...": "\u0411\u0435\u0448\u0442\u0430\u0440 \u0445\u043e\u043d\u0434\u0430\u043d...",
-"You are using {0}": "\u0428\u0443\u043c\u043e {0} -\u0440\u043e \u0438\u0441\u0442\u0438\u0444\u043e\u0434\u0430 \u043c\u0435\u0431\u0430\u0440\u0435\u0434",
-"Plugins": "\u041f\u043b\u0430\u0433\u0438\u043d\u04b3\u043e",
-"Handy Shortcuts": "\u0428\u043e\u0440\u0442\u043a\u043e\u0434\u0438 \u0434\u0430\u0441\u0442\u04e3",
-"Horizontal line": "\u0425\u0430\u0442\u0438 \u0443\u0444\u0443\u049b\u04e3",
-"Insert\/edit image": "\u0412\u043e\u0440\u0438\u0434\/\u0422\u0430\u0493\u0438\u0440\u0438 \u0440\u0430\u0441\u043c",
-"Image description": "\u041c\u0430\u044a\u043b\u0443\u043c\u043e\u0442\u0438 \u043c\u0443\u0445\u0442\u0430\u0441\u0430\u0440",
-"Source": "\u041c\u0430\u043a\u043e\u043d\u0438 \u0430\u0441\u043e\u0441\u04e3",
-"Dimensions": "\u0427\u0435\u043d\u0430\u043a\u04b3\u043e",
-"Constrain proportions": "\u0427\u0435\u043d\u0430\u043a\u04b3\u043e\u0438 \u043c\u0430\u04b7\u0431\u0443\u0440\u0438",
-"General": "\u041e\u0434\u0434\u0438",
-"Advanced": "\u041c\u0443\u0442\u0430\u0440\u0430\u049b\u0438",
-"Style": "\u0421\u0442\u0438\u043b",
-"Vertical space": "\u0424\u043e\u0441\u0438\u043b\u0430\u0438 \u0430\u043c\u0443\u0434\u04e3",
-"Horizontal space": "\u0424\u043e\u0441\u0438\u043b\u0430\u0438 \u0443\u0444\u0443\u049b\u04e3",
-"Border": "\u04b2\u0443\u0434\u0443\u0434",
-"Insert image": "\u0420\u0430\u0441\u043c \u0432\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Image...": "\u0421\u0443\u0440\u0430\u0442 ...",
-"Image list": "\u0420\u04ef\u0439\u0445\u0430\u0442\u0438 c\u0443\u0440\u0430\u0442\u04b3\u043e",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Rotate clockwise": "Rotate clockwise",
-"Flip vertically": "Flip vertically",
-"Flip horizontally": "Flip horizontally",
-"Edit image": "Edit image",
-"Image options": "Image options",
-"Zoom in": "Zoom in",
-"Zoom out": "Zoom out",
-"Crop": "Crop",
-"Resize": "Resize",
-"Orientation": "Orientation",
-"Brightness": "Brightness",
-"Sharpen": "Sharpen",
-"Contrast": "Contrast",
-"Color levels": "Color levels",
-"Gamma": "Gamma",
-"Invert": "Invert",
-"Apply": "Apply",
-"Back": "Back",
-"Insert date\/time": "\u0412\u043e\u0440\u0438\u0434\u0438 \u0420\u04ef\u0437\/\u0421\u043e\u0430\u0442",
-"Date\/time": "\u0420\u04ef\u0437\/\u0421\u043e\u0430\u0442",
-"Insert\/Edit Link": "\u0412\u043e\u0440\u0438\u0434\/\u0422\u0430\u04b3\u0440\u0438\u0440 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u043f\u0430\u0439\u0432\u0430\u043d\u0434",
-"Insert\/edit link": "\u0412\u043e\u0440\u0438\u0434\/\u0442\u0430\u0493\u0438\u0440 \u0434\u043e\u0434\u0430\u043d\u0438 \u0438\u0441\u0442\u0438\u043d\u043e\u0434",
-"Text to display": "\u041c\u0430\u0442\u043d \u0431\u0430\u0440\u043e\u0438 \u043c\u0430\u043d\u0437\u0443\u0440",
-"Url": "Url",
-"Open link in...": "\u041f\u0430\u0439\u0432\u0430\u043d\u0434\u0440\u043e \u043a\u0443\u0448\u043e\u0435\u0434 \u0434\u0430\u0440 ...",
-"Current window": "\u0420\u0430\u0432\u0437\u0430\u043d\u0430\u0438 \u04b7\u043e\u0440\u04e3",
-"None": "\u04b2\u0435\u04b7 \u0447\u0438\u0437",
-"New window": "\u0422\u0438\u0440\u0435\u0437\u0430\u0438 \u043d\u0430\u0432",
-"Remove link": "\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u0438\u0441\u0442\u0438\u043d\u043e\u0434",
-"Anchors": "\u041b\u0430\u043d\u0433\u0430\u0440",
-"Link...": "\u041f\u0430\u0439\u0432\u0430\u043d\u0434...",
-"Paste or type a link": "\u041f\u0430\u0439\u0432\u0430\u043d\u0434\u0440\u043e \u043c\u043e\u043d\u0435\u0434 \u0451 \u043d\u0430\u0432\u0438\u0441\u0435\u0434",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u0435, \u043a\u0438 \u0448\u0443\u043c\u043e \u0432\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0435\u0434 Email \u0430\u0434\u0440\u0435\u0441 \u0430\u0441\u0442. G\u0440\u0435\u0444\u0438\u043a\u0441\u0438 mailto: \u0438\u043b\u043e\u0432\u0430 \u043a\u0443\u043d\u0430\u043c?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0430\u0434\u0440\u0435\u0441\u0435, \u043a\u0438 \u0448\u0443\u043c\u043e \u0432\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0435\u0434 \u0438\u0441\u0442\u0438\u043d\u043e\u0434 \u0430\u0441\u0442. \u041f\u0440\u0435\u0444\u0438\u043a\u0441\u0438 http:\/\/: \u0438\u043b\u043e\u0432\u0430 \u043a\u0443\u043d\u0430\u043c?",
-"Link list": "\u0420\u04ef\u0439\u0445\u0430\u0442\u0438 \u043f\u0430\u0439\u0432\u0430\u043d\u0434\u04b3\u043e",
-"Insert video": "\u0412\u043e\u0440\u0438\u0434\u0438 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit video": "\u0412\u043e\u0440\u0438\u0434\/\u0442\u0430\u0493\u0438\u0440\u0438 \u0432\u0438\u0434\u0435\u043e",
-"Insert\/edit media": "\u0413\u0443\u0437\u043e\u0448\u0442\u0430\u043d\/\u0442\u0430\u04b3\u0440\u0438\u0440 \u0442\u0430\u0493\u0439\u0438\u0440\u0434\u043e\u0434\u0430\u043d\u0438 \u043c\u0435\u0434\u0438\u0430",
-"Alternative source": "\u0421\u0430\u0440\u0447\u0430\u0448\u043c\u0430\u0438 \u0430\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u04e3",
-"Alternative source URL": "\u041c\u0430\u043d\u0431\u0430\u0438 \u0430\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0438\u0438 URL",
-"Media poster (Image URL)": "\u042d\u044a\u043b\u043e\u043d\u0438 \u0440\u0430\u0441\u043e\u043d\u0430 (URL\u0438 \u0441\u0443\u0440\u0430\u0442)",
-"Paste your embed code below:": "embed \u043a\u043e\u0434\u0440\u043e \u0438\u043d\u04b7\u043e \u0432\u043e\u0440\u0438\u0434 \u043a\u0443\u043d\u0435\u0434",
-"Embed": "Embed",
-"Media...": "\u041c\u0435\u0434\u0438\u0430..",
-"Nonbreaking space": "\u0411\u0435\u0444\u043e\u0441\u0438\u043b\u0430",
-"Page break": "\u0421\u0430\u04b3\u0438\u0444\u0430\u0440\u043e \u0448\u0438\u043a\u0430\u0441\u0442\u0430\u043d",
-"Paste as text": "\u0413\u0443\u0437\u043e\u0448\u0442\u0430\u043d \u04b3\u0430\u043c\u0447\u0443 \u043c\u0430\u0442\u043d",
-"Preview": "\u041c\u0430\u043d\u0437\u0443\u0440",
-"Print...": "\u0427\u043e\u043f \u043a\u0430\u0440\u0434\u0430\u043d...",
-"Save": "\u041d\u0438\u0433\u043e\u04b3 \u0434\u043e\u0448\u0442\u0430\u043d",
-"Find": "\u0401\u0444\u0442\u0430\u043d",
-"Replace with": "\u0422\u0430\u0493\u0438\u0440 \u0431\u0430",
-"Replace": "\u0422\u0430\u0493\u0438\u0440",
-"Replace all": "\u0422\u0430\u0493\u0438\u0440\u0438 \u04b3\u0430\u043c\u0430\u0430\u0448",
-"Previous": "\u041f\u0435\u0448\u0442\u0430\u0440",
-"Next": "\u041e\u044f\u043d\u0434\u0430",
-"Find and replace...": "\u04b6\u0443\u0441\u0442\u0443\u04b7\u04ef \u0432\u0430 \u0438\u0432\u0430\u0437 ...",
-"Could not find the specified string.": "\u0425\u0430\u0442\u0438 \u0434\u0430\u0440\u0445\u043e\u0441\u0442\u0448\u0443\u0434\u0430\u0440\u043e \u0451\u0444\u0442\u0430 \u043d\u0430\u0442\u0430\u0432\u043e\u043d\u0438\u0441\u0442\u0430\u043c",
-"Match case": "\u041c\u0443\u0432\u043e\u0444\u0438\u049b\u0430\u0442",
-"Find whole words only": "\u0422\u0430\u043d\u04b3\u043e \u043a\u0430\u043b\u0438\u043c\u0430\u04b3\u043e\u0440\u043e \u04b7\u0443\u0441\u0442\u0430\u043d",
-"Spell check": "\u0421\u0430\u043d\u04b7\u0438\u0448\u0438 \u0438\u043c\u043b\u043e",
-"Ignore": "\u0410\u04b3\u0430\u043c\u0438\u044f\u0442 \u043d\u0430\u0434\u043e\u0434\u0430\u043d",
-"Ignore all": "\u0410\u04b3\u0430\u043c\u0438\u044f\u0442 \u043d\u0430\u0434\u043e\u0434\u0430\u043d \u0431\u0430 \u04b3\u0430\u043c\u043c\u0430\u0448",
-"Finish": "\u0422\u0430\u043c\u043e\u043c",
-"Add to Dictionary": "\u0414\u0430\u0440 \u043b\u0443\u0493\u0430\u0442 \u0438\u043b\u043e\u0432\u0430 \u043a\u0443\u043d",
-"Insert table": "\u0412\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u04b7\u0430\u0434\u0432\u0430\u043b",
-"Table properties": "\u0425\u0443\u0441\u0443\u0441\u0438\u044f\u0442\u0438 \u04b7\u0430\u0434\u0432\u0430\u043b",
-"Delete table": "\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u04b7\u0430\u0434\u0432\u0430\u043b",
-"Cell": "\u0421\u04ef\u0440\u043e\u0445",
-"Row": "\u0425\u0430\u0442",
-"Column": "\u0421\u0443\u0442\u0443\u043d",
-"Cell properties": "\u0425\u0443\u0441\u0443\u0441\u0438\u044f\u0442\u0438 \u0441\u04ef\u0440\u043e\u0445",
-"Merge cells": "\u0421\u04ef\u0440\u043e\u0445\u0438\u04b3\u043e\u0440\u043e \u044f\u043a\u04b7\u043e\u044f \u043a\u0430\u0440\u0434\u0430\u043d",
-"Split cell": "\u0421\u04ef\u0440\u043e\u0445\u0438\u04b3\u043e\u0440\u043e \u0431\u0443\u0440\u0438\u0434\u0430\u043d",
-"Insert row before": "\u0425\u0430\u0442 \u0432\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d \u043f\u0435\u0448 \u0430\u0437",
-"Insert row after": "\u0425\u0430\u0442 \u0432\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d \u043f\u0430\u0441 \u0430\u0437",
-"Delete row": "\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u0445\u0430\u0442",
-"Row properties": "\u0425\u0443\u0441\u0443\u0441\u0438\u044f\u0442\u0438 \u0445\u0430\u0442",
-"Cut row": "\u0411\u0443\u0440\u0438\u0434\u0430\u043d\u0438 \u0445\u0430\u0442",
-"Copy row": "\u041d\u0443\u0441\u0445\u0430\u0431\u043e\u0440\u0434\u043e\u0440\u0438\u0438 \u0445\u0430\u0442",
-"Paste row before": "\u0425\u0430\u0442 \u0433\u0443\u0437\u043e\u0448\u0442\u0430\u043d \u043f\u0435\u0448 \u0430\u0437",
-"Paste row after": "\u0425\u0430\u0442 \u0433\u0443\u0437\u043e\u0448\u0442\u0430\u043d \u043f\u0430\u0441 \u0430\u0437",
-"Insert column before": "\u0421\u0443\u0442\u0443\u043d \u0432\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d \u043f\u0435\u0448 \u0430\u0437",
-"Insert column after": "\u0421\u0443\u0442\u0443\u043d \u0432\u043e\u0440\u0438\u0434 \u043a\u0430\u0440\u0434\u0430\u043d \u043f\u0430\u0441 \u0430\u0437",
-"Delete column": "\u041d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u0441\u0443\u0442\u0443\u043d",
-"Cols": "\u0421\u0443\u0442\u0443\u043d\u04b3\u043e",
-"Rows": "\u0425\u0430\u0442\u04b3\u043e",
-"Width": "\u041f\u0430\u04b3\u043d\u0438",
-"Height": "\u0411\u0430\u043b\u0430\u043d\u0434\u0438",
-"Cell spacing": "\u0424\u043e\u0441\u0438\u043b\u0430\u0438 \u0431\u0435\u0440\u0443\u043d\u0430",
-"Cell padding": "\u0424\u043e\u0441\u0438\u043b\u0430\u0438 \u0434\u0430\u0440\u0443\u043d\u0430",
-"Show caption": "\u041d\u0430\u043c\u043e\u0438\u0448\u0438 \u0441\u0430\u0440\u043b\u0430\u0432\u04b3\u0430",
-"Left": "\u0427\u0430\u043f",
-"Center": "\u041c\u0430\u0440\u043a\u0430\u0437",
-"Right": "\u0420\u043e\u0441\u0442",
-"Cell type": "\u041d\u0430\u043c\u0443\u0434\u0438 \u0441\u0443\u0440\u043e\u0445\u04e3",
-"Scope": "Scope",
-"Alignment": "\u0420\u043e\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d",
-"H Align": "\u0410\u0437 \u0431\u043e\u043b\u043e \u0431\u0430 \u043f\u043e\u0451\u043d",
-"V Align": "\u0410\u0437 \u0447\u0430\u043f \u0431\u0430 \u0440\u043e\u0441\u0442",
-"Top": "\u0411\u043e\u043b\u043e",
-"Middle": "\u041c\u043e\u0431\u0430\u0439\u043d",
-"Bottom": "\u041f\u043e\u0451\u043d",
-"Header cell": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430",
-"Row group": "\u0413\u0443\u0440\u0443\u04b3\u0438 \u0445\u0430\u0442\u04b3\u043e",
-"Column group": "\u0413\u0443\u0440\u0443\u04b3\u0438 \u0441\u0443\u0442\u0443\u043d",
-"Row type": "\u041d\u0430\u043c\u0443\u0434\u0438 \u0445\u0430\u0442",
-"Header": "\u049a\u0438\u0441\u043c\u0438 \u0431\u043e\u043b\u043e\u0438",
-"Body": "\u049a\u0438\u0441\u043c\u0438 \u0430\u0441\u043b\u0438",
-"Footer": "\u049a\u0438\u0441\u043c\u0438 \u043f\u043e\u0451\u043d\u0438",
-"Border color": "\u0420\u0430\u043d\u0433\u0438 \u04b3\u0443\u0434\u0443\u0434",
-"Insert template...": "\u0428\u0430\u0431\u043b\u043e\u043d \u0433\u0443\u0437\u043e\u0440\u0435\u0434 ...",
-"Templates": "\u049a\u043e\u043b\u0430\u0431",
-"Template": "\u041d\u0430\u043c\u0443\u043d\u0430",
-"Text color": "\u0420\u0430\u043d\u0433\u0438 \u043c\u0430\u0442\u043d",
-"Background color": "\u0420\u0430\u043d\u0433\u0438 \u043f\u0443\u0448\u0442\u0438 \u043c\u0430\u0442\u043d",
-"Custom...": "\u0425\u0443\u0441\u0443\u0441\u04e3",
-"Custom color": "\u0420\u0430\u043d\u0433\u0438 \u0445\u0443\u0441\u0443\u0441\u04e3",
-"No color": "\u0411\u0435 \u0440\u0430\u043d\u0433",
-"Remove color": "\u0420\u0430\u043d\u0433\u0440\u043e \u043d\u0435\u0441\u0442 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Table of Contents": "\u041c\u0443\u043d\u0434\u0430\u0440\u0438\u04b7\u0430",
-"Show blocks": "\u041d\u0438\u0448\u043e\u043d \u0434\u043e\u0434\u0430\u043d\u0438 \u0433\u0443\u0440\u0443\u04b3\u04b3\u043e",
-"Show invisible characters": "\u0420\u0430\u043c\u0437\u04b3\u043e\u0438 \u043c\u0430\u0445\u0441\u0443\u0441\u0440\u043e \u043d\u0438\u0448\u043e\u043d \u0434\u043e\u0434\u0430\u043d",
-"Word count": "\u0428\u0443\u043c\u043e\u0440\u0430\u0438 \u043a\u0430\u043b\u0438\u043c\u0430\u04b3\u043e",
-"Count": "\u0428\u0443\u043c\u043e\u0440\u0430",
-"Document": "\u04b2\u0443\u04b7\u04b7\u0430\u0442",
-"Selection": "\u0418\u043d\u0442\u0438\u0445\u043e\u0431\u04b3\u043e",
-"Words": "\u041a\u0430\u043b\u0438\u043c\u0430\u04b3\u043e",
-"Words: {0}": "\u041a\u043b\u0438\u043c\u0430\u04b3\u043e: {0}",
-"{0} words": "{0} \u043a\u0430\u043b\u0438\u043c\u0430\u04b3\u043e",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0422\u0430\u0493\u0438\u0440\u043e\u0442",
-"Insert": "\u0412\u043e\u0440\u0438\u0434",
-"View": "\u041c\u0430\u043d\u0437\u0443\u0440 \u043a\u0430\u0440\u0434\u0430\u043d",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Table": "\u04b6\u0430\u0434\u0432\u0430\u043b",
-"Tools": "\u0410\u0441\u0431\u043e\u0431\u04b3\u043e",
-"Powered by {0}": "\u041d\u0435\u0440\u04ef\u043c\u0430\u043d\u0434\u0448\u0443\u0434\u0430 \u0430\u0437 \u04b7\u043e\u043d\u0438\u0431\u0438 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041c\u0435\u043d\u044e ALT-F9. \u0410\u0441\u0431\u043e\u0431\u04b3\u043e ALT-F10. \u041a\u0443\u043c\u043c\u0430\u043a ALT-0",
-"Image title": "\u0423\u043d\u0432\u043e\u043d\u0438 \u0442\u0430\u0441\u0432\u0438\u0440",
-"Border width": "\u041f\u0430\u04b3\u043c\u0438\u0438 \u0447\u043e\u0440\u0447\u04ef\u0431\u0430",
-"Border style": "\u0421\u0442\u0438\u043b\u0438 \u0447\u043e\u0440\u0447\u04ef\u0431\u0430",
-"Error": "\u0425\u0430\u0442\u043e\u0433\u04e3",
-"Warn": "\u041e\u0433\u043e\u04b3\u04e3",
-"Valid": "\u0414\u0443\u0440\u0443\u0441\u0442",
-"To open the popup, press Shift+Enter": "\u0411\u0430\u0440\u043e\u0438 \u043a\u0443\u0448\u043e\u0434\u0430\u043d\u0438 \u043f\u043e\u043f-\u0430\u043f, Shift + Enter\u0440\u043e \u043f\u0430\u0445\u0448 \u043a\u0443\u043d\u0435\u0434",
-"Rich Text Area. Press ALT-0 for help.": "\u041c\u0438\u043d\u0442\u0430\u049b\u0430\u0438 \u0431\u043e\u0439\u0438 \u043c\u0430\u0442\u043d. \u0411\u0430\u0440\u043e\u0438 \u043a\u04ef\u043c\u0430\u043a ALT-0 -\u0440\u043e \u043f\u0430\u0445\u0448 \u043a\u0443\u043d\u0435\u0434.",
-"System Font": "\u04b2\u0430\u0440\u0444\u0438 \u0441\u0438\u0441\u0442\u0435\u043c\u0430",
-"Failed to upload image: {0}": "\u0421\u0443\u0440\u0430\u0442 \u0431\u043e\u0440 \u043a\u0430\u0440\u0434\u0430 \u043d\u0430\u0448\u0443\u0434: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0411\u043e\u0440 \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u043f\u043b\u0430\u0433\u0438\u043d \u0438\u043c\u043a\u043e\u043d\u043d\u043e\u043f\u0430\u0437\u0438\u0440 \u043d\u0435\u0441\u0442: {0} \u0430\u0437 URL {1}",
-"Failed to load plugin url: {0}": "\u0425\u0430\u0442\u043e\u0433\u0438\u0438 URL, \u0431\u043e\u0440\u043a\u0443\u043d\u04e3 \u043c\u0443\u044f\u0441\u0441\u0430\u0440 \u043d\u0430\u0448\u0443\u0434: {0}",
-"Failed to initialize plugin: {0}": "\u0422\u0430\u043d\u0437\u0438\u043c \u043a\u0430\u0440\u0434\u0430\u043d\u0438 \u043f\u043b\u0430\u0433\u0438\u043d \u043c\u0443\u044f\u0441\u0441\u0430\u0440 \u043d\u0430\u0448\u0443\u0434: {0}",
-"example": "\u043d\u0430\u043c\u0443\u043d\u0430",
-"Search": "\u04b6\u0443\u0441\u0442\u0443\u04b7\u04ef",
-"All": "\u04b2\u0430\u043c\u0430",
-"Currency": "\u0410\u0441\u044a\u043e\u0440",
-"Text": "\u041c\u0430\u0442\u043d",
-"Quotations": "\u0418\u049b\u0442\u0438\u0431\u043e\u0441\u04b3\u043e",
-"Mathematical": "\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u043a\u04e3",
-"Extended Latin": "\u041b\u043e\u0442\u0438\u043d\u0438\u0438 \u0432\u0430\u0441\u0435\u044a",
-"Symbols": "\u0410\u043b\u043e\u043c\u0430\u0442\u04b3\u043e",
-"Arrows": "\u0422\u0438\u0440\u04b3\u043e",
-"User Defined": "\u041a\u043e\u0440\u0431\u0430\u0440 \u043c\u0443\u0430\u0439\u044f\u043d \u043a\u0430\u0440\u0434\u0430",
-"dollar sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0434\u043e\u043b\u043b\u0430\u0440",
-"currency sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0430\u0441\u044a\u043e\u0440",
-"euro-currency sign": "\u0435\u0432\u0440\u043e \u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0430\u0441\u044a\u043e\u0440",
-"colon sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043a\u043e\u043b\u043e\u043d",
-"cruzeiro sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 cruzeiro",
-"french franc sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0444\u0440\u0430\u043d\u043a\u0438 \u0444\u0430\u0440\u043e\u043d\u0441\u0430\u0432\u04e3",
-"lira sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043b\u0438\u0440\u0430",
-"mill sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043c\u0438\u043b",
-"naira sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043d\u0430\u0438\u0440\u0430",
-"peseta sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043f\u0435\u0441\u0435\u0442\u0430",
-"rupee sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0440\u0443\u043f\u0438",
-"won sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0432\u043e\u043d",
-"new sheqel sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0448\u0435\u043a\u0435\u043b\u0438 \u043d\u0430\u0432",
-"dong sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0434\u043e\u043d\u0433",
-"kip sign": "\u043d\u0438\u0448\u043e\u043d\u0438 \u043a\u0438\u043f",
-"tugrik sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0442\u0443\u0433\u0440\u0438\u043a",
-"drachma sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0434\u0440\u0430\u0445\u043c\u0430",
-"german penny symbol": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0434\u0438\u043d\u043e\u0440\u0438 \u041e\u043b\u043c\u043e\u043d",
-"peso sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043f\u0435\u0441\u043e",
-"guarani sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0433\u0443\u0430\u0440\u0430\u043d\u0430",
-"austral sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0430\u0432\u0441\u0442\u0440\u0430\u043b",
-"hryvnia sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0433\u0440\u0438\u0432\u043d\u0430",
-"cedi sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0441\u0435\u0434\u0438",
-"livre tournois sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043b\u0438\u0432\u0440 \u0442\u0443\u0440\u043d\u043e\u0441",
-"spesmilo sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0441\u043f\u0435\u0441\u043c\u0438\u043b\u043e",
-"tenge sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0442\u0435\u043d\u0433\u0435",
-"indian rupee sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0440\u0443\u043f\u0438\u0438 \u04b3\u0438\u043d\u0434\u04e3",
-"turkish lira sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043b\u0438\u0440\u0430\u0438 \u0442\u0443\u0440\u043a\u04e3",
-"nordic mark sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043c\u0430\u0440\u043a\u0438 \u043d\u043e\u0440\u0432\u0435\u0433\u0438",
-"manat sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u043c\u0430\u043d\u0430\u0442",
-"ruble sign": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0440\u0443\u0431\u043b",
-"yen character": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0439\u0435\u043d",
-"yuan character": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u044e\u0430\u043d",
-"yuan character, in hong kong and taiwan": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u044e\u0430\u043d, \u0434\u0430\u0440 \u0425\u043e\u043d\u0433 \u041a\u043e\u043d\u0433 \u0432\u0430 \u0422\u0430\u0439\u0432\u0430\u043d",
-"yen\/yuan character variant one": "\u0430\u043b\u043e\u043c\u0430\u0442\u0438 \u0439\u0435\u043d\/\u044e\u0430\u043d \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0438 \u044f\u043a\u0443\u043c",
-"Loading emoticons...": "\u0411\u043e\u0440\u043a\u0443\u043d\u0438\u0438 \u0441\u043c\u0430\u0439\u043b\u04b3\u043e ...",
-"Could not load emoticons": "\u0421\u043c\u0430\u0439\u043b\u04b3\u043e \u0431\u043e\u0440 \u043a\u0430\u0440\u0434\u0430 \u043d\u0430\u0448\u0443\u0434",
-"People": "\u041c\u0430\u0440\u0434\u0443\u043c",
-"Animals and Nature": "\u04b2\u0430\u0439\u0432\u043e\u043d\u043e\u0442 \u0432\u0430 \u0442\u0430\u0431\u0438\u0430\u0442",
-"Food and Drink": "\u0492\u0438\u0437\u043e \u0432\u0430 \u043d\u04ef\u0448\u043e\u043a\u04e3",
-"Activity": "\u0424\u0430\u044a\u043e\u043b\u0438\u044f\u0442",
-"Travel and Places": "\u0421\u0430\u0444\u0430\u0440 \u0432\u0430 \u04b7\u043e\u0439\u04b3\u043e",
-"Objects": "\u041e\u0431\u044a\u0435\u043a\u0442\u04b3\u043e",
-"Flags": "\u041f\u0430\u0440\u0447\u0430\u043c\u04b3\u043e",
-"Characters": "\u0410\u043b\u043e\u043c\u0430\u0442\u04b3\u043e",
-"Characters (no spaces)": "\u0410\u043b\u043e\u043c\u0430\u0442\u04b3\u043e (\u0431\u0435 \u0444\u043e\u0441\u0438\u043b\u0430)",
-"{0} characters": "{0} \u0430\u043b\u043e\u043c\u0430\u0442\u04b3\u043e",
-"Error: Form submit field collision.": "\u0425\u0430\u0442\u043e\u0433\u04e3: \u0414\u0430\u0440 \u043c\u0430\u0439\u0434\u043e\u043d\u04b3\u043e\u0438 \u0434\u043e\u0445\u0438\u043b\u043a\u0443\u043d\u0438 \u0437\u0438\u0434\u0434\u0438\u044f\u0442 \u0451\u0444\u0442 \u0448\u0443\u0434.",
-"Error: No form element found.": "\u0425\u0430\u0442\u043e\u0433\u04e3: \u042f\u0433\u043e\u043d \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u043c\u0430\u0439\u0434\u043e\u043d \u0451\u0444\u0442 \u043d\u0430\u0448\u0443\u0434.",
-"Update": "\u041d\u0430\u0432\u0441\u043e\u0437\u04e3",
-"Color swatch": "\u041a\u0430\u0448\u0438\u0448\u0438 \u0440\u0430\u043d\u0433",
-"Turquoise": "\u0422\u0443\u0440\u043a\u0443",
-"Green": "\u0421\u0430\u0431\u0437",
-"Blue": "\u041a\u0430\u0431\u0443\u0434",
-"Purple": "\u0410\u0440\u0493\u0443\u0432\u043e\u043d",
-"Navy Blue": "\u041a\u0430\u0431\u0443\u0434\u0438 \u0442\u0438\u0440\u0430",
-"Dark Turquoise": "\u0422\u0443\u0440\u043a\u0443\u0438 \u0442\u043e\u0440\u0438\u043a",
-"Dark Green": "\u0421\u0430\u0431\u0437\u0438 \u0442\u043e\u0440\u0438\u043a",
-"Medium Blue": "\u041a\u0430\u0431\u0443\u0434\u0438 \u043c\u0438\u0451\u043d\u0430",
-"Medium Purple": "\u0410\u0440\u0493\u0443\u0432\u043e\u043d\u0438 \u043c\u0438\u0451\u043d\u0430",
-"Midnight Blue": "\u041a\u0430\u0431\u0443\u0434\u0438 \u0442\u0438\u0440\u0430",
-"Yellow": "\u0417\u0430\u0440\u0434",
-"Orange": "\u041d\u043e\u0440\u0438\u043d\u04b7\u04e3",
-"Red": "\u0421\u0443\u0440\u0445",
-"Light Gray": "\u0425\u043e\u043a\u0438\u0441\u0442\u0430\u0440\u0440\u0430\u043d\u0433\u0438 \u0445\u0438\u0440\u0430",
-"Gray": "\u0425\u043e\u043a\u0438\u0441\u0442\u0430\u0440\u0440\u0430\u043d\u0433",
-"Dark Yellow": "\u0417\u0430\u0440\u0434\u0438 \u0442\u0438\u0440\u0430",
-"Dark Orange": "\u041d\u043e\u0440\u0438\u043d\u04b7\u0438\u0438 \u0442\u0438\u0440\u0430",
-"Dark Red": "\u0421\u0443\u0440\u0445\u0438 \u0442\u043e\u0440\u0438\u043a",
-"Medium Gray": "\u0425\u043e\u043a\u0438\u0441\u0442\u0430\u0440\u0440\u0430\u043d\u0433\u0438 \u043c\u0438\u0451\u043d\u0430",
-"Dark Gray": "\u0425\u043e\u043a\u0438\u0441\u0442\u0430\u0440\u0440\u0430\u043d\u0433\u0438 \u0442\u0438\u0440\u0430",
-"Light Green": "\u0421\u0430\u0431\u0437\u0438 \u0445\u0438\u0440\u0430",
-"Light Yellow": "\u0417\u0430\u0440\u0434\u0438 \u0445\u0438\u0440\u0430",
-"Light Red": "\u0421\u0443\u0440\u0445\u0438 \u0445\u0438\u0440\u0430",
-"Light Purple": "\u0410\u0440\u0493\u0443\u0432\u043e\u043d\u0438 \u0445\u0438\u0440\u0430",
-"Light Blue": "\u041a\u0430\u0431\u0443\u0434\u0438 \u0445\u0438\u0440\u0430",
-"Dark Purple": "\u0410\u0440\u0493\u0443\u0432\u043e\u043d\u0438 \u0442\u0438\u0440\u0430",
-"Dark Blue": "\u041a\u0430\u0431\u0443\u0434\u0438 \u0442\u043e\u0440\u0438\u043a",
-"Black": "\u0421\u0438\u0451\u04b3",
-"White": "\u0421\u0430\u0444\u0435\u0434",
-"Switch to or from fullscreen mode": "\u0411\u0430 \u04b3\u043e\u043b\u0430\u0442\u0438 \u043f\u0443\u0440\u0440\u0430\u0438 \u0440\u0430\u0432\u0437\u0430\u043d\u0430 \u0433\u0443\u0437\u0430\u0440\u0435\u0434",
-"Open help dialog": "\u041e\u0438\u043d\u0430\u0438 \u043a\u04ef\u043c\u0430\u043a\u0440\u043e \u043a\u0443\u0448\u043e\u0435\u0434",
-"history": "\u0442\u0430\u044a\u0440\u0438\u0445",
-"styles": "\u0443\u0441\u043b\u0443\u0431\u04b3\u043e",
-"formatting": "\u0444\u043e\u0440\u043c\u0430\u0442\u043e\u043d\u04e3",
-"alignment": "\u041c\u0443\u0442\u043e\u0431\u0438\u049b\u043a\u0443\u043d\u04e3",
-"indentation": "\u0444\u043e\u0441\u0438\u043b\u0430",
-"permanent pen": "\u049b\u0430\u043b\u0430\u043c",
-"comments": "\u0442\u0430\u0444\u0441\u0438\u0440\u04b3\u043e",
-"Format Painter": "\u0424\u043e\u0440\u043c\u0430\u0442 \u0440\u0430\u0441\u0441\u043a\u0430\u0448\u0430\u043a",
-"Insert\/edit iframe": "\u0412\u043e\u0440\u0438\u0434\/\u0442\u0430\u0493\u0438\u0440 \u0434\u043e\u0434\u0430\u043d\u0438 iframe",
-"Capitalization": "\u0421\u0430\u0440\u043c\u043e\u044f\u0433\u0443\u0437\u043e\u0440\u04e3",
-"lowercase": "\u0431\u043e \u04b3\u0430\u0440\u0444\u04b3\u043e\u0438 \u0445\u0443\u0440\u0434",
-"UPPERCASE": "\u0411\u041e \u04b2\u0410\u0420\u0424\u04b2\u041e\u0418 \u041a\u0410\u041b\u041e\u041d",
-"Title Case": "\u041f\u0430\u0440\u0432\u0430\u043d\u0434\u0430\u0438 \u0443\u043d\u0432\u043e\u043d",
-"Permanent Pen Properties": "\u0425\u0443\u0441\u0443\u0441\u0438\u044f\u0442\u04b3\u043e\u0438 \u049b\u0430\u043b\u0430\u043c",
-"Permanent pen properties...": "\u0425\u0443\u0441\u0443\u0441\u0438\u044f\u0442\u04b3\u043e\u0438 \u049b\u0430\u043b\u0430\u043c ...",
-"Font": "\u04b2\u0443\u0440\u0443\u0444",
-"Size": "\u0410\u043d\u0434\u043e\u0437\u0430",
-"More...": "\u0411\u0435\u0448\u0442\u0430\u0440...",
-"Spellcheck Language": "\u0417\u0430\u0431\u043e\u043d\u0438 \u0438\u043c\u043b\u043e",
-"Select...": "\u0418\u043d\u0442\u0438\u0445\u043e\u0431 \u043a\u0443\u043d\u0435\u0434 ...",
-"Preferences": "\u0410\u0444\u0437\u0430\u043b\u0438\u044f\u0442\u04b3\u043e",
-"Yes": "\u04b2a",
-"No": "\u041d\u0435",
-"Keyboard Navigation": "\u041d\u0430\u0432\u0438\u0433\u0430\u0442\u0441\u0438\u044f\u0438 \u043a\u043b\u0430\u0432\u0438\u0430\u0442\u0443\u0440\u0430",
-"Version": "\u0412\u0435\u0440\u0441\u0438\u044f",
-"Anchor": "\u041b\u0430\u043d\u0433\u0430\u0440",
-"Special character": "\u0420\u0430\u043c\u0437\u04b3\u043e\u0438 \u043c\u0430\u0445\u0441\u0443\u0441",
-"Color": "\u0420\u0430\u043d\u0433",
-"Emoticons": "\u042d\u04b3\u0441\u043e\u0441\u04b3\u043e",
-"Document properties": "\u04b2\u043e\u043b\u0430\u0442\u0438 \u04b3\u0443\u04b7\u04b7\u0430\u0442",
-"Insert link": "\u0418\u0441\u0442\u0438\u043d\u043e\u0434 \u0433\u0443\u0437\u043e\u0448\u0442\u0430\u043d",
-"Target": "\u041d\u0438\u0448\u043e\u043d\u0430",
-"Poster": "\u042d\u044a\u043b\u043e\u043d\u043d\u043e\u043c\u0430",
-"Print": "\u0427\u043e\u043f \u043a\u0430\u0440\u0434\u0430\u043d",
-"Whole words": "\u041a\u0430\u043b\u0438\u043c\u0430\u04b3\u043e\u0438 \u043f\u0443\u0440\u0440\u0430",
-"Find and replace": "\u0401\u0444\u0442\u0430\u043d \u0432\u0430 \u0442\u0430\u0493\u0438\u0440 \u0434\u043e\u0434\u0430\u043d",
-"Prev": "\u0413\u0443\u0437\u0430\u0448\u0442\u0430",
-"Spellcheck": "\u0422\u0430\u0444\u0442\u0438\u0448\u0438 \u0433\u0440\u0430\u043c\u043c\u0430\u0442\u0438\u043a\u04e3",
-"Caption": "\u0421\u0430\u0440\u043b\u0430\u0432\u04b3\u0430",
-"Insert template": "\u0412\u043e\u0440\u0438\u0434\u0438 \u049b\u043e\u043b\u0430\u0431"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/tt.js Deleted

@@ -1,219 +0,0 @@
-tinymce.addI18n('tt',{
-"Cut": "\u041a\u0438\u0441\u0435\u043f \u0430\u043b\u0443",
-"Heading 5": "\u0411\u0430\u0448\u043b\u0430\u043c 5",
-"Header 2": "\u0411\u0430\u0448\u043b\u0430\u043c 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0411\u0440\u0430\u0443\u0437\u0435\u0440\u044b\u0433\u044b\u0437 \u0430\u043b\u043c\u0430\u0448\u0443 \u0431\u0443\u0444\u0435\u0440\u044b\u043d\u0430 \u043a\u0435\u0440\u04af \u043c\u04e9\u043c\u043a\u0438\u043d\u043b\u0435\u0433\u0435 \u0431\u0435\u043b\u04d9\u043d \u0442\u04d9\u044d\u043c\u0438\u043d \u0438\u0442\u0435\u043b\u043c\u04d9\u0433\u04d9\u043d. \u0410\u043b\u043c\u0430\u0448\u043a\u0430 Ctrl+X\/C\/V \u043a\u0443\u043b\u043b\u0430\u043d\u044b\u0433\u044b\u0437.",
-"Heading 4": "\u0411\u0430\u0448\u043b\u0430\u043c 4",
-"Div": "Div",
-"Heading 2": "\u0411\u0430\u0448\u043b\u0430\u043c 2",
-"Paste": "\u04e8\u0441\u0442\u04d9\u04af",
-"Close": "\u042f\u0431\u044b\u0440\u0433\u0430",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442 \u0442\u04e9\u0440\u0435",
-"Pre": "\u0410\u043b\u0434\u0430\u043d \u0444\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u043d\u0433\u0430\u043d \u0442\u0435\u043a\u0441\u0442",
-"Align right": "\u0423\u04a3 \u044f\u043a \u043a\u044b\u0440\u044b\u0439\u0434\u0430\u043d \u0442\u0438\u0433\u0435\u0437\u043b\u04d9\u04af",
-"New document": "\u042f\u04a3\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
-"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u0430\u0446\u0438\u044f",
-"Heading 1": "\u0411\u0430\u0448\u043b\u0430\u043c 1",
-"Headings": "\u0411\u0430\u0448\u043b\u0430\u043c\u043b\u0430\u0440",
-"Increase indent": "\u041e\u0442\u0441\u0442\u0443\u043f\u043d\u044b \u0430\u0440\u0442\u0442\u044b\u0440\u0443",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u0440",
-"Headers": "\u0411\u0430\u0448\u043b\u0430\u043c\u043b\u0430\u0440",
-"Select all": "\u0411\u0430\u0440\u044b\u0441\u044b\u043d \u0441\u0430\u0439\u043b\u0430\u0443",
-"Header 3": "\u0411\u0430\u0448\u043b\u0430\u043c 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u043b\u0430\u0440",
-"Undo": "\u041a\u0430\u0439\u0442\u0430\u0440\u0443",
-"Strikethrough": "\u0421\u044b\u0437\u044b\u043b\u0433\u0430\u043d",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0435\u0440\u043b\u0430\u0440",
-"Header 1": "\u0411\u0430\u0448\u043b\u0430\u043c 1",
-"Superscript": "\u04e8\u0441\u043a\u0435 \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u0424\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u0443\u043d\u044b \u0447\u0438\u0441\u0442\u0430\u0440\u0442\u0443",
-"Font Sizes": "\u0428\u0440\u0438\u0444\u0442 \u0437\u0443\u0440\u043b\u044b\u043a\u043b\u0430\u0440\u044b",
-"Subscript": "\u0410\u0441\u043a\u044b \u0438\u043d\u0434\u0435\u043a\u0441",
-"Header 6": "\u0411\u0430\u0448\u043b\u0430\u043c 6",
-"Redo": "\u041a\u0430\u0431\u0430\u0442\u043b\u0430\u0443",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Ok": "\u0422\u04d9\u043c\u0430\u043c",
-"Bold": "\u041a\u0430\u043b\u044b\u043d",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Align center": "\u04ae\u0437\u04d9\u043a\u043a\u04d9 \u0442\u0438\u0433\u0435\u0437\u043b\u04d9\u04af",
-"Header 5": "\u0411\u0430\u0448\u043b\u0430\u043c 5",
-"Heading 6": "\u0411\u0430\u0448\u043b\u0430\u043c 6",
-"Heading 3": "\u0411\u0430\u0448\u043b\u0430\u043c 3",
-"Decrease indent": "\u041e\u0442\u0441\u0442\u0443\u043f\u043d\u044b \u043a\u0435\u0447\u0435\u0440\u04d9\u0439\u0442\u04af",
-"Header 4": "\u0411\u0430\u0448\u043b\u0430\u043c 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u04e8\u0441\u0442\u04d9\u043b\u04d9\u0441\u0435 \u0442\u0435\u043a\u0441\u0442 \u0445\u04d9\u0437\u0435\u0440 \u0444\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u043d\u043c\u0430\u0433\u0430\u043d \u0440\u0435\u0436\u0438\u043c\u0434\u0430. \u04d8\u043b\u0435\u0433\u0435 \u04af\u0437\u043b\u0435\u043a\u043d\u0435 \u0441\u04af\u043d\u0434\u0435\u0440\u043c\u04d9\u0433\u04d9\u043d \u043e\u0447\u0440\u0430\u043a\u0442\u0430 \u0442\u0435\u043a\u0441\u0442 \u0444\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u043d\u043c\u0430\u0433\u0430\u043d \u043a\u0438\u043b\u0435\u0448 \u04e9\u0441\u0442\u04d9\u043b\u0435\u0440.",
-"Underline": "\u0410\u0441\u0442\u044b\u043d\u0430 \u0441\u044b\u0437\u044b\u043b\u0433\u0430\u043d",
-"Cancel": "\u0411\u0430\u0448 \u0442\u0430\u0440\u0442\u0443",
-"Justify": "\u041a\u0438\u04a3\u043b\u0435\u043a\u043a\u04d9 \u043a\u0430\u0440\u0430\u043f \u0442\u0438\u0433\u0435\u0437\u043b\u04d9\u04af",
-"Inline": "\u042e\u043b \u0445\u04d9\u0440\u0435\u0444\u043b\u04d9\u0440\u0435",
-"Copy": "\u041a\u04af\u0447\u0435\u0440\u043c\u04d9\u043b\u04d9\u04af",
-"Align left": "\u0421\u0443\u043b \u044f\u043a \u043a\u044b\u0440\u044b\u0439\u0434\u0430\u043d \u0442\u0438\u0433\u0435\u0437\u043b\u04d9\u04af",
-"Visual aids": "\u041a\u04af\u0440\u0441\u04d9\u0442\u043c\u04d9 \u04d9\u0441\u0431\u0430\u043f\u043b\u0430\u0440",
-"Lower Greek": "\u0413\u0440\u0435\u043a \u044e\u043b \u0445\u04d9\u0440\u0435\u0444\u0435",
-"Square": "\u0428\u0430\u043a\u043c\u0430\u043a",
-"Default": "\u04d8\u04af\u0432\u04d9\u043b\u0433\u0435 \u043a\u04e9\u0439\u043b\u04d9\u04af\u043b\u04d9\u0440",
-"Lower Alpha": "\u0410\u043b\u044c\u0444\u0430 \u044e\u043b \u0445\u04d9\u0440\u0435\u0444\u0435",
-"Circle": "\u0422\u04af\u0433\u0259\u0440\u0259\u043a",
-"Disc": "\u0414\u0438\u0441\u043a",
-"Upper Alpha": "\u0410\u043b\u044c\u0444\u0430 \u0431\u0430\u0448 \u0445\u04d9\u0440\u0435\u0444\u0435",
-"Upper Roman": "\u0420\u0438\u043c \u0431\u0430\u0448 \u0445\u04d9\u0440\u0435\u0444\u0435",
-"Lower Roman": "\u0420\u0438\u043c \u044e\u043b \u0445\u04d9\u0440\u0435\u0444\u0435",
-"Name": "\u0418\u0441\u0435\u043c",
-"Anchor": "\u042f\u043a\u043e\u0440\u044c",
-"You have unsaved changes are you sure you want to navigate away?": "\u0421\u0430\u043a\u043b\u0430\u043d\u043c\u0430\u0433\u0430\u043d \u04af\u0437\u0433\u04d9\u0440\u0435\u0448\u043b\u04d9\u0440 \u0431\u0430\u0440. \u0421\u0435\u0437 \u0447\u044b\u043d\u043d\u0430\u043d \u0434\u0430 \u0447\u044b\u0433\u0430\u0440\u0433\u0430 \u0442\u0435\u043b\u0438\u0441\u0435\u0437\u043c\u0435?",
-"Restore last draft": "\u0421\u043e\u04a3\u0433\u044b \u043a\u0430\u0440\u0430\u043b\u0430\u043c\u0430\u043d\u044b \u043a\u0430\u0439\u0442\u0430\u0440\u0443",
-"Special character": "\u041c\u0430\u0445\u0441\u0443\u0441 \u0441\u0438\u043c\u0432\u043e\u043b",
-"Source code": "\u0427\u044b\u0433\u0430\u043d\u0430\u043a \u043a\u043e\u0434",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u0422\u04e9\u0441",
-"Right to left": "\u0423\u04a3\u043d\u0430\u043d \u0441\u0443\u043b\u0433\u0430 \u044f\u0437\u044b\u043b\u044b\u0448",
-"Left to right": "\u0421\u0443\u043b\u0434\u0430\u043d \u0443\u04a3\u0433\u0430 \u044f\u0437\u044b\u043b\u044b\u0448",
-"Emoticons": "\u0421\u043c\u0430\u0439\u043b\u043b\u0430\u0440",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u043b\u0430\u0440",
-"Document properties": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442 \u04af\u0437\u043b\u0435\u043a\u043b\u04d9\u0440\u0435",
-"Title": "\u0418\u0441\u0435\u043c",
-"Keywords": "\u0410\u0447\u043a\u044b\u0447 \u0441\u04af\u0437\u043b\u04d9\u0440",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430",
-"Description": "\u0422\u0430\u0441\u0432\u0438\u0440\u043b\u0430\u043c\u0430",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Fullscreen": "\u0422\u0443\u043b\u044b \u044d\u043a\u0440\u0430\u043d\u0434\u0430",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c \u0441\u044b\u0437\u044b\u043a",
-"Horizontal space": "\u042f\u0442\u043c\u0430 \u0430\u0440\u0430",
-"Insert\/edit image": "\u0420\u04d9\u0441\u0435\u043c \u04e9\u0441\u0442\u04d9\u04af\/\u04af\u0437\u0433\u04d9\u0440\u0442\u04af",
-"General": "\u0413\u043e\u043c\u0443\u043c\u0438",
-"Advanced": "\u041a\u0438\u04a3\u04d9\u0439\u0442\u0435\u043b\u0433\u04d9\u043d \u043a\u04e9\u0439\u043b\u04d9\u04af\u043b\u04d9\u0440",
-"Source": "\u0427\u044b\u0433\u0430\u043d\u0430\u043a",
-"Border": "\u0427\u0438\u043a",
-"Constrain proportions": "\u0427\u0438\u043a\u043b\u04d9\u043c\u04d9\u043b\u04d9\u0440 \u043f\u0440\u043e\u043f\u0440\u043e\u0440\u0446\u0438\u044f\u043b\u04d9\u0440\u0435",
-"Vertical space": "\u0410\u0441\u043c\u0430 \u0430\u0440\u0430",
-"Image description": "\u0422\u0430\u0441\u0432\u0438\u0440\u043b\u0430\u043c\u0430",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Dimensions": "\u04ae\u043b\u0447\u04d9\u043d\u0435\u0448\u043b\u04d9\u0440",
-"Insert image": "\u0420\u04d9\u0441\u0435\u043c \u04e9\u0441\u0442\u04d9\u04af",
-"Zoom in": "\u0417\u0443\u0440\u0430\u0439\u0442\u044b\u0440\u0433\u0430",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Back": "\u0411\u0430\u0448 \u0442\u0430\u0440\u0442\u0443",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Flip horizontally": "Flip horizontally",
-"Resize": "\u0417\u0443\u0440\u043b\u044b\u043a\u043d\u044b \u04af\u0437\u0433\u04d9\u0440\u0442\u04af",
-"Sharpen": "\u04ae\u0442\u043a\u0435\u043d\u043b\u0435\u043a",
-"Zoom out": "\u041a\u0435\u0447\u0435\u0440\u04d9\u0439\u0442\u0435\u0440\u0433\u04d9",
-"Image options": "Image options",
-"Apply": "\u0422\u04d9\u043c\u0430\u043c",
-"Brightness": "\u042f\u043a\u0442\u044b\u043b\u044b\u043a",
-"Rotate clockwise": "Rotate clockwise",
-"Rotate counterclockwise": "Rotate counterclockwise",
-"Edit image": "\u0420\u04d9\u0441\u0435\u043c \u04af\u0437\u0433\u04d9\u0440\u0442\u04af",
-"Color levels": "\u0422\u04e9\u0441\u043b\u04d9\u0440 \u043a\u04af\u043b\u04d9\u043c\u0435",
-"Crop": "\u041a\u0438\u0441\u04af",
-"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
-"Flip vertically": "Flip vertically",
-"Invert": "\u04d8\u0432\u0435\u0440\u0435\u043b\u0434\u0435\u0440\u04af",
-"Insert date\/time": "\u0414\u0430\u0442\u0430\/\u0432\u0430\u043a\u044b\u0442 \u04e9\u0441\u0442\u04d9\u04af",
-"Remove link": "\u0421\u044b\u043b\u0442\u0430\u043b\u0430\u043c\u0430\u043d\u044b \u0431\u0435\u0442\u0435\u0440\u04af",
-"Url": "\u0421\u044b\u043b\u0442\u0430\u043b\u0430\u043c\u0430",
-"Text to display": "\u041a\u04af\u0440\u0441\u04d9\u0442\u0435\u043b\u0433\u04d9\u043d \u0442\u0435\u043a\u0441\u0442",
-"Anchors": "\u042f\u043a\u043e\u0440\u044c\u043b\u04d9\u0440",
-"Insert link": "\u0421\u044b\u043b\u0442\u0430\u043b\u0430\u043c\u0430 \u04e9\u0441\u0442\u04d9\u04af",
-"New window": "\u042f\u04a3\u0430 \u0442\u04d9\u0440\u04d9\u0437\u04d9",
-"None": "\u04ba\u0438\u0447\u0431\u0435\u0440",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u04e8\u0441\u0442\u04d9\u043b\u0433\u04d9\u043d URL \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d \u043f\u043e\u0447\u0442\u0430 \u0430\u0434\u0440\u0435\u0441\u044b \u0431\u0443\u043b\u0441\u0430 \u043a\u0438\u0440\u04d9\u043a. \u0417\u0430\u0440\u0443\u0440\u0438 mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u04e9\u0441\u0442\u04d9\u043b\u0441\u0435\u043d\u043c\u0435?",
-"Target": "\u041c\u0430\u043a\u0441\u0430\u0442",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u04e8\u0441\u0442\u04d9\u043b\u0433\u04d9\u043d URL \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d \u043f\u043e\u0447\u0442\u0430 \u0430\u0434\u0440\u0435\u0441\u044b \u0431\u0443\u043b\u0441\u0430 \u043a\u0438\u0440\u04d9\u043a. \u0417\u0430\u0440\u0443\u0440\u0438 mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u04e9\u0441\u0442\u04d9\u043b\u0441\u0435\u043d\u043c\u0435?",
-"Insert\/edit link": "\u0421\u044b\u043b\u0442\u0430\u043b\u0430\u043c\u0430 \u04e9\u0441\u0442\u04d9\u04af\/\u04af\u0437\u0433\u04d9\u0440\u0442\u04af",
-"Insert\/edit video": "\u0412\u0438\u0434\u0435\u043e \u04e9\u0441\u0442\u04d9\u04af\/\u04af\u0437\u0433\u04d9\u0440\u0442\u04af",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432 \u0447\u044b\u0433\u0430\u043d\u0430\u043a",
-"Paste your embed code below:": "\u042d\u0447\u0435\u043d\u04d9 \u0441\u0430\u043b\u044b\u043d\u0433\u0430\u043d \u043a\u043e\u0434\u043d\u044b \u0442\u04af\u0431\u04d9\u043d\u0440\u04d9\u043a \u04e9\u0441\u0442\u04d9\u0433\u0435\u0437:",
-"Insert video": "\u0412\u0438\u0434\u0435\u043e \u04e9\u0441\u0442\u04d9\u04af",
-"Embed": "\u042d\u0447\u0435\u043d\u04d9 \u0441\u0430\u043b\u0443",
-"Nonbreaking space": "\u04e8\u0437\u0435\u043b\u043c\u04d9\u0441 \u0431\u0443\u0448\u043b\u044b\u043a",
-"Page break": "\u0411\u0438\u0442 \u0431\u04af\u043b\u0433\u0435\u0447\u0435",
-"Paste as text": "\u0424\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u0443\u0441\u044b\u0437 \u0442\u0435\u043a\u0441\u0442 \u04e9\u0441\u0442\u04d9\u04af",
-"Preview": "\u041a\u0430\u0440\u0430\u043f \u0430\u043b\u0443",
-"Print": "\u0411\u0430\u0441\u0442\u044b\u0440\u0443",
-"Save": "\u0421\u0430\u043a\u043b\u0430\u0443",
-"Could not find the specified string.": "\u042d\u0437\u043b\u04d9\u043d\u0433\u04d9\u043d \u044d\u043b\u0435\u043c\u0435\u043d\u0442 \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0434\u044b.",
-"Replace": "\u0410\u043b\u043c\u0430\u0448\u0442\u044b\u0440\u0443",
-"Next": "\u041a\u0438\u043b\u04d9\u0441\u0435",
-"Whole words": "\u0421\u04af\u0437\u043b\u04d9\u0440\u043d\u0435 \u0442\u0443\u043b\u044b\u0441\u044b\u043d\u0447\u0430 \u0433\u044b\u043d\u0430 \u044d\u0437\u043b\u04d9\u04af",
-"Find and replace": "\u042d\u0437\u043b\u04d9\u043f \u0442\u0430\u0431\u0443 \u04bb\u04d9\u043c \u0430\u043b\u043c\u0430\u0448\u0442\u044b\u0440\u0443",
-"Replace with": "\u041d\u04d9\u0440\u0441\u04d9\u0433\u04d9 \u0430\u043b\u043c\u0430\u0448\u0442\u044b\u0440\u0443",
-"Find": "\u042d\u0437\u043b\u04d9\u04af",
-"Replace all": "\u0411\u0430\u0440\u044b\u0441\u044b\u043d \u0434\u0430 \u0430\u043b\u043c\u0430\u0448\u0442\u044b\u0440\u0443",
-"Match case": "\u0411\u0430\u0448 \u04bb\u04d9\u043c \u044e\u043b \u0445\u04d9\u0440\u0435\u0444\u043b\u04d9\u0440\u0435\u043d \u0438\u0441\u04d9\u043f\u043a\u04d9 \u0430\u043b\u0443",
-"Prev": "\u0410\u043b\u0434\u0430\u0433\u044b",
-"Spellcheck": "\u0414\u04e9\u0440\u0435\u0441 \u044f\u0437\u044b\u043b\u044b\u0448",
-"Finish": "\u0422\u04d9\u043c\u0430\u043c",
-"Ignore all": "\u0411\u0430\u0440\u044b\u0441\u044b\u043d \u0434\u0430 \u043a\u0430\u043b\u0434\u044b\u0440\u0443",
-"Ignore": "\u0418\u0433\u044a\u0442\u0438\u0431\u0430\u0440\u0441\u044b\u0437 \u043a\u0430\u043b\u0434\u044b\u0440\u0443",
-"Add to Dictionary": "\u0421\u04af\u0437\u043b\u0435\u043a\u043a\u04d9 \u04e9\u0441\u0442\u04d9\u04af",
-"Insert row before": "\u04e8\u0441\u0442\u04d9\u043d \u044e\u043b\u043b\u0430\u0440 \u04e9\u0441\u0442\u04d9\u04af",
-"Rows": "\u042e\u043b\u043b\u0430\u0440",
-"Height": "\u0411\u0438\u0435\u043a\u043b\u0435\u043a",
-"Paste row after": "\u042e\u043b\u043d\u044b \u0430\u0441\u0442\u0430\u043d \u04e9\u0441\u0442\u04d9\u04af",
-"Alignment": "\u0422\u0438\u0433\u0435\u0437\u043b\u04d9\u04af",
-"Border color": "\u0427\u0438\u043a \u0442\u04e9\u0441\u0435",
-"Column group": "\u0411\u0430\u0433\u0430\u043d\u0430\u043b\u0430\u0440 \u0433\u0440\u0443\u043f\u043f\u0430\u0441\u044b",
-"Row": "\u042e\u043b",
-"Insert column before": "\u0421\u0443\u043b\u0434\u0430\u043d \u0431\u0430\u0433\u0430\u043d\u0430\u043b\u0430\u0440 \u04e9\u0441\u0442\u04d9\u04af",
-"Split cell": "\u041a\u04af\u0437\u04d9\u043d\u04d9\u043a\u043d\u0435 \u0431\u04af\u043b\u04af",
-"Cell padding": "\u041a\u04af\u0437\u04d9\u043d\u04d9\u043a\u043d\u0435 \u0442\u0443\u0442\u044b\u0440\u0443",
-"Cell spacing": "\u041a\u04af\u0437\u04d9\u043d\u04d9\u043a\u043b\u04d9\u0440 \u0430\u0440\u0430\u0441\u044b",
-"Row type": "\u042e\u043b \u0442\u04e9\u0440\u0435",
-"Insert table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430 \u04e9\u0441\u0442\u04d9\u04af",
-"Body": "\u0411\u04d9\u0434\u04d9\u043d",
-"Caption": "\u0418\u0441\u0435\u043c",
-"Footer": "\u0410\u0441\u043a\u044b \u04e9\u043b\u0435\u0448",
-"Delete row": "\u042e\u043b\u043d\u044b \u0431\u0435\u0442\u0435\u0440\u04af",
-"Paste row before": "\u042e\u043b\u043d\u044b \u04e9\u0441\u0442\u04d9\u043d \u04e9\u0441\u0442\u04d9\u04af",
-"Scope": "\u04e8\u043b\u043a\u04d9",
-"Delete table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430\u043d\u044b \u0431\u0435\u0442\u0435\u0440\u04af",
-"H Align": "\u042f\u0442\u043c\u0430 \u0442\u0438\u0433\u0435\u0437\u043b\u04d9\u04af",
-"Top": "\u04e8\u0441\u043a\u04d9",
-"Header cell": "\u0411\u0430\u0448 \u043a\u04af\u0437\u04d9\u043d\u04d9\u043a",
-"Column": "\u0411\u0430\u0433\u0430\u043d\u0430",
-"Row group": "\u042e\u043b\u043b\u0430\u0440 \u0433\u0440\u0443\u043f\u043f\u0430\u0441\u044b",
-"Cell": "\u041a\u04af\u0437\u04d9\u043d\u04d9\u043a",
-"Middle": "\u0423\u0440\u0442\u0430\u0433\u0430",
-"Cell type": "\u041a\u04af\u0437\u04d9\u043d\u04d9\u043a \u0442\u04e9\u0440\u0435",
-"Copy row": "\u042e\u043b\u043d\u044b \u043a\u04af\u0447\u0435\u0440\u043c\u04d9\u043b\u04d9\u04af",
-"Row properties": "\u042e\u043b \u04af\u0437\u043b\u0435\u043a\u043b\u04d9\u0440\u0435",
-"Table properties": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430 \u04af\u0437\u043b\u0435\u043a\u043b\u04d9\u0440\u0435",
-"Bottom": "\u0410\u0441\u043a\u0430",
-"V Align": "\u0410\u0441\u043c\u0430 \u0442\u0438\u0433\u0435\u0437\u043b\u04d9\u04af",
-"Header": "\u04e8\u0441\u043a\u0435 \u04e9\u043b\u0435\u0448",
-"Right": "\u0423\u04a3",
-"Insert column after": "\u0423\u04a3\u043d\u0430\u043d \u0431\u0430\u0433\u0430\u043d\u0430\u043b\u0430\u0440 \u04e9\u0441\u0442\u04d9\u04af",
-"Cols": "\u0411\u0430\u0433\u0430\u043d\u0430\u043b\u0430\u0440",
-"Insert row after": "\u0410\u0441\u0442\u0430\u043d \u044e\u043b\u043b\u0430\u0440 \u04e9\u0441\u0442\u04d9\u04af",
-"Width": "\u041a\u0438\u04a3\u043b\u0435\u043a",
-"Cell properties": "\u041a\u04af\u0437\u04d9\u043d\u04d9\u043a \u04af\u0437\u043b\u0435\u043a\u043b\u04d9\u0440\u0435",
-"Left": "\u0421\u0443\u043b",
-"Cut row": "\u042e\u043b\u043d\u044b \u043a\u0438\u0441\u0435\u043f \u0430\u043b\u0443",
-"Delete column": "\u0411\u0430\u0433\u0430\u043d\u0430\u043d\u044b \u0431\u0435\u0442\u0435\u0440\u04af",
-"Center": "\u04ae\u0437\u04d9\u043a",
-"Merge cells": "\u041a\u04af\u0437\u04d9\u043d\u04d9\u043a\u043b\u04d9\u0440\u043d\u0435 \u0431\u0435\u0440\u043b\u04d9\u0448\u0442\u0435\u0440\u04af",
-"Insert template": "\u0428\u0430\u0431\u043b\u043e\u043d \u04e9\u0441\u0442\u04d9\u04af",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u043d\u0430\u0440",
-"Background color": "\u0424\u043e\u043d \u0442\u04e9\u0441\u0435",
-"Custom...": "\u04ae\u0437\u0435\u043d\u0447\u04d9\u043b\u0435\u043a\u043b\u0435...",
-"Custom color": "\u04ae\u0437\u0435\u043d\u0447\u04d9\u043b\u0435\u043a\u043b\u0435 \u0442\u04e9\u0441",
-"No color": "\u0422\u04e9\u0441\u0441\u0435\u0437",
-"Text color": "\u0422\u0435\u043a\u0441\u0442 \u0442\u04e9\u0441\u0435",
-"Show blocks": "\u0411\u043b\u043e\u043a\u043b\u0430\u0440\u043d\u044b \u043a\u04af\u0440\u0441\u04d9\u0442\u04af",
-"Show invisible characters": "\u042f\u0448\u0435\u0440\u0435\u043d \u0441\u0438\u043c\u0432\u043e\u043b\u043b\u0430\u0440\u043d\u044b \u043a\u04af\u0440\u0441\u04d9\u0442\u04af",
-"Words: {0}": "\u0421\u04af\u0437\u043b\u04d9\u0440 \u0441\u0430\u043d\u044b: {0}",
-"Insert": "\u04e8\u0441\u0442\u04d9\u04af",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0422\u04e9\u043f",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0424\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u0443\u043b\u044b \u0442\u0435\u043a\u0441\u0442 \u04e9\u043b\u043a\u04d9\u0441\u0435. \u041c\u0435\u043d\u044e\u0433\u0430 \u043a\u0435\u0440\u0435\u0440 \u04e9\u0447\u0435\u043d ALT-F9 \u0431\u0430\u0441\u044b\u0433\u044b\u0437. \u041a\u043e\u0440\u0430\u043b\u043b\u0430\u0440 \u043f\u0430\u043d\u0435\u043b\u0435\u043d\u04d9 \u043a\u04af\u0447\u0435\u0440 \u04e9\u0447\u0435\u043d ALT-F10 \u0431\u0430\u0441\u044b\u0433\u044b\u0437. \u042f\u0440\u0434\u04d9\u043c \u04e9\u0447\u0435\u043d ALT-0 \u0431\u0430\u0441\u044b\u0433\u044b\u0437.",
-"Tools": "\u041a\u043e\u0440\u0430\u043b\u043b\u0430\u0440",
-"View": "\u041a\u04af\u0440\u0435\u043d\u0435\u0448",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442\u043b\u0430\u0443"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/uk.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('uk',{
-"Redo": "\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0438",
-"Undo": "\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438",
-"Cut": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438",
-"Copy": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438",
-"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"Select all": "\u0412\u0438\u0434\u0456\u043b\u0438\u0442\u0438 \u0432\u0441\u0435",
-"New document": "\u0421\u0442\u0432\u043e\u0440\u0438\u0442\u0438 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "\u0413\u0430\u0440\u0430\u0437\u0434",
-"Cancel": "\u0421\u043a\u0430\u0441\u0443\u0432\u0430\u0442\u0438",
-"Visual aids": "\u041d\u0430\u043e\u0447\u043d\u0456 \u043f\u0440\u0438\u043b\u0430\u0434\u0434\u044f",
-"Bold": "\u0416\u0438\u0440\u043d\u0438\u0439",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Underline": "\u041f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f",
-"Strikethrough": "\u041f\u0435\u0440\u0435\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f",
-"Superscript": "\u041d\u0430\u0434\u0440\u044f\u0434\u043a\u043e\u0432\u0438\u0439 \u0441\u0438\u043c\u0432\u043e\u043b",
-"Subscript": "\u041f\u0456\u0434\u0440\u044f\u0434\u043a\u043e\u0432\u0438\u0439 \u0441\u0438\u043c\u0432\u043e\u043b",
-"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Align left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Align center": "\u0412\u0438\u0440\u0456\u0432\u043d\u044f\u0442\u0438 \u043f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Align right": "\u0412\u0438\u0440\u0456\u0432\u043d\u044f\u0442\u0438 \u0437\u0430 \u043f\u0440\u0430\u0432\u0438\u043c \u043a\u0440\u0430\u0454\u043c",
-"Justify": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Bullet list": "\u041d\u0435\u043d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Decrease indent": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Increase indent": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Close": "\u0417\u0430\u043a\u0440\u0438\u0442\u0438",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0454 \u043f\u0440\u044f\u043c\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0430 \u043e\u0431\u043c\u0456\u043d\u0443. \u0412\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0439\u0442\u0435 \u043d\u0430\u0442\u043e\u043c\u0456\u0441\u0442\u044c \u0441\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448 Ctrl\u00a0+\u00a0C\/V\/X.",
-"Headers": "\u041a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b\u0438",
-"Header 1": "\u041a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b 1",
-"Header 2": "\u041a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b 2",
-"Header 3": "\u041a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b 3",
-"Header 4": "\u041a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b 4",
-"Header 5": "\u041a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b 5",
-"Header 6": "\u041a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b 6",
-"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Preformatted": "\u0424\u043e\u0440\u043c\u0430\u0442\u043e\u0432\u0430\u043d\u0438\u0439",
-"Div": "\u0420\u043e\u0437\u0434\u0456\u043b",
-"Pre": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0454 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u0410\u0431\u0437\u0430\u0446",
-"Blockquote": "\u0411\u043b\u043e\u043a \u0446\u0438\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Inline": "\u0420\u044f\u0434\u043a\u043e\u0432\u0438\u0439",
-"Blocks": "\u0411\u043b\u043e\u043a\u0438",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u0437\u0434\u0456\u0439\u0441\u043d\u044e\u0454\u0442\u044c\u0441\u044f \u0443 \u0432\u0438\u0433\u043b\u044f\u0434\u0456 \u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0443, \u043f\u043e\u043a\u0438 \u043d\u0435 \u0432\u0456\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u0438 \u0434\u0430\u043d\u0443 \u043e\u043f\u0446\u0456\u044e.",
-"Fonts": "\u0428\u0440\u0438\u0444\u0442\u0438",
-"Font Sizes": "\u0420\u043e\u0437\u043c\u0456\u0440\u0438 \u0448\u0440\u0438\u0444\u0442\u0443",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"OR": "\u0410\u0411\u041e",
-"Drop an image here": "\u041f\u0435\u0440\u0435\u043c\u0456\u0441\u0442\u0456\u0442\u044c \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f \u0441\u044e\u0434\u0438",
-"Upload": "\u0417\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0438\u0439",
-"Circle": "\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u0456",
-"Disc": "\u041a\u0440\u0443\u0433\u0438",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
-"Lower Alpha": "\u041c\u0430\u043b\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Lower Greek": "\u041c\u0430\u043b\u0456 \u0433\u0440\u0435\u0446\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Lower Roman": "\u041c\u0430\u043b\u0456 \u0440\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
-"Upper Alpha": "\u0412\u0435\u043b\u0438\u043a\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
-"Anchor...": "\u042f\u043a\u0456\u0440\u2026",
-"Name": "\u041d\u0430\u0437\u0432\u0430",
-"Id": "\u041a\u043e\u0434",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u041a\u043e\u0434 \u043c\u0430\u0454 \u043f\u043e\u0447\u0438\u043d\u0430\u0442\u0438\u0441\u044f \u0437 \u043b\u0456\u0442\u0435\u0440\u0438 \u0456 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043b\u0438\u0448\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u043b\u0456\u0442\u0435\u0440, \u0446\u0438\u0444\u0440, \u0434\u0435\u0444\u0456\u0441\u0443, \u043a\u0440\u0430\u043f\u043a\u0438, \u043a\u043e\u043c\u0438 \u0430\u0431\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u0433\u043e \u043f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0412\u0430\u0441 \u0454 \u043d\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456 \u0437\u043c\u0456\u043d\u0438. \u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043f\u0456\u0442\u0438?",
-"Restore last draft": "\u0412\u0456\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044f \u043e\u0441\u0442\u0430\u043d\u043d\u044c\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0443",
-"Special character...": "\u0421\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0438\u0439 \u0441\u0438\u043c\u0432\u043e\u043b\u2026",
-"Source code": "\u0412\u0438\u0445\u0456\u0434\u043d\u0438\u0439 \u043a\u043e\u0434",
-"Insert\/Edit code sample": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0437\u043c\u0456\u043d\u0438\u0442\u0438 \u043f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Language": "\u041c\u043e\u0432\u0430",
-"Code sample...": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443\u2026",
-"Color Picker": "\u041f\u0456\u043f\u0435\u0442\u043a\u0430 \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
-"R": "\u0427",
-"G": "\u0417",
-"B": "\u0411",
-"Left to right": "\u0417\u043b\u0456\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0456\u0432\u043e",
-"Emoticons...": "\u0421\u043c\u0430\u0439\u043b\u0438\u043a\u0438\u2026",
-"Metadata and Document Properties": "\u041c\u0435\u0442\u0430\u0434\u0430\u043d\u0456 \u0456 \u0432\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Description": "\u041e\u043f\u0438\u0441",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0443\u0432\u0430\u043d\u043d\u044f",
-"Fullscreen": "\u041f\u043e\u0432\u043d\u043e\u0435\u043a\u0440\u0430\u043d\u043d\u0438\u0439 \u0440\u0435\u0436\u0438\u043c",
-"Action": "\u0414\u0456\u044f",
-"Shortcut": "\u042f\u0440\u043b\u0438\u043a",
-"Help": "\u0414\u043e\u043f\u043e\u043c\u043e\u0433\u0430",
-"Address": "\u0410\u0434\u0440\u0435\u0441\u0430",
-"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u0445",
-"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0448\u043b\u044f\u0445\u0443",
-"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442\u0456",
-"Insert link (if link plugin activated)": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f (\u044f\u043a\u0449\u043e \u043f\u043b\u0430\u0433\u0456\u043d \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u044c \u0430\u043a\u0442\u0438\u0432\u043e\u0432\u0430\u043d\u0438\u0439)",
-"Save (if save plugin activated)": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 (\u044f\u043a\u0449\u043e \u043f\u043b\u0430\u0433\u0456\u043d \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u043d\u044f \u0430\u043a\u0442\u0438\u0432\u043e\u0432\u0430\u043d\u043e)",
-"Find (if searchreplace plugin activated)": "\u0417\u043d\u0430\u0439\u0442\u0438 (\u044f\u043a\u0449\u043e \u043f\u043b\u0430\u0433\u0456\u043d \u043f\u043e\u0448\u0443\u043a\u0443 \u0430\u043a\u0442\u0438\u0432\u043e\u0432\u0430\u043d\u043e)",
-"Plugins installed ({0}):": "\u0412\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0456 \u043f\u043b\u0430\u0433\u0456\u043d\u0438 ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0456\u0443\u043c \u043f\u043b\u0430\u0433\u0456\u043d\u0438:",
-"Learn more...": "\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e...",
-"You are using {0}": "\u0423 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u0430\u043d\u043d\u0456 {0}",
-"Plugins": "\u041f\u043b\u0430\u0433\u0456\u043d\u0438",
-"Handy Shortcuts": "\u041a\u043b\u0430\u0432\u0456\u0430\u0442\u0443\u0440\u043d\u0456 \u0441\u043a\u043e\u0440\u043e\u0447\u0435\u043d\u043d\u044f",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430 \u043b\u0456\u043d\u0456\u044f",
-"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0437\u043c\u0456\u043d\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image description": "\u041e\u043f\u0438\u0441 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Source": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
-"Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440",
-"Constrain proportions": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0442\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0456\u0457",
-"General": "\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0456",
-"Advanced": "\u0420\u043e\u0437\u0448\u0438\u0440\u0435\u043d\u0456",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Border": "\u041c\u0435\u0436\u0430",
-"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image...": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f\u2026",
-"Image list": "\u041f\u0435\u0440\u0435\u043b\u0456\u043a \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u044c",
-"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u043f\u0440\u043e\u0442\u0438 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u0457 \u0441\u0442\u0440\u0456\u043b\u043a\u0438",
-"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u0437\u0430 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u044e \u0441\u0442\u0440\u0456\u043b\u043a\u043e\u044e",
-"Flip vertically": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0456",
-"Flip horizontally": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0456",
-"Edit image": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image options": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Zoom in": "\u041d\u0430\u0431\u043b\u0438\u0437\u0438\u0442\u0438",
-"Zoom out": "\u0412\u0456\u0434\u0434\u0430\u043b\u0438\u0442\u0438",
-"Crop": "\u041e\u0431\u0440\u0456\u0437\u0430\u0442\u0438",
-"Resize": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0440",
-"Orientation": "\u041e\u0440\u0456\u0454\u043d\u0442\u0430\u0446\u0456\u044f",
-"Brightness": "\u042f\u0441\u043a\u0440\u0430\u0432\u0456\u0441\u0442\u044c",
-"Sharpen": "\u0427\u0456\u0442\u043a\u0456\u0441\u0442\u044c",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0420\u0456\u0432\u043d\u0456 \u043a\u043e\u043b\u044c\u043e\u0440\u0456\u0432",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Invert": "\u0406\u043d\u0432\u0435\u0440\u0441\u0456\u044f",
-"Apply": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438",
-"Back": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044f",
-"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert\/Edit Link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0434\u043b\u044f \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Url": "\u0410\u0434\u0440\u0435\u0441\u0430 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Open link in...": "\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f \u0432\u2026",
-"Current window": "\u0423 \u043f\u043e\u0442\u043e\u0447\u043d\u043e\u043c\u0443 \u0432\u0456\u043a\u043d\u0456",
-"None": "\u041d\u0456",
-"New window": "\u0423 \u043d\u043e\u0432\u043e\u043c\u0443 \u0432\u0456\u043a\u043d\u0456",
-"Remove link": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Anchors": "\u042f\u043a\u043e\u0440\u0456",
-"Link...": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f\u2026",
-"Paste or type a link": "\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u0430\u0431\u043e \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0443 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0457 \u043f\u043e\u0448\u0442\u0438. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 mailto: \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 http:\/\/ \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
-"Link list": "\u041f\u0435\u0440\u0435\u043b\u0456\u043a \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u044c",
-"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0430\u0443\u0434\u0456\u043e",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0435 \u0434\u0436\u0435\u0440\u0435\u043b\u043e",
-"Alternative source URL": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f \u043d\u0430 \u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0435 \u0434\u0436\u0435\u0440\u0435\u043b\u043e",
-"Media poster (Image URL)": "\u0421\u0432\u0456\u0442\u043b\u0438\u043d\u0430 \u043c\u0435\u0434\u0456\u0430 (\u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f \u043d\u0430 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f)",
-"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0447\u0435:",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u0432\u0441\u0442\u0430\u0432\u043a\u0438",
-"Media...": "\u041c\u0435\u0434\u0456\u0430\u2026",
-"Nonbreaking space": "\u041d\u0435\u0440\u043e\u0437\u0440\u0438\u0432\u043d\u0438\u0439 \u043f\u0440\u043e\u0431\u0456\u043b",
-"Page break": "\u0420\u043e\u0437\u0440\u0438\u0432 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0438",
-"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044f\u043a \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434",
-"Print...": "\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438\u2026",
-"Save": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438",
-"Find": "\u0417\u043d\u0430\u0439\u0442\u0438",
-"Replace with": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430",
-"Replace": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
-"Replace all": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u0432\u0441\u0435",
-"Previous": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439",
-"Next": "\u0412\u043d\u0438\u0437",
-"Find and replace...": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0456\u043d\u0430\u2026",
-"Could not find the specified string.": "\u0412\u043a\u0430\u0437\u0430\u043d\u0438\u0439 \u0440\u044f\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u0430\u0439\u0434\u0435\u043d\u043e",
-"Match case": "\u0412\u0440\u0430\u0445\u043e\u0432\u0443\u0432\u0430\u0442\u0438 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"Find whole words only": "\u0428\u0443\u043a\u0430\u0442\u0438 \u0442\u0456\u043b\u044c\u043a\u0438 \u0446\u0456\u043b\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Spell check": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0443",
-"Ignore": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438",
-"Ignore all": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0435",
-"Finish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u0438",
-"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0434\u043e \u0421\u043b\u043e\u0432\u043d\u0438\u043a\u0430",
-"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Table properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0442\u0430\u0431\u043b\u0438\u0446\u0456",
-"Delete table": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430",
-"Row": "\u0420\u044f\u0434\u043e\u043a",
-"Column": "\u0421\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Merge cells": "\u041e\u0431'\u0454\u0434\u043d\u0430\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Split cell": "\u0420\u043e\u0437\u0431\u0438\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0443",
-"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
-"Delete row": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u0440\u044f\u0434\u043a\u0430",
-"Cut row": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Copy row": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
-"Insert column before": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043b\u0456\u0432\u043e\u0440\u0443\u0447",
-"Insert column after": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
-"Delete column": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cols": "\u0421\u0442\u043e\u0432\u043f\u0446\u0456",
-"Rows": "\u0420\u044f\u0434\u043a\u0438",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u0438\u0441\u043e\u0442\u0430",
-"Cell spacing": "\u0412\u0456\u0434\u0441\u0442\u0430\u043d\u044c \u043c\u0456\u0436 \u043a\u043e\u043c\u0456\u0440\u043a\u0430\u043c\u0438",
-"Cell padding": "\u041f\u043e\u043b\u044f \u043a\u043e\u043c\u0456\u0440\u043e\u043a",
-"Show caption": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Cell type": "\u0422\u0438\u043f \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Scope": "\u0421\u0444\u0435\u0440\u0430",
-"Alignment": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0435  \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Middle": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Bottom": "\u041f\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Header cell": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u044f\u0434\u043a\u0456\u0432",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u0442\u043e\u0432\u043f\u0446\u0456\u0432",
-"Row type": "\u0422\u0438\u043f \u0440\u044f\u0434\u043a\u0430",
-"Header": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Body": "\u0422\u0456\u043b\u043e",
-"Footer": "\u041d\u0438\u0436\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Border color": "\u043a\u043e\u043b\u0456\u0440 \u0440\u0430\u043c\u043a\u0438",
-"Insert template...": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0448\u0430\u0431\u043b\u043e\u043d\u2026",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u041a\u043e\u043b\u0456\u0440 \u0442\u0435\u043a\u0441\u0442\u0443",
-"Background color": "\u041a\u043e\u043b\u0456\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439",
-"Custom color": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439 \u043a\u043e\u043b\u0456\u0440",
-"No color": "\u0431\u0435\u0437 \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
-"Remove color": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043a\u043e\u043b\u0456\u0440",
-"Table of Contents": "\u0417\u043c\u0456\u0441\u0442",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0431\u043b\u043e\u043a\u0438",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Word count": "\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u0441\u043b\u0456\u0432",
-"Count": "\u041b\u0456\u0447\u0438\u043b\u044c\u043d\u0438\u043a",
-"Document": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Selection": "\u0412\u0438\u0434\u0456\u043b\u0435\u043d\u043d\u044f",
-"Words": "\u0421\u043b\u043e\u0432\u0430",
-"Words: {0}": "\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u0441\u043b\u0456\u0432: {0}",
-"{0} words": "{0} \u0441\u043b\u0456\u0432",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438",
-"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"View": "\u0412\u0438\u0433\u043b\u044f\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u044f",
-"Tools": "\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"Powered by {0}": "\u041f\u0440\u0430\u0446\u044e\u0454 \u043d\u0430 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F9 \u0449\u043e\u0431 \u0432\u0438\u043a\u043b\u0438\u043a\u0430\u0442\u0438 \u043c\u0435\u043d\u044e, ALT-F10 \u043f\u0430\u043d\u0435\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0456\u0432, ALT-0 \u0434\u043b\u044f \u0432\u0438\u043a\u043b\u0438\u043a\u0443 \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u0438.",
-"Image title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Border width": "\u0428\u0438\u0440\u0438\u043d\u0430 \u043c\u0435\u0436\u0456",
-"Border style": "\u0421\u0442\u0438\u043b\u044c \u043c\u0435\u0436\u0456",
-"Error": "\u041f\u043e\u043c\u0438\u043b\u043a\u0430",
-"Warn": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u0436\u0435\u043d\u043d\u044f",
-"Valid": "\u0412\u0456\u0440\u043d\u0438\u0439",
-"To open the popup, press Shift+Enter": "\u0429\u043e\u0431 \u0432\u0456\u0434\u043a\u0440\u0438\u0442\u0438 \u0441\u043f\u043b\u0438\u0432\u043d\u0435 \u0432\u0456\u043a\u043d\u043e, \u043d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c Shift\u00a0+\u00a0Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u041e\u0431\u043b\u0430\u0441\u0442\u044c \u0444\u043e\u0440\u043c\u0430\u0442\u043e\u0432\u0430\u043d\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0443. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT\u00a0+\u00a00, \u0449\u043e\u0431 \u0432\u0456\u0434\u043a\u0440\u0438\u0442\u0438 \u0434\u043e\u0432\u0456\u0434\u043a\u0443.",
-"System Font": "\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0438\u0439 \u0448\u0440\u0438\u0444\u0442",
-"Failed to upload image: {0}": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0432\u0456\u0434\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f: {0}",
-"Failed to load plugin: {0} from url {1}": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438 \u043f\u043b\u0430\u0491\u0456\u043d: {0} \u0437\u0430 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f\u043c {1}",
-"Failed to load plugin url: {0}": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f \u043d\u0430 \u043f\u043b\u0430\u0491\u0456\u043d: {0}",
-"Failed to initialize plugin: {0}": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0456\u043d\u0456\u0446\u0456\u0430\u043b\u0456\u0437\u0443\u0432\u0430\u0442\u0438 \u043f\u043b\u0430\u0491\u0456\u043d: {0}",
-"example": "\u043f\u0440\u0438\u043a\u043b\u0430\u0434",
-"Search": "\u041f\u043e\u0448\u0443\u043a",
-"All": "\u0412\u0441\u0435",
-"Currency": "\u0412\u0430\u043b\u044e\u0442\u0430",
-"Text": "\u0422\u0435\u043a\u0441\u0442",
-"Quotations": "\u0426\u0438\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Mathematical": "\u041c\u0430\u0442\u0435\u043c\u0430\u0442\u0438\u0447\u043d\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Extended Latin": "\u0420\u043e\u0437\u0448\u0438\u0440\u0435\u043d\u0430 \u043b\u0430\u0442\u0438\u043d\u0438\u0446\u044f",
-"Symbols": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438",
-"Arrows": "\u0421\u0442\u0440\u0456\u043b\u043a\u0438",
-"User Defined": "\u0412\u0438\u0437\u043d\u0430\u0447\u0435\u043d\u0456 \u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0435\u043c",
-"dollar sign": "\u0437\u043d\u0430\u043a \u0434\u043e\u043b\u0430\u0440\u0430",
-"currency sign": "\u0437\u043d\u0430\u043a \u0432\u0430\u043b\u044e\u0442\u0438",
-"euro-currency sign": "\u0437\u043d\u0430\u043a \u0454\u0432\u0440\u043e",
-"colon sign": "\u0437\u043d\u0430\u043a \u0434\u0432\u043e\u043a\u0440\u0430\u043f\u043a\u0438",
-"cruzeiro sign": "\u0437\u043d\u0430\u043a \u043a\u0440\u0443\u0437\u0435\u0439\u0440\u043e",
-"french franc sign": "\u0437\u043d\u0430\u043a \u0444\u0440\u0430\u043d\u0446\u0443\u0437\u044c\u043a\u043e\u0433\u043e \u0444\u0440\u0430\u043d\u043a\u0443",
-"lira sign": "\u0437\u043d\u0430\u043a \u043b\u0456\u0440\u0438",
-"mill sign": "\u0437\u043d\u0430\u043a \u043c\u0456\u043b\u044e",
-"naira sign": "\u0437\u043d\u0430\u043a \u043d\u0430\u0439\u0440\u0438",
-"peseta sign": "\u0437\u043d\u0430\u043a \u043f\u0435\u0441\u0435\u0442\u0438",
-"rupee sign": "\u0437\u043d\u0430\u043a \u0440\u0443\u043f\u0456\u0457",
-"won sign": "\u0437\u043d\u0430\u043a \u0432\u043e\u043d\u0438",
-"new sheqel sign": "\u0437\u043d\u0430\u043a \u043d\u043e\u0432\u043e\u0433\u043e \u0448\u0435\u043a\u0435\u043b\u044f",
-"dong sign": "\u0437\u043d\u0430\u043a \u0434\u043e\u043d\u0433\u0443",
-"kip sign": "\u0437\u043d\u0430\u043a \u043a\u0456\u043f\u0443",
-"tugrik sign": "\u0437\u043d\u0430\u043a \u0442\u0443\u0433\u0440\u0438\u043a\u0430",
-"drachma sign": "\u0437\u043d\u0430\u043a \u0434\u0440\u0430\u0445\u043c\u0438",
-"german penny symbol": "\u0437\u043d\u0430\u043a \u043f\u0444\u0435\u043d\u0456\u0433\u0430",
-"peso sign": "\u0437\u043d\u0430\u043a \u043f\u0435\u0441\u043e",
-"guarani sign": "\u0437\u043d\u0430\u043a \u0433\u0443\u0430\u0440\u0430\u043d\u0456",
-"austral sign": "\u0437\u043d\u0430\u043a \u0430\u0443\u0441\u0442\u0440\u0430\u043b\u044e",
-"hryvnia sign": "\u0437\u043d\u0430\u043a \u0433\u0440\u0438\u0432\u043d\u0456",
-"cedi sign": "\u0437\u043d\u0430\u043a \u0441\u0435\u0434\u0456",
-"livre tournois sign": "\u0437\u043d\u0430\u043a \u0442\u0443\u0440\u0441\u044c\u043a\u043e\u0433\u043e \u043b\u0456\u0432\u0440\u0443",
-"spesmilo sign": "\u0437\u043d\u0430\u043a \u0441\u043f\u0435\u0441\u043c\u0456\u043b\u043e",
-"tenge sign": "\u0437\u043d\u0430\u043a \u0442\u0435\u043d\u0433\u0435",
-"indian rupee sign": "\u0437\u043d\u0430\u043a \u0456\u043d\u0434\u0456\u0439\u0441\u044c\u043a\u043e\u0457 \u0440\u0443\u043f\u0456\u0457",
-"turkish lira sign": "\u0437\u043d\u0430\u043a \u0442\u0443\u0440\u0435\u0446\u044c\u043a\u043e\u0457 \u043b\u0456\u0440\u0438",
-"nordic mark sign": "\u0437\u043d\u0430\u043a \u043f\u0456\u0432\u043d\u0456\u0447\u043d\u043e\u0457 \u043c\u0430\u0440\u043a\u0438",
-"manat sign": "\u0437\u043d\u0430\u043a \u043c\u0430\u043d\u0430\u0442\u0443",
-"ruble sign": "\u0437\u043d\u0430\u043a \u0440\u0443\u0431\u043b\u044f",
-"yen character": "\u0441\u0438\u043c\u0432\u043e\u043b \u0454\u043d\u0438",
-"yuan character": "\u0441\u0438\u043c\u0432\u043e\u043b \u044e\u0430\u043d\u044e",
-"yuan character, in hong kong and taiwan": "\u0441\u0438\u043c\u0432\u043e\u043b \u044e\u0430\u043d\u044e \u0432 \u0413\u043e\u043d\u043a\u043e\u043d\u0437\u0456 \u0456 \u0422\u0430\u0439\u0432\u0430\u043d\u0456",
-"yen\/yuan character variant one": "\u0441\u0438\u043c\u0432\u043e\u043b \u0454\u043d\u0438\/\u044e\u0430\u043d\u044e, \u043f\u0435\u0440\u0448\u0438\u0439 \u0432\u0430\u0440\u0456\u0430\u043d\u0442",
-"Loading emoticons...": "\u0417\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0435\u043d\u043d\u044f \u0441\u043c\u0430\u0439\u043b\u0438\u043a\u0456\u0432\u2026",
-"Could not load emoticons": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438 \u0441\u043c\u0430\u0439\u043b\u0438\u043a\u0438",
-"People": "\u041b\u044e\u0434\u0438",
-"Animals and Nature": "\u0422\u0432\u0430\u0440\u0438\u043d\u0438 \u0442\u0430 \u043f\u0440\u0438\u0440\u043e\u0434\u0430",
-"Food and Drink": "\u0407\u0436\u0430 \u0442\u0430 \u043d\u0430\u043f\u043e\u0457",
-"Activity": "\u0410\u043a\u0442\u0438\u0432\u043d\u0456\u0441\u0442\u044c",
-"Travel and Places": "\u041f\u043e\u0434\u043e\u0440\u043e\u0436\u0456 \u0456 \u043c\u0456\u0441\u0446\u044f",
-"Objects": "\u041e\u0431\u2019\u0454\u043a\u0442\u0438",
-"Flags": "\u041f\u0440\u0430\u043f\u043e\u0440\u0438",
-"Characters": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438",
-"Characters (no spaces)": "\u0421\u0438\u043c\u0432\u043e\u043b\u0438 (\u0431\u0435\u0437 \u043f\u0440\u043e\u0431\u0456\u043b\u0456\u0432)",
-"{0} characters": "\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u0441\u0438\u043c\u0432\u043e\u043b\u0456\u0432: {0}",
-"Error: Form submit field collision.": "\u041f\u043e\u043c\u0438\u043b\u043a\u0430: \u043a\u043e\u043b\u0456\u0437\u0456\u044f \u043f\u043e\u043b\u044f \u0432\u0456\u0434\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043d\u044f \u0444\u043e\u0440\u043c\u0438.",
-"Error: No form element found.": "\u041f\u043e\u043c\u0438\u043b\u043a\u0430: \u043d\u0435 \u0437\u043d\u0430\u0439\u0434\u0435\u043d\u043e \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0430 \u0444\u043e\u0440\u043c\u0438.",
-"Update": "\u041e\u043d\u043e\u0432\u0438\u0442\u0438",
-"Color swatch": "\u0417\u0440\u0430\u0437\u043e\u043a \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
-"Turquoise": "\u0411\u0456\u0440\u044e\u0437\u043e\u0432\u0438\u0439",
-"Green": "\u0417\u0435\u043b\u0435\u043d\u0438\u0439",
-"Blue": "\u0421\u0438\u043d\u0456\u0439",
-"Purple": "\u0424\u0456\u043e\u043b\u0435\u0442\u043e\u0432\u0438\u0439",
-"Navy Blue": "\u0422\u0435\u043c\u043d\u043e-\u0441\u0438\u043d\u0456\u0439",
-"Dark Turquoise": "\u0422\u0435\u043c\u043d\u043e-\u0431\u0456\u0440\u044e\u0437\u043e\u0432\u0438\u0439",
-"Dark Green": "\u0422\u0435\u043c\u043d\u043e-\u0437\u0435\u043b\u0435\u043d\u0438\u0439",
-"Medium Blue": "\u0421\u0435\u0440\u0435\u0434\u043d\u044c\u043e-\u0441\u0438\u043d\u0456\u0439",
-"Medium Purple": "\u0421\u0435\u0440\u0435\u0434\u043d\u044c\u043e-\u0444\u0456\u043e\u043b\u0435\u0442\u043e\u0432\u0438\u0439",
-"Midnight Blue": "\u041e\u043f\u0456\u0432\u043d\u0456\u0447\u043d\u0430 \u0431\u043b\u0430\u043a\u0438\u0442\u044c",
-"Yellow": "\u0416\u043e\u0432\u0442\u0438\u0439",
-"Orange": "\u041f\u043e\u043c\u0430\u0440\u0430\u043d\u0447\u0435\u0432\u0438\u0439",
-"Red": "\u0427\u0435\u0440\u0432\u043e\u043d\u0438\u0439",
-"Light Gray": "\u0421\u0432\u0456\u0442\u043b\u043e-\u0441\u0456\u0440\u0438\u0439",
-"Gray": "\u0421\u0456\u0440\u0438\u0439",
-"Dark Yellow": "\u0422\u0435\u043c\u043d\u043e-\u0436\u043e\u0432\u0442\u0438\u0439",
-"Dark Orange": "\u0422\u0435\u043c\u043d\u043e-\u043f\u043e\u043c\u0430\u0440\u0430\u043d\u0447\u0435\u0432\u0438\u0439",
-"Dark Red": "\u0422\u0435\u043c\u043d\u043e-\u0447\u0435\u0440\u0432\u043e\u043d\u0438\u0439",
-"Medium Gray": "\u0421\u0435\u0440\u0435\u0434\u043d\u044c\u043e-\u0441\u0456\u0440\u0438\u0439",
-"Dark Gray": "\u0422\u0435\u043c\u043d\u043e-\u0441\u0456\u0440\u0438\u0439",
-"Light Green": "\u0421\u0432\u0456\u0442\u043b\u043e-\u0437\u0435\u043b\u0435\u043d\u0438\u0439",
-"Light Yellow": "\u0421\u0432\u0456\u0442\u043b\u043e-\u0436\u043e\u0432\u0442\u0438\u0439",
-"Light Red": "\u0421\u0432\u0456\u0442\u043b\u043e-\u0447\u0435\u0440\u0432\u043e\u043d\u0438\u0439",
-"Light Purple": "\u0421\u0432\u0456\u0442\u043b\u043e-\u0444\u0456\u043e\u043b\u0435\u0442\u043e\u0432\u0438\u0439",
-"Light Blue": "\u0421\u0432\u0456\u0442\u043b\u043e-\u0441\u0438\u043d\u0456\u0439",
-"Dark Purple": "\u0422\u0435\u043c\u043d\u043e-\u0444\u0456\u043e\u043b\u0435\u0442\u043e\u0432\u0438\u0439",
-"Dark Blue": "\u0422\u0435\u043c\u043d\u043e-\u0433\u043e\u043b\u0443\u0431\u0438\u0439",
-"Black": "\u0427\u043e\u0440\u043d\u0438\u0439",
-"White": "\u0411\u0456\u043b\u0438\u0439",
-"Switch to or from fullscreen mode": "\u041f\u0435\u0440\u0435\u043c\u0438\u043a\u0430\u043d\u043d\u044f \u043f\u043e\u0432\u043d\u043e\u0435\u043a\u0440\u0430\u043d\u043d\u043e\u0433\u043e \u0440\u0435\u0436\u0438\u043c\u0443",
-"Open help dialog": "\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438 \u0432\u0456\u043a\u043d\u043e \u0434\u043e\u0432\u0456\u0434\u043a\u0438",
-"history": "\u0456\u0441\u0442\u043e\u0440\u0456\u044f",
-"styles": "\u0441\u0442\u0438\u043b\u0456",
-"formatting": "\u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"alignment": "\u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"indentation": "\u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"permanent pen": "\u043c\u0430\u0440\u043a\u0435\u0440",
-"comments": "\u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440\u0456",
-"Format Painter": "\u0424\u043e\u0440\u043c\u0430\u0442 \u0437\u0430 \u0437\u0440\u0430\u0437\u043a\u043e\u043c",
-"Insert\/edit iframe": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 iframe",
-"Capitalization": "\u0412\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u0430\u043d\u043d\u044f \u0432\u0435\u043b\u0438\u043a\u0438\u0445 \u043b\u0456\u0442\u0435\u0440",
-"lowercase": "\u043d\u0438\u0436\u043d\u0456\u0439 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"UPPERCASE": "\u0412\u0415\u0420\u0425\u041d\u0406\u0419 \u0420\u0415\u0413\u0406\u0421\u0422\u0420",
-"Title Case": "\u0420\u0435\u0433\u0456\u0441\u0442\u0440 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0430",
-"Permanent Pen Properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u043c\u0430\u0440\u043a\u0435\u0440\u0430",
-"Permanent pen properties...": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u043c\u0430\u0440\u043a\u0435\u0440\u0430\u2026",
-"Font": "\u0428\u0440\u0438\u0444\u0442",
-"Size": "\u0420\u043e\u0437\u043c\u0456\u0440",
-"More...": "\u0411\u0456\u043b\u044c\u0448\u0435\u2026",
-"Spellcheck Language": "\u041c\u043e\u0432\u0430 \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0438 \u043e\u0440\u0444\u043e\u0433\u0440\u0430\u0444\u0456\u0457",
-"Select...": "\u0412\u0438\u0431\u0440\u0430\u0442\u0438\u2026",
-"Preferences": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438",
-"Yes": "\u0422\u0430\u043a",
-"No": "\u041d\u0456",
-"Keyboard Navigation": "\u041a\u0435\u0440\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u0430 \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u043e\u044e \u043a\u043b\u0430\u0432\u0456\u0430\u0442\u0443\u0440\u0438",
-"Version": "\u0412\u0435\u0440\u0441\u0456\u044f",
-"Anchor": "\u042f\u043a\u0456\u0440",
-"Special character": "\u0421\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Code sample": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Color": "\u043a\u043e\u043b\u0456\u0440",
-"Emoticons": "\u0415\u043c\u043e\u0446\u0456\u0457",
-"Document properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Image": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Target": "\u0412\u0456\u0434\u043a\u0440\u0438\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Link": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Poster": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Media": "\u041c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
-"Print": "\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438",
-"Prev": "\u0412\u0433\u043e\u0440\u0443",
-"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0456\u043d\u0430",
-"Whole words": "\u0426\u0456\u043b\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Spellcheck": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u043e\u0440\u0444\u043e\u0433\u0440\u0430\u0444\u0456\u0457",
-"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0448\u0430\u0431\u043b\u043e\u043d"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/uk_UA.js Deleted

@@ -1,261 +0,0 @@
-tinymce.addI18n('uk_UA',{
-"Redo": "\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438",
-"Undo": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
-"Cut": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438",
-"Copy": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438",
-"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"Select all": "\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0443\u0441\u0435",
-"New document": "\u041d\u043e\u0432\u0438\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Ok": "Ok",
-"Cancel": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
-"Visual aids": "\u0412\u0456\u0437\u0443\u0430\u043b\u044c\u043d\u0456 \u0437\u0430\u0441\u043e\u0431\u0438",
-"Bold": "\u0416\u0438\u0440\u043d\u0438\u0439",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Underline": "\u041f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Strikethrough": "\u041f\u0435\u0440\u0435\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
-"Subscript": "\u0406\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Align left": "\u041b\u0456\u0432\u043e\u0440\u0443\u0447",
-"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Align right": "\u041f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
-"Justify": "\u0412\u0438\u0440\u0456\u0432\u043d\u044f\u0442\u0438",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0456\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Numbered list": "\u041f\u0440\u043e\u043d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Decrease indent": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Increase indent": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Close": "\u0417\u0430\u043a\u0440\u0438\u0442\u0438",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0454 \u043f\u0440\u044f\u043c\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0430 \u043e\u0431\u043c\u0456\u043d\u0443. \u0417\u0430\u043c\u0456\u0441\u0442\u044c \u0446\u044c\u043e\u0433\u043e \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0439\u0442\u0435 \u043f\u043e\u0454\u0434\u043d\u0430\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448 Ctrl + X\/C\/V.",
-"Headers": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Preformatted": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u044c\u043e \u0432\u0456\u0434\u0444\u043e\u0440\u043c\u0430\u0442\u043e\u0432\u0430\u043d\u0438\u0439",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "\u041a\u043e\u0434",
-"Paragraph": "\u0410\u0431\u0437\u0430\u0446",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
-"Inline": "\u0412\u0431\u0443\u0434\u043e\u0432\u0430\u043d\u0438\u0439",
-"Blocks": "\u0411\u043b\u043e\u043a\u0438",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u0437\u0430\u0440\u0430\u0437 \u0432 \u0440\u0435\u0436\u0438\u043c\u0456 \u0437\u0432\u0438\u0447\u0430\u0439\u043d\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0443. \u0417\u043c\u0456\u0441\u0442 \u0431\u0443\u0434\u0435 \u0432\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0439 \u044f\u043a \u043f\u0440\u043e\u0441\u0442\u0438\u0439 \u0442\u0435\u043a\u0441\u0442, \u043f\u043e\u043a\u0438 \u0412\u0438 \u043d\u0435 \u0432\u0438\u043c\u043a\u043d\u0435\u0442\u0435 \u0446\u044e \u043e\u043f\u0446\u0456\u044e.",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442",
-"Font Sizes": "\u0420\u043e\u0437\u043c\u0456\u0440 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Class": "\u041a\u043b\u0430\u0441",
-"Browse for an image": "\u0412\u0438\u0431\u0456\u0440 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"OR": "\u0410\u0411\u041e",
-"Drop an image here": "\u041f\u0435\u0440\u0435\u043c\u0456\u0441\u0442\u0456\u0442\u044c \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f \u0441\u044e\u0434\u0438",
-"Upload": "\u0417\u0430\u0432\u0430\u043d\u0442\u0430\u0436\u0438\u0442\u0438",
-"Block": "\u0411\u043b\u043e\u043a",
-"Align": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Default": "\u0423\u043c\u043e\u0432\u0447\u0430\u043d\u043d\u044f",
-"Circle": "\u041a\u043e\u043b\u043e",
-"Disc": "\u0414\u0438\u0441\u043a",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442",
-"Lower Alpha": "\u041d\u0438\u0436\u043d\u0456\u0439 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"Lower Greek": "\u041c\u0430\u043b\u0456 \u0433\u0440\u0435\u0446\u044c\u043a\u0456 \u043b\u0456\u0442\u0435\u0440\u0438",
-"Lower Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438 \u0443 \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u0440\u0435\u0433\u0456\u0441\u0442\u0440\u0456",
-"Upper Alpha": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438 \u0443 \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u0440\u0435\u0433\u0456\u0441\u0442\u0440\u0456",
-"Anchor": "\u041f\u0440\u0438\u0432'\u044f\u0437\u043a\u0430",
-"Name": "\u0406\u043c'\u044f",
-"Id": "\u041a\u043e\u0434",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u041a\u043e\u0434 \u043c\u0430\u0454 \u043f\u043e\u0447\u0438\u043d\u0430\u0442\u0438\u0441\u044f \u0437 \u043b\u0456\u0442\u0435\u0440\u0438 \u0456 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043b\u0438\u0448\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u043b\u0456\u0442\u0435\u0440, \u0446\u0438\u0444\u0440, \u0434\u0435\u0444\u0456\u0441\u0443, \u043a\u0440\u0430\u043f\u043a\u0438, \u043a\u043e\u043c\u0438 \u0430\u0431\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u0433\u043e \u043f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0454 \u043d\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456 \u0437\u043c\u0456\u043d\u0438. \u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043f\u0456\u0442\u0438 ?",
-"Restore last draft": "\u0412\u0456\u0434\u043d\u043e\u0432\u0438\u0442\u0438 \u043e\u0441\u0442\u0430\u043d\u043d\u0456\u0439 \u043f\u0440\u043e\u0435\u043a\u0442",
-"Special character": "\u0421\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0438\u0439 \u0441\u0438\u043c\u0432\u043e\u043b",
-"Source code": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
-"Insert\/Edit code sample": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u043f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Language": "\u041c\u043e\u0432\u0430",
-"Code sample": "\u041f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"Color": "\u041a\u043e\u043b\u0456\u0440",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0417\u043b\u0456\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0456\u0432\u043e",
-"Emoticons": "\u0421\u043c\u0430\u0439\u043b\u0438",
-"Document properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0443",
-"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Description": "\u041e\u043f\u0438\u0441",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Encoding": "\u041a\u043e\u0434\u0443\u0432\u0430\u043d\u043d\u044f",
-"Fullscreen": "\u041d\u0430 \u0432\u0435\u0441\u044c \u0435\u043a\u0440\u0430\u043d",
-"Action": "\u0414\u0456\u044f",
-"Shortcut": "\u042f\u0440\u043b\u0438\u043a",
-"Help": "\u0414\u043e\u043f\u043e\u043c\u043e\u0433\u0430",
-"Address": "\u0410\u0434\u0440\u0435\u0441\u0430",
-"Focus to menubar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043c\u0435\u043d\u044e",
-"Focus to toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0456\u043d\u0441\u0442\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430\u0445",
-"Focus to element path": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u0448\u043b\u044f\u0445\u0443",
-"Focus to contextual toolbar": "\u0424\u043e\u043a\u0443\u0441 \u043d\u0430 \u043a\u043e\u043d\u0442\u0435\u043a\u0441\u0442",
-"Insert link (if link plugin activated)": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f (\u044f\u043a\u0449\u043e \u0434\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u043e)",
-"Save (if save plugin activated)": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 (\u044f\u043a\u0449\u043e \u0434\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u043e)",
-"Find (if searchreplace plugin activated)": "\u0417\u043d\u0430\u0439\u0442\u0438 (\u044f\u043a\u0449\u043e \u0434\u043e\u0437\u0432\u043e\u043b\u0435\u043d\u043e)",
-"Plugins installed ({0}):": "\u041d\u0430\u044f\u0432\u043d\u0456 \u0434\u043e\u0434\u0430\u0442\u043a\u0438 ({0}):",
-"Premium plugins:": "\u041f\u0440\u0435\u043c\u0456\u0430\u043b\u044c\u043d\u0456 \u0434\u043e\u0434\u0430\u0442\u043a\u0438:",
-"Learn more...": "\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e...",
-"You are using {0}": "\u0423 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u0430\u043d\u043d\u0456 {0}",
-"Plugins": "\u041f\u043b\u0430\u0433\u0456\u043d\u0438",
-"Handy Shortcuts": "\u041a\u043e\u0440\u0438\u0441\u043d\u0456 \u044f\u0440\u043b\u0438\u043a\u0438",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430 \u043b\u0456\u043d\u0456\u044f",
-"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image description": "\u041e\u043f\u0438\u0441 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Source": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
-"Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440",
-"Constrain proportions": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0442\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0456\u0457",
-"General": "\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0435",
-"Advanced": "\u0414\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0438\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a",
-"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0438\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a",
-"Border": "\u041c\u0435\u0436\u0430",
-"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image list": "\u0421\u043f\u0438\u0441\u043e\u043a \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u044c",
-"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u043f\u0440\u043e\u0442\u0438 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u0457 \u0441\u0442\u0440\u0456\u043b\u043a\u0438",
-"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u0437\u0430 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u044e \u0441\u0442\u0440\u0456\u043b\u043a\u043e\u044e",
-"Flip vertically": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0456",
-"Flip horizontally": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0456",
-"Edit image": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image options": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Zoom in": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438",
-"Zoom out": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438",
-"Crop": "\u041e\u0431\u0440\u0456\u0437\u0430\u0442\u0438",
-"Resize": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0440",
-"Orientation": "\u041e\u0440\u0456\u0454\u043d\u0442\u0430\u0446\u0456\u044f",
-"Brightness": "\u042f\u0441\u043a\u0440\u0430\u0432\u0456\u0441\u0442\u044c",
-"Sharpen": "\u0427\u0456\u0442\u043a\u0456\u0441\u0442\u044c",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u0420\u0456\u0432\u043d\u0456 \u043a\u043e\u043b\u044c\u043e\u0440\u0456\u0432",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Invert": "\u0406\u043d\u0432\u0435\u0440\u0441\u0456\u044f",
-"Apply": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438",
-"Back": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044f",
-"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0434\u043b\u044f \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Url": "URL",
-"Target": "\u041c\u0435\u0442\u0430",
-"None": "\u041d\u0456",
-"New window": "\u041d\u043e\u0432\u0435 \u0432\u0456\u043a\u043d\u043e",
-"Remove link": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Anchors": "\u042f\u043a\u043e\u0440\u044f",
-"Link": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Paste or type a link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0430\u0431\u043e \u043d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0443 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0457 \u043f\u043e\u0448\u0442\u0438. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 \u043f\u0440\u0435\u0444\u0456\u043a\u0441 mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 \u043f\u0440\u0435\u0444\u0456\u043a\u0441 http:\/\/?",
-"Link list": "\u0421\u043f\u0438\u0441\u043e\u043a \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u044c",
-"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0435 \u0434\u0436\u0435\u0440\u0435\u043b\u043e",
-"Poster": "\u041f\u043b\u0430\u043a\u0430\u0442",
-"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0447\u0435:",
-"Embed": "\u0412\u043f\u0440\u043e\u0432\u0430\u0434\u0438\u0442\u0438",
-"Media": "\u041c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
-"Nonbreaking space": "\u041d\u0435\u0440\u043e\u0437\u0440\u0438\u0432\u043d\u0438\u0439 \u043f\u0440\u043e\u043f\u0443\u0441\u043a",
-"Page break": "\u0420\u043e\u0437\u0440\u0438\u0432 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0438",
-"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044f\u043a \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434",
-"Print": "\u0414\u0440\u0443\u043a",
-"Save": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438",
-"Find": "\u0417\u043d\u0430\u0439\u0442\u0438",
-"Replace with": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430",
-"Replace": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
-"Replace all": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u0432\u0441\u0435",
-"Prev": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439",
-"Next": "\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0439",
-"Find and replace": "\u0417\u043d\u0430\u0439\u0442\u0438 \u0456 \u0437\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
-"Could not find the specified string.": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u043d\u0430\u0439\u0442\u0438 \u0437\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0439 \u0440\u044f\u0434\u043e\u043a.",
-"Match case": "\u0417 \u0443\u0440\u0430\u0445\u0443\u0432\u0430\u043d\u043d\u044f\u043c \u0440\u0435\u0433\u0456\u0441\u0442\u0440\u0443",
-"Whole words": "\u0426\u0456\u043b\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Spellcheck": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u043e\u0440\u0444\u043e\u0433\u0440\u0430\u0444\u0456\u0457",
-"Ignore": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438",
-"Ignore all": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0435",
-"Finish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u0438",
-"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0432 \u0441\u043b\u043e\u0432\u043d\u0438\u043a",
-"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Table properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0442\u0430\u0431\u043b\u0438\u0446\u0456",
-"Delete table": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430",
-"Row": "\u0420\u044f\u0434\u043e\u043a",
-"Column": "\u0421\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cell properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Merge cells": "\u041e\u0431'\u0454\u0434\u043d\u0430\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Split cell": "\u0420\u043e\u0437\u0431\u0438\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0443",
-"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0440\u044f\u0434\u043e\u043a \u043f\u0435\u0440\u0435\u0434",
-"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u043f\u0456\u0441\u043b\u044f",
-"Delete row": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Row properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0440\u044f\u0434\u043a\u0430",
-"Cut row": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Copy row": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u043f\u0435\u0440\u0435\u0434",
-"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u043f\u0456\u0441\u043b\u044f",
-"Insert column before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0435\u0440\u0435\u0434",
-"Insert column after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0456\u0441\u043b\u044f",
-"Delete column": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Cols": "\u0421\u0442\u043e\u0432\u043f\u0446\u0456",
-"Rows": "\u0420\u044f\u0434\u043a\u0438",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Height": "\u0412\u0438\u0441\u043e\u0442\u0430",
-"Cell spacing": "\u0406\u043d\u0442\u0435\u0440\u0432\u0430\u043b \u043c\u0456\u0436 \u043a\u043e\u043c\u0456\u0440\u043a\u0430\u043c\u0438",
-"Cell padding": "\u0417\u0430\u043f\u043e\u0432\u043d\u0435\u043d\u043d\u044f \u043a\u043e\u043c\u0456\u0440\u043e\u043a",
-"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Left": "\u041b\u0456\u0432\u043e\u0440\u0443\u0447",
-"Center": "\u0426\u0435\u043d\u0442\u0440",
-"Right": "\u041f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
-"Cell type": "\u0422\u0438\u043f \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Scope": "\u0423 \u043c\u0435\u0436\u0430\u0445",
-"Alignment": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Middle": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Bottom": "\u041f\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Header cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0443",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u044f\u0434\u043a\u0456\u0432",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u0442\u043e\u0432\u043f\u0446\u0456\u0432",
-"Row type": "\u0422\u0438\u043f \u0440\u044f\u0434\u043a\u0430",
-"Header": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Body": "\u0422\u0456\u043b\u043e",
-"Footer": "\u041d\u0438\u0436\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Border color": "\u041a\u043e\u043b\u0456\u0440 \u043c\u0435\u0436\u0456",
-"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Template": "\u0428\u0430\u0431\u043b\u043e\u043d",
-"Text color": "\u041a\u043e\u043b\u0456\u0440 \u0442\u0435\u043a\u0441\u0442\u0443",
-"Background color": "\u041a\u043e\u043b\u0456\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u0406\u043d\u0448\u0438\u0439...",
-"Custom color": "\u041a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439 \u043a\u043e\u043b\u0456\u0440",
-"No color": "\u0411\u0435\u0437 \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
-"Table of Contents": "\u0417\u043c\u0456\u0441\u0442",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0431\u043b\u043e\u043a\u0438",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Words: {0}": "\u0421\u043b\u043e\u0432\u0430: {0}",
-"{0} words": "{0} \u0441\u043b\u0456\u0432",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u041f\u0440\u0430\u0432\u043a\u0430",
-"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"View": "\u0412\u0438\u0434",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u044f",
-"Tools": "\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"Powered by {0}": "\u0417\u0430 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0438\u043a\u0438 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041e\u0431\u043b\u0430\u0441\u0442\u044c Rich \u0442\u0435\u043a\u0441\u0442\u0443. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F9 - \u043c\u0435\u043d\u044e. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F10 - \u043f\u0430\u043d\u0435\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0456\u0432. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-0 - \u0434\u043e\u0432\u0456\u0434\u043a\u0430"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/vi.js Deleted

@@ -1,419 +0,0 @@
-tinymce.addI18n('vi',{
-"Redo": "L\u00e0m l\u1ea1i",
-"Undo": "H\u1ee7y thao t\u00e1c",
-"Cut": "C\u1eaft",
-"Copy": "Sao ch\u00e9p",
-"Paste": "D\u00e1n",
-"Select all": "Ch\u1ecdn t\u1ea5t c\u1ea3",
-"New document": "T\u1ea1o t\u00e0i li\u1ec7u m\u1edbi",
-"Ok": "\u0110\u1ed3ng \u00dd",
-"Cancel": "Hu\u1ef7 B\u1ecf",
-"Visual aids": "M\u1edf khung so\u1ea1n th\u1ea3o",
-"Bold": "In \u0111\u1eadm",
-"Italic": "In nghi\u00eang",
-"Underline": "G\u1ea1ch d\u01b0\u1edbi",
-"Strikethrough": "G\u1ea1ch ngang",
-"Superscript": "K\u00fd t\u1ef1 m\u0169",
-"Subscript": "K\u00fd t\u1ef1 th\u1ea5p",
-"Clear formatting": "L\u01b0\u1ee3c b\u1ecf ph\u1ea7n hi\u1ec7u \u1ee9ng",
-"Align left": "Canh tr\u00e1i",
-"Align center": "Canh gi\u1eefa",
-"Align right": "Canh ph\u1ea3i",
-"Justify": "Canh \u0111\u1ec1u hai b\u00ean",
-"Bullet list": "Danh s\u00e1ch d\u1ea1ng bi\u1ec3u t\u01b0\u1ee3ng",
-"Numbered list": "Danh s\u00e1ch d\u1ea1ng s\u1ed1",
-"Decrease indent": "Th\u1ee5t l\u00f9i d\u00f2ng",
-"Increase indent": "T\u0103ng kho\u1ea3ng c\u00e1ch d\u00f2ng",
-"Close": "\u0110\u00f3ng L\u1ea1i",
-"Formats": "\u0110\u1ecbnh d\u1ea1ng",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n kh\u00f4ng h\u1ed7 tr\u1ee3 truy c\u1eadp truy c\u1eadp b\u1ed9 nh\u1edb \u1ea3o, vui l\u00f2ng s\u1eed d\u1ee5ng c\u00e1c t\u1ed5 h\u1ee3p ph\u00edm Ctrl + X, C, V.",
-"Headers": "\u0110\u1ea7u trang",
-"Header 1": "Ti\u00eau \u0111\u1ec1 1",
-"Header 2": "Ti\u00eau \u0111\u1ec1 2",
-"Header 3": "Ti\u00eau \u0111\u1ec1 3",
-"Header 4": "Ti\u00eau \u0111\u1ec1 4",
-"Header 5": "Ti\u00eau \u0111\u1ec1 5",
-"Header 6": "Ti\u00eau \u0111\u1ec1 6",
-"Headings": "Ph\u1ea7n \u0111\u1ea7u",
-"Heading 1": "H1",
-"Heading 2": "H2",
-"Heading 3": "H3",
-"Heading 4": "H4",
-"Heading 5": "H5",
-"Heading 6": "G6",
-"Preformatted": "\u0110\u1ecbnh d\u1ea1ng s\u1eb5n",
-"Div": "Khung",
-"Pre": "\u0110\u1ecbnh d\u1ea1ng",
-"Code": "M\u00e3",
-"Paragraph": "\u0110o\u1ea1n v\u0103n",
-"Blockquote": "\u0110o\u1ea1n Tr\u00edch D\u1eabn",
-"Inline": "C\u00f9ng d\u00f2ng",
-"Blocks": "Bao",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Ch\u1ee9c n\u0103ng D\u00e1n \u0111ang trong tr\u1ea1ng th\u00e1i v\u0103n b\u1ea3n \u0111\u01a1n gi\u1ea3n. N\u1ed9i dung s\u1ebd \u0111\u01b0\u1ee3c d\u00e1n d\u01b0\u1edbi d\u1ea1ng v\u0103n b\u1ea3n thu\u1ea7n, kh\u00f4ng c\u00f3 \u0111\u1ecbnh d\u1ea1ng.",
-"Fonts": "Ph\u00f4ng ch\u1eef",
-"Font Sizes": "C\u1ee1 ch\u1eef",
-"Class": "L\u1edbp",
-"Browse for an image": "Ch\u00e8n m\u1ed9t h\u00ecnh \u1ea3nh",
-"OR": "HO\u1eb6C",
-"Drop an image here": "Th\u1ea3 h\u00ecnh \u1ea3nh v\u00e0o \u0111\u00e2y",
-"Upload": "T\u1ea3i l\u00ean",
-"Block": "Kh\u1ed1i",
-"Align": "Canh l\u1ec1",
-"Default": "M\u1eb7c \u0111\u1ecbnh",
-"Circle": "H\u00ecnh tr\u00f2n",
-"Disc": "H\u00ecnh tr\u00f2n  d\u1ea1ng m\u1ecfng",
-"Square": "\u00d4 vu\u00f4ng",
-"Lower Alpha": "K\u00fd t\u1ef1 th\u01b0\u1eddng",
-"Lower Greek": "S\u1ed1 hy l\u1ea1p th\u01b0\u1eddng",
-"Lower Roman": "S\u1ed1 la m\u00e3 th\u01b0\u1eddng",
-"Upper Alpha": "K\u00fd t\u1ef1 hoa",
-"Upper Roman": "S\u1ed1 la m\u00e3 hoa",
-"Anchor...": "Neo...",
-"Name": "T\u00ean",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "B\u1ea1n ch\u01b0a l\u01b0u thay \u0111\u1ed5i b\u1ea1n c\u00f3 ch\u1eafc b\u1ea1n mu\u1ed1n di chuy\u1ec3n \u0111i?",
-"Restore last draft": "Kh\u00f4i ph\u1ee5c b\u1ea3n g\u1ea7n nh\u1ea5t",
-"Special character...": "K\u00fd t\u1ef1 \u0111\u1eb7c bi\u1ec7t...",
-"Source code": "M\u00e3 ngu\u1ed3n",
-"Insert\/Edit code sample": "Ch\u00e8n\/S\u1eeda m\u00e3 m\u1eabu",
-"Language": "Ng\u00f4n ng\u1eef",
-"Code sample...": "Code sample...",
-"Color Picker": "B\u1ea3ng ch\u1ecdn m\u00e0u",
-"R": "M\u00e0u \u0111\u1ecf",
-"G": "M\u00e0u xanh l\u00e1 c\u00e2y",
-"B": "M\u00e0u xanh da tr\u1eddi",
-"Left to right": "Tr\u00e1i sang ph\u1ea3i",
-"Right to left": "Ph\u1ea3i sang tr\u00e1i",
-"Emoticons...": "Bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac...",
-"Metadata and Document Properties": "Metadata v\u00e0 Thu\u1ed9c t\u00ednh v\u0103n b\u1ea3n",
-"Title": "Ti\u00eau \u0111\u1ec1",
-"Keywords": "T\u1eeb kh\u00f3a",
-"Description": "M\u00f4 t\u1ea3",
-"Robots": "Robots",
-"Author": "T\u00e1c gi\u1ea3",
-"Encoding": "M\u00e3 h\u00f3a",
-"Fullscreen": "To\u00e0n m\u00e0n h\u00ecnh",
-"Action": "H\u00e0nh \u0111\u1ed9ng",
-"Shortcut": "L\u1ed1i t\u1eaft",
-"Help": "Tr\u1ee3 gi\u00fap",
-"Address": "\u0110\u1ecba ch\u1ec9",
-"Focus to menubar": "Focus to menubar",
-"Focus to toolbar": "Focus to toolbar",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "Focus to contextual toolbar",
-"Insert link (if link plugin activated)": "Ch\u00e8n \u0111\u01b0\u1eddng d\u1eabn",
-"Save (if save plugin activated)": "L\u01b0u",
-"Find (if searchreplace plugin activated)": "T\u00ecm ki\u1ebfm",
-"Plugins installed ({0}):": "Plugins installed ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "Learn more...",
-"You are using {0}": "You are using {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Handy Shortcuts",
-"Horizontal line": "K\u1ebb ngang",
-"Insert\/edit image": "Ch\u00e8n\/s\u1eeda \u1ea3nh",
-"Image description": "M\u00f4 t\u1ea3 \u1ea3nh",
-"Source": "Ngu\u1ed3n",
-"Dimensions": "K\u00edch th\u01b0\u1edbc",
-"Constrain proportions": "T\u1ef7 l\u1ec7 h\u1ea1n ch\u1ebf",
-"General": "Chung",
-"Advanced": "N\u00e2ng cao",
-"Style": "Ki\u1ec3u",
-"Vertical space": "N\u1eb1m d\u1ecdc",
-"Horizontal space": "N\u1eb1m ngang",
-"Border": "\u0110\u01b0\u1eddng vi\u1ec1n",
-"Insert image": "Ch\u00e8n \u1ea3nh",
-"Image...": "H\u00ecnh \u1ea3nh...",
-"Image list": "Image list",
-"Rotate counterclockwise": "Xoay tr\u00e1i",
-"Rotate clockwise": "Xoay ph\u1ea3i",
-"Flip vertically": "L\u1eadt d\u1ecdc",
-"Flip horizontally": "L\u1eadt ngang",
-"Edit image": "Ch\u1ec9nh s\u1eeda \u1ea3nh",
-"Image options": "T\u00f9y ch\u1ecdn \u1ea3nh",
-"Zoom in": "Thu nh\u1ecf",
-"Zoom out": "Ph\u00f3ng to",
-"Crop": "C\u1eaft \u1ea3nh",
-"Resize": "Thay \u0111\u1ed5i k\u00edch th\u01b0\u1edbc",
-"Orientation": "\u0110\u1ecbnh h\u01b0\u1edbng",
-"Brightness": "\u0110\u1ed9 s\u00e1ng",
-"Sharpen": "L\u00e0m s\u1eafc n\u00e9t",
-"Contrast": "\u0110\u1ed9 t\u01b0\u01a1ng ph\u1ea3n",
-"Color levels": "M\u1ee9c \u0111\u1ed9 m\u00e0u",
-"Gamma": "M\u00e0u Gamma",
-"Invert": "\u0110\u1ea3o ng\u01b0\u1ee3c",
-"Apply": "\u00c1p d\u1ee5ng",
-"Back": "Quay l\u1ea1i",
-"Insert date\/time": "Ch\u00e8n ng\u00e0y\/th\u00e1ng",
-"Date\/time": "Date\/time",
-"Insert\/Edit Link": "Ch\u00e8n\/S\u1eeda li\u00ean k\u1ebft",
-"Insert\/edit link": "Ch\u00e8n\/s\u1eeda li\u00ean k\u1ebft",
-"Text to display": "N\u1ed9i dung hi\u1ec3n th\u1ecb",
-"Url": "Url",
-"Open link in...": "M\u1edf \u0111\u01b0\u1eddng d\u1eabn trong...",
-"Current window": "C\u1eeda s\u1ed5 hi\u1ec7n t\u1ea1i",
-"None": "Kh\u00f4ng",
-"New window": "C\u1eeda s\u1ed5 m\u1edbi",
-"Remove link": "B\u1ecf li\u00ean k\u1ebft",
-"Anchors": "Neo",
-"Link...": "\u0110\u01b0\u1eddng d\u1eabn...",
-"Paste or type a link": "Paste or type a link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0110\u1ecba ch\u1ec9 URL b\u1ea1n v\u1eeba nh\u1eadp gi\u1ed1ng nh\u01b0 m\u1ed9t \u0111\u1ecba ch\u1ec9 email. B\u1ea1n c\u00f3 mu\u1ed1n th\u00eam ti\u1ec1n t\u1ed1 mailto: kh\u00f4ng?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0110\u1ecba ch\u1ec9 URL b\u1ea1n v\u1eeba nh\u1eadp gi\u1ed1ng nh\u01b0 m\u1ed9t li\u00ean k\u1ebft. B\u1ea1n c\u00f3 mu\u1ed1n th\u00eam ti\u1ec1n t\u1ed1 http:\/\/ kh\u00f4ng?",
-"Link list": "Link list",
-"Insert video": "Ch\u00e8n video",
-"Insert\/edit video": "Ch\u00e8n\/s\u1eeda video",
-"Insert\/edit media": "Insert\/edit media",
-"Alternative source": "Ngu\u1ed3n thay th\u1ebf",
-"Alternative source URL": "\u0110\u01b0\u1eddng d\u1eabn ngu\u1ed3n thay th\u1ebf",
-"Media poster (Image URL)": "\u00c1p ph\u00edch \u0111a ph\u01b0\u01a1ng ti\u1ec7n (\u0110\u01b0\u1eddng d\u1eabn h\u00ecnh \u1ea3nh)",
-"Paste your embed code below:": "D\u00e1n m\u00e3 nh\u00fang c\u1ee7a b\u1ea1n d\u01b0\u1edbi \u0111\u00e2y:",
-"Embed": "Nh\u00fang",
-"Media...": "\u0110a ph\u01b0\u01a1ng ti\u1ec7n...",
-"Nonbreaking space": "Kh\u00f4ng xu\u1ed1ng h\u00e0ng",
-"Page break": "Ng\u1eaft trang",
-"Paste as text": "D\u00e1n \u0111o\u1ea1n v\u0103n b\u1ea3n",
-"Preview": "Xem th\u1eed",
-"Print...": "In...",
-"Save": "L\u01b0u",
-"Find": "T\u00ecm ki\u1ebfm",
-"Replace with": "Thay th\u1ebf b\u1edfi",
-"Replace": "Thay th\u1ebf",
-"Replace all": "Thay t\u1ea5t c\u1ea3",
-"Previous": "Tr\u01b0\u1edbc",
-"Next": "K\u1ebf ti\u1ebfp",
-"Find and replace...": "T\u00ecm v\u00e0 thay th\u1ebf...",
-"Could not find the specified string.": "Kh\u00f4ng t\u00ecm th\u1ea5y chu\u1ed7i qui \u0111\u1ecbnh",
-"Match case": "Tr\u01b0\u1eddng h\u1ee3p xem",
-"Find whole words only": "Ch\u1ec9 t\u00ecm to\u00e0n b\u1ed9 t\u1eeb",
-"Spell check": "Ki\u1ec3m tra ch\u00ednh t\u1ea3",
-"Ignore": "B\u1ecf qua",
-"Ignore all": "B\u1ecf qua t\u1ea5t",
-"Finish": "Ho\u00e0n t\u1ea5t",
-"Add to Dictionary": "Th\u00eam v\u00e0o t\u1eeb \u0111i\u1ec3n",
-"Insert table": "Th\u00eam b\u1ea3ng",
-"Table properties": "Thu\u1ed9c t\u00ednh b\u1ea3ng",
-"Delete table": "Xo\u00e1 b\u1ea3ng",
-"Cell": "\u00d4",
-"Row": "D\u00f2ng",
-"Column": "C\u1ed9t",
-"Cell properties": "Thu\u1ed9c t\u00ednh \u00f4",
-"Merge cells": "Tr\u1ed9n \u00f4",
-"Split cell": "Chia c\u1eaft \u00f4",
-"Insert row before": "Th\u00eam d\u00f2ng ph\u00eda tr\u00ean",
-"Insert row after": "Th\u00eam d\u00f2ng ph\u00eda d\u01b0\u1edbi",
-"Delete row": "Xo\u00e1 d\u00f2ng",
-"Row properties": "Thu\u1ed9c t\u00ednh d\u00f2ng",
-"Cut row": "C\u1eaft d\u00f2ng",
-"Copy row": "Sao ch\u00e9p d\u00f2ng",
-"Paste row before": "D\u00e1n v\u00e0o ph\u00eda tr\u01b0\u1edbc, tr\u00ean",
-"Paste row after": "D\u00e1n v\u00e0o ph\u00eda sau, d\u01b0\u1edbi",
-"Insert column before": "Th\u00eam c\u1ed9t b\u00ean tr\u00e1i",
-"Insert column after": "Th\u00eam c\u1ed9t b\u00ean ph\u1ea3i",
-"Delete column": "Xo\u00e1 c\u1ed9t",
-"Cols": "C\u1ed9t",
-"Rows": "D\u00f2ng",
-"Width": "\u0110\u1ed9 R\u1ed9ng",
-"Height": "\u0110\u1ed9 Cao",
-"Cell spacing": "Kho\u1ea3ng c\u00e1ch \u00f4",
-"Cell padding": "Kho\u1ea3ng c\u00e1ch trong \u00f4",
-"Show caption": "Hi\u1ec7n ti\u00eau \u0111\u1ec1",
-"Left": "Tr\u00e1i",
-"Center": "Gi\u1eefa",
-"Right": "Ph\u1ea3i",
-"Cell type": "Lo\u1ea1i \u00f4",
-"Scope": "Quy\u1ec1n",
-"Alignment": "Canh ch\u1ec9nh",
-"H Align": "L\u1ec1 ngang",
-"V Align": "L\u1ec1 d\u1ecdc",
-"Top": "Tr\u00ean",
-"Middle": "Kho\u1ea3ng gi\u1eefa",
-"Bottom": "D\u01b0\u1edbi",
-"Header cell": "Ti\u00eau \u0111\u1ec1 \u00f4",
-"Row group": "Gom nh\u00f3m d\u00f2ng",
-"Column group": "Gom nh\u00f3m c\u1ed9t",
-"Row type": "Th\u1ec3 lo\u1ea1i d\u00f2ng",
-"Header": "Ti\u00eau \u0111\u1ec1",
-"Body": "N\u1ed9i dung",
-"Footer": "Ch\u00e2n",
-"Border color": "M\u00e0u vi\u1ec1n",
-"Insert template...": "Th\u00eam m\u1eabu...",
-"Templates": "M\u1eabu",
-"Template": "Template",
-"Text color": "M\u00e0u v\u0103n b\u1ea3n",
-"Background color": "M\u00e0u n\u1ec1n",
-"Custom...": "Tu\u1ef3 ch\u1ec9nh...",
-"Custom color": "Tu\u1ef3 ch\u1ec9nh m\u00e0u",
-"No color": "Kh\u00f4ng c\u00f3 m\u00e0u",
-"Remove color": "B\u1ecf m\u00e0u",
-"Table of Contents": "Table of Contents",
-"Show blocks": "Hi\u1ec3n th\u1ecb kh\u1ed1i",
-"Show invisible characters": "Hi\u1ec3n th\u1ecb k\u00fd t\u1ef1 \u1ea9n",
-"Word count": "S\u1ed1 t\u1eeb",
-"Count": "\u0110\u1ebfm",
-"Document": "T\u00e0i li\u1ec7u",
-"Selection": "L\u1ef1a ch\u1ecdn",
-"Words": "T\u1eeb",
-"Words: {0}": "T\u1eeb: {0}",
-"{0} words": "{0} words",
-"File": "T\u1eadp tin",
-"Edit": "S\u1eeda",
-"Insert": "Ch\u00e8n",
-"View": "Xem",
-"Format": "\u0110\u1ecbnh d\u1ea1ng",
-"Table": "B\u1ea3ng",
-"Tools": "C\u00f4ng c\u1ee5",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. B\u1ea5m ALT-F9 m\u1edf menu. B\u1ea5m ALT-F10 m\u1edf thanh c\u00f4ng c\u1ee5. B\u1ea5m ALT-0 m\u1edf tr\u1ee3 gi\u00fap",
-"Image title": "Ti\u00eau \u0111\u1ec1 \u1ea3nh",
-"Border width": "\u0110\u1ed9 d\u00e0y vi\u1ec1n",
-"Border style": "Ki\u1ec3u vi\u1ec1n",
-"Error": "L\u1ed7i",
-"Warn": "C\u1ea3nh b\u00e1o",
-"Valid": "H\u1ee3p l\u1ec7",
-"To open the popup, press Shift+Enter": "\u0110\u1ec3 m\u1edf h\u1ed9p tho\u1ea1i, nh\u1ea5n Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Khu v\u1ef1c Rich Text. Nh\u00e2n ALT-0 \u0111\u1ec3 bi\u1ebft th\u00eam.",
-"System Font": "Ph\u00f4ng ch\u1eef h\u1ec7 th\u1ed1ng",
-"Failed to upload image: {0}": "Kh\u00f4ng th\u1ec3 \u0111\u0103ng h\u00ecnh: {0}",
-"Failed to load plugin: {0} from url {1}": "Kh\u00f4ng th\u1ec3 t\u1ea3i plugin: {0} t\u1eeb \u0111\u01b0\u1eddng d\u1eabn {1}",
-"Failed to load plugin url: {0}": "Kh\u00f4ng th\u1ec3 t\u1ea3i \u0111\u01b0\u1eddng d\u1eabn plugin: {0}",
-"Failed to initialize plugin: {0}": "Kh\u00f4ng th\u1ec3 kh\u1edfi t\u1ea1o plugin: {0}",
-"example": "v\u00ed d\u1ee5",
-"Search": "T\u00ecm ki\u1ebfm",
-"All": "T\u1ea5t c\u1ea3",
-"Currency": "Ti\u1ec1n t\u1ec7",
-"Text": "V\u0103n b\u1ea3n",
-"Quotations": "Tr\u00edch d\u1eabn",
-"Mathematical": "Thu\u1ed9c v\u1ec1 to\u00e1n h\u1ecdc",
-"Extended Latin": "Latin m\u1edf r\u1ed9ng",
-"Symbols": "K\u00fd hi\u1ec7u",
-"Arrows": "M\u0169i t\u00ean",
-"User Defined": "\u0110\u1ecbnh ngh\u0129a b\u1edfi ng\u01b0\u1eddi d\u00f9ng",
-"dollar sign": "\u00fd hi\u1ec7u \u0111\u00f4 la",
-"currency sign": "\u00fd hi\u1ec7u ti\u1ec1n t\u1ec7",
-"euro-currency sign": "k\u00fd hi\u1ec7u euro",
-"colon sign": "d\u1ea5u hai ch\u1ea5m",
-"cruzeiro sign": "k\u00fd hi\u1ec7u cruzeiro",
-"french franc sign": "k\u00fd hi\u1ec7u franc Ph\u00e1p",
-"lira sign": "\u00fd hi\u1ec7u lira",
-"mill sign": "k\u00fd hi\u1ec7u mill",
-"naira sign": "k\u00fd hi\u1ec7u naira",
-"peseta sign": "k\u00fd hi\u1ec7u peseta",
-"rupee sign": "k\u00fd hi\u1ec7u rupee",
-"won sign": "k\u00fd hi\u1ec7u won",
-"new sheqel sign": "k\u00fd hi\u1ec7u new sheqel",
-"dong sign": "k\u00fd hi\u1ec7u \u0111\u00f2ng",
-"kip sign": "k\u00fd hi\u1ec7u \u0111\u00f2ng kip",
-"tugrik sign": "k\u00fd hi\u1ec7u tugrik",
-"drachma sign": "k\u00fd hi\u1ec7u drachma",
-"german penny symbol": "k\u00fd hi\u1ec7u xu \u0110\u1ee9c",
-"peso sign": "k\u00fd hi\u1ec7u peso",
-"guarani sign": "k\u00fd hi\u1ec7u guarani",
-"austral sign": "k\u00fd hi\u1ec7u austral",
-"hryvnia sign": "k\u00fd hi\u1ec7u hryvnia",
-"cedi sign": "k\u00fd hi\u1ec7u cedi ",
-"livre tournois sign": "k\u00fd hi\u1ec7u livre tournois",
-"spesmilo sign": "k\u00fd hi\u1ec7u spesmilo",
-"tenge sign": "K\u00fd hi\u1ec7u tenge",
-"indian rupee sign": "k\u00fd hi\u1ec7u rupee \u1ea5n \u0111\u1ed9",
-"turkish lira sign": "k\u00fd hi\u1ec7u lira th\u1ed5 nh\u0129 k\u1ef3",
-"nordic mark sign": "k\u00fd hi\u1ec7u mark b\u1eafc \u00e2u",
-"manat sign": "k\u00fd hi\u1ec7u manat",
-"ruble sign": "k\u00fd hi\u1ec7u r\u00fap",
-"yen character": "k\u00fd hi\u1ec7u y\u00ean",
-"yuan character": "k\u00fd hi\u1ec7u yuan",
-"yuan character, in hong kong and taiwan": "k\u00fd hi\u1ec7u yuan, \u1edf h\u1ed3ng k\u00f4ng v\u00e0 \u0111\u00e0i loan",
-"yen\/yuan character variant one": "k\u00fd hi\u1ec7u y\u00ean\/yuan bi\u1ebfn th\u1ec3",
-"Loading emoticons...": "\u0110ang t\u1ea3i bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac...",
-"Could not load emoticons": "Kh\u00f4ng th\u1ec3 t\u1ea3i bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac",
-"People": "Ng\u01b0\u1eddi",
-"Animals and Nature": "\u0110\u1ed9ng v\u1eadt v\u00e0 thi\u00ean nhi\u00ean",
-"Food and Drink": "Th\u1ee9c \u0103n v\u00e0 \u0111\u1ed3 u\u1ed1ng",
-"Activity": "Ho\u1ea1t \u0111\u1ed9ng",
-"Travel and Places": "Du l\u1ecbch v\u00e0 \u0111\u1ecba \u0111i\u1ec3m",
-"Objects": "V\u1eadt d\u1ee5ng",
-"Flags": "C\u1edd",
-"Characters": "Nh\u00e2n v\u1eadt",
-"Characters (no spaces)": "K\u00fd t\u1ef1 (kh\u00f4ng kho\u1ea3ng tr\u1ed1ng)",
-"{0} characters": "{0} k\u00fd t\u1ef1",
-"Error: Form submit field collision.": "L\u1ed7i: Xung \u0111\u1ed9t tr\u01b0\u1eddng trong bi\u1ec3u m\u1eabu.",
-"Error: No form element found.": "L\u1ed7i: Kh\u00f4ng t\u00ecm th\u1ea5y bi\u1ec3u m\u1eabu.",
-"Update": "C\u1eadp nh\u1eadt",
-"Color swatch": "M\u1eabu m\u00e0u",
-"Turquoise": "Ng\u1ecdc lam",
-"Green": "Xanh l\u00e1",
-"Blue": "Xanh d\u01b0\u01a1ng",
-"Purple": "T\u00edm",
-"Navy Blue": "Xanh n\u01b0\u1edbc bi\u1ec3n",
-"Dark Turquoise": "Ng\u1ecdc lam t\u1ed1i",
-"Dark Green": "Xanh l\u00e1 c\u00e2y \u0111\u1eadm",
-"Medium Blue": "Xanh d\u01b0\u01a1ng nh\u1eb9",
-"Medium Purple": "T\u00edm nh\u1eb9",
-"Midnight Blue": "Xanh d\u01b0\u01a1ng n\u1eeda \u0111\u00eam",
-"Yellow": "V\u00e0ng",
-"Orange": "Cam",
-"Red": "\u0110\u1ecf",
-"Light Gray": "X\u00e1m nh\u1ea1t",
-"Gray": "X\u00e1m",
-"Dark Yellow": "V\u00e0ng \u0111\u1eadm",
-"Dark Orange": "Cam \u0111\u1eadm",
-"Dark Red": "\u0110\u1ecf \u0111\u1eadm",
-"Medium Gray": "X\u00e1m nh\u1eb9",
-"Dark Gray": "X\u00e1m \u0111\u1eadm",
-"Light Green": "Xanh l\u00e1 nh\u1ea1t",
-"Light Yellow": "V\u00e0ng nh\u1ea1t",
-"Light Red": "\u0110\u1ecf nh\u1ea1t",
-"Light Purple": "T\u00edm nh\u1ea1t",
-"Light Blue": "Xanh d\u01b0\u01a1ng nh\u1ea1t",
-"Dark Purple": "T\u00edm \u0111\u1eadm",
-"Dark Blue": "Xanh d\u01b0\u01a1ng \u0111\u1eadm",
-"Black": "\u0110en",
-"White": "Tr\u1eafng",
-"Switch to or from fullscreen mode": "Chuy\u1ec3n qua ho\u1eb7c l\u1ea1i ch\u1ebf \u0111\u1ed9 to\u00e0n m\u00e0n h\u00ecnh",
-"Open help dialog": "M\u1edf h\u1ed9p tho\u1ea1i tr\u1ee3 gi\u00fap",
-"history": "l\u1ecbch s\u1eed",
-"styles": "ki\u1ec3u",
-"formatting": "\u0111\u1ecbnh d\u1ea1ng",
-"alignment": "canh l\u1ec1",
-"indentation": "th\u1ee5t \u0111\u1ea7u d\u00f2ng",
-"permanent pen": "b\u00fat d\u1ea7u",
-"comments": "b\u00ecnh lu\u1eadn...",
-"Format Painter": "Sao ch\u00e9p \u0111\u1ecbnh d\u1ea1ng",
-"Insert\/edit iframe": "Ch\u00e8n\/s\u1eeda iframe",
-"Capitalization": "Ch\u1eef hoa",
-"lowercase": "ch\u1eef th\u01b0\u1eddng",
-"UPPERCASE": "VI\u1ebeT HOA",
-"Title Case": "D\u1ea1ng ti\u00eau \u0111\u1ec1",
-"Permanent Pen Properties": "Thu\u1ed9c t\u00ednh b\u00fat",
-"Permanent pen properties...": "Thu\u1ed9c t\u00ednh b\u00fat...",
-"Font": "Ph\u00f4ng ch\u1eef",
-"Size": "K\u00edch th\u01b0\u1edbc",
-"More...": "Th\u00eam...",
-"Spellcheck Language": "Ng\u00f4n ng\u1eef ch\u00ednh t\u1ea3",
-"Select...": "Ch\u1ecdn...",
-"Preferences": "T\u00f9y ch\u1ecdn",
-"Yes": "C\u00f3",
-"No": "Kh\u00f4ng",
-"Keyboard Navigation": "Ph\u00edm \u0111i\u1ec1u h\u01b0\u1edbng",
-"Version": "Phi\u00ean b\u1ea3n",
-"Anchor": "Neo",
-"Special character": "K\u00fd t\u1ef1 \u0111\u1eb7c bi\u1ec7t",
-"Code sample": "M\u00e3 m\u1eabu",
-"Color": "M\u00e0u s\u1eafc",
-"Emoticons": "Bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac",
-"Document properties": "Thu\u1ed9c t\u00ednh t\u00e0i li\u1ec7u",
-"Image": "Image",
-"Insert link": "Ch\u00e8n li\u00ean k\u1ebft",
-"Target": "\u0110\u00edch",
-"Link": "Link",
-"Poster": "Ng\u01b0\u1eddi g\u1eedi",
-"Media": "Media",
-"Print": "In",
-"Prev": "Tr\u01b0\u1edbc",
-"Find and replace": "T\u00ecm v\u00e0 thay th\u1ebf",
-"Whole words": "To\u00e0n b\u1ed9 t\u1eeb",
-"Spellcheck": "Ki\u1ec3m tra ch\u00ednh t\u1ea3",
-"Caption": "Ti\u00eau \u0111\u1ec1",
-"Insert template": "Th\u00eam m\u1eabu"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/js/tinymce/langs/vi_VN.js Deleted

@@ -1,260 +0,0 @@
-tinymce.addI18n('vi_VN',{
-"Redo": "Ho\u00e0n t\u00e1t",
-"Undo": "Hu\u1ef7 thao t\u00e1c",
-"Cut": "C\u1eaft",
-"Copy": "Ch\u00e9p",
-"Paste": "D\u00e1n",
-"Select all": "Ch\u1ecdn t\u1ea5t c\u1ea3",
-"New document": "T\u1ea1o t\u00e0i li\u1ec7u m\u1edbi",
-"Ok": "OK",
-"Cancel": "Hu\u1ef7",
-"Visual aids": "Hi\u1ec7n khung so\u1ea1n th\u1ea3o",
-"Bold": "T\u00f4 \u0111\u1eadm",
-"Italic": "In nghi\u00eang",
-"Underline": "G\u1ea1ch d\u01b0\u1edbi",
-"Strikethrough": "G\u1ea1ch ngang",
-"Superscript": "Tr\u00ean d\u00f2ng",
-"Subscript": "D\u01b0\u1edbi d\u00f2ng",
-"Clear formatting": "Xo\u00e1 \u0111\u1ecbnh d\u1ea1ng",
-"Align left": "Canh tr\u00e1i",
-"Align center": "Canh gi\u1eefa",
-"Align right": "Canh ph\u1ea3i",
-"Justify": "Canh \u0111\u1ec1u hai b\u00ean",
-"Bullet list": "D\u1ea5u \u0111\u1ea7u d\u00f2ng",
-"Numbered list": "Danh s\u00e1ch s\u1ed1",
-"Decrease indent": "L\u00f9i ra",
-"Increase indent": "L\u00f9i v\u00e0o",
-"Close": "\u0110\u00f3ng",
-"Formats": "\u0110\u1ecbnh d\u1ea1ng",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n kh\u00f4ng h\u1ed7 tr\u1ee3 truy c\u1eadp clipboard, vui l\u00f2ng s\u1eed d\u1ee5ng c\u00e1c t\u1ed5 h\u1ee3p Ctrl + X, C, V.",
-"Headers": "\u0110\u1ea7u trang",
-"Header 1": "Ti\u00eau \u0111\u1ec1 1",
-"Header 2": "Ti\u00eau \u0111\u1ec1 2",
-"Header 3": "Ti\u00eau \u0111\u1ec1 3",
-"Header 4": "Ti\u00eau \u0111\u1ec1 4",
-"Header 5": "Ti\u00eau \u0111\u1ec1 5",
-"Header 6": "Ti\u00eau \u0111\u1ec1 6",
-"Headings": "Ti\u00eau \u0111\u1ec1",
-"Heading 1": "Ti\u00eau \u0111\u1ec1 1",
-"Heading 2": "Ti\u00eau \u0111\u1ec1 2",
-"Heading 3": "Ti\u00eau \u0111\u1ec1 3",
-"Heading 4": "Ti\u00eau \u0111\u1ec1 4",
-"Heading 5": "Ti\u00eau \u0111\u1ec1 5",
-"Heading 6": "Ti\u00eau \u0111\u1ec1 6",
-"Div": "Khung",
-"Pre": "\u0110\u1ecbnh d\u1ea1ng",
-"Code": "M\u00e3",
-"Paragraph": "\u0110o\u1ea1n v\u0103n",
-"Blockquote": "Tr\u00edch",
-"Inline": "C\u00f9ng d\u00f2ng",
-"Blocks": "Bao",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00e1n b\u00e2y gi\u1edd l\u00e0 \u1edf ch\u1ebf \u0111\u1ed9 v\u0103n b\u1ea3n \u0111\u01a1n gi\u1ea3n. N\u1ed9i dung s\u1ebd \u0111\u01b0\u1ee3c d\u00e1n nh\u01b0 \u0111\u1ed3ng b\u1eb1ng v\u0103n b\u1ea3n cho \u0111\u1ebfn khi b\u1ea1n chuy\u1ec3n \u0111\u1ed5i t\u00f9y ch\u1ecdn n\u00e0y.",
-"Font Family": "Ph\u00f4ng",
-"Font Sizes": "K\u00edch th\u01b0\u1edbc ph\u00f4ng",
-"Class": "L\u1edbp",
-"Browse for an image": "Duy\u1ec7t \u1ea3nh",
-"OR": "HO\u1eb6C",
-"Drop an image here": "Th\u1ea3 h\u00ecnh \u1ea3nh \u1edf \u0111\u00e2y",
-"Upload": "T\u1ea3i l\u00ean",
-"Block": "Kh\u1ed1i",
-"Align": "C\u0103n ch\u1ec9nh",
-"Default": "Ng\u1ea7m \u0111\u1ecbnh",
-"Circle": "H\u00ecnh tr\u00f2n",
-"Disc": "H\u00ecnh tr\u00f2n m\u1ecfng",
-"Square": "\u00d4 vu\u00f4ng",
-"Lower Alpha": "K\u00fd t\u1ef1 th\u01b0\u1eddng",
-"Lower Greek": "S\u1ed1 hy l\u1ea1p th\u01b0\u1eddng",
-"Lower Roman": "S\u1ed1 la m\u00e3 th\u01b0\u1eddng",
-"Upper Alpha": "K\u00fd t\u1ef1 hoa",
-"Upper Roman": "S\u1ed1 la m\u00e3 hoa",
-"Anchor": "Neo",
-"Name": "T\u00ean",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id ph\u1ea3i b\u1eaft \u0111\u1ea7u b\u1eb1ng m\u1ed9t ch\u1eef c\u00e1i, ch\u1ec9 theo sau b\u1edfi c\u00e1c ch\u1eef c\u00e1i, s\u1ed1, d\u1ea5u g\u1ea1ch ngang, d\u1ea5u ch\u1ea5m, d\u1ea5u hai ch\u1ea5m ho\u1eb7c d\u1ea5u g\u1ea1ch d\u01b0\u1edbi.",
-"You have unsaved changes are you sure you want to navigate away?": "B\u1ea1n ch\u01b0a l\u01b0u c\u00e1c thay \u0111\u1ed5i, b\u1ea1n c\u00f3 th\u1eadt s\u1ef1 mu\u1ed1n \u0111\u00f3ng ?",
-"Restore last draft": "Ph\u1ee5c h\u1ed3i b\u1ea3n l\u01b0u g\u1ea7n nh\u1ea5t",
-"Special character": "K\u00fd t\u1ef1 \u0111\u1eb7c bi\u1ec7t",
-"Source code": "M\u00e3 ngu\u1ed3n",
-"Insert\/Edit code sample": "Ch\u00e8n\/Ch\u1ec9nh s\u1eeda m\u1eabu",
-"Language": "Ng\u00f4n ng\u1eef",
-"Code sample": "\u0110o\u1ea1n m\u00e3 m\u1eabu",
-"Color": "M\u00e0u",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Tr\u00e1i sang ph\u1ea3i",
-"Right to left": "Ph\u1ea3i sang tr\u00e1i",
-"Emoticons": "Bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac",
-"Document properties": "Thu\u1ed9c t\u00ednh t\u00e0i li\u1ec7u",
-"Title": "Ti\u00eau \u0111\u1ec1",
-"Keywords": "T\u1eeb kho\u00e1",
-"Description": "Mi\u00eau t\u1ea3",
-"Robots": "Robots",
-"Author": "Neo",
-"Encoding": "M\u00e3 ho\u00e1",
-"Fullscreen": "\u0110\u1ea7y m\u00e0n h\u00ecnh",
-"Action": "H\u00e0nh \u0111\u1ed9ng",
-"Shortcut": "L\u1ed1i t\u1eaft",
-"Help": "Tr\u1ee3 gi\u00fap",
-"Address": "\u0110\u1ecba ch\u1ec9",
-"Focus to menubar": "G\u1eafn l\u00ean thanh tr\u00ecnh \u0111\u01a1n",
-"Focus to toolbar": "G\u1eafn l\u00ean thanh c\u00f4ng c\u1ee5",
-"Focus to element path": "G\u1eafn v\u00e0o \u0111\u01b0\u1eddng d\u1eabn",
-"Focus to contextual toolbar": "G\u1eafn v\u00e0o thanh c\u00f4ng c\u1ee5 ng\u1eef c\u1ea3nh",
-"Insert link (if link plugin activated)": "Ch\u00e8n li\u00ean k\u1ebft (n\u1ebfu plugin li\u00ean k\u1ebft \u0111\u1ea3 k\u00edch ho\u1ea1t)",
-"Save (if save plugin activated)": "L\u01b0u (n\u1ebfu plugin l\u01b0u \u0111\u1ea3 k\u00edch ho\u1ea1t)",
-"Find (if searchreplace plugin activated)": "T\u00ecm (n\u1ebfu plugin t\u00ecm v\u00e0 thay th\u1ebf \u0111\u1ea3 k\u00edch ho\u1ea1t)",
-"Plugins installed ({0}):": "Plugin \u0111\u00e3 c\u00e0i \u0111\u1eb7t ({0}):",
-"Premium plugins:": "C\u00e1c Plugin tr\u1ea3 ph\u00ed:",
-"Learn more...": "T\u00ecm hi\u1ec3u th\u00eam...",
-"You are using {0}": "B\u1ea1n \u0111ang s\u1eed d\u1ee5ng {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Ph\u00edm t\u1eaft ti\u1ec7n d\u1ee5ng",
-"Horizontal line": "G\u1ea1ch ngang",
-"Insert\/edit image": "Th\u00eam \/ s\u1eeda h\u00ecnh \u1ea3nh",
-"Image description": "Mi\u00eau t\u1ea3 h\u00ecnh \u1ea3nh",
-"Source": "Ngu\u1ed3n",
-"Dimensions": "K\u00edch th\u01b0\u1edbc",
-"Constrain proportions": "H\u1ea1n ch\u1ebf t\u1ef7 l\u1ec7",
-"General": "T\u1ed5ng h\u1ee3p",
-"Advanced": "N\u00e2ng cao",
-"Style": "Ki\u1ec3u",
-"Vertical space": "Kho\u1ea3ng c\u00e1ch d\u1ecdc",
-"Horizontal space": "Kho\u1ea3ng c\u00e1ch ngang",
-"Border": "\u0110\u01b0\u1eddng vi\u1ec1n",
-"Insert image": "Ch\u00e8n \u1ea3nh",
-"Image": "H\u00ecnh \u1ea3nh",
-"Image list": "Danh s\u00e1ch \u1ea3nh",
-"Rotate counterclockwise": "Xoay ng\u01b0\u1ee3c chi\u1ec1u kim \u0111\u1ed3ng",
-"Rotate clockwise": "Xoay theo chi\u1ec1u kim \u0111\u1ed3ng h\u1ed3",
-"Flip vertically": "L\u1eadt d\u1ecdc",
-"Flip horizontally": "L\u1eadt ngang",
-"Edit image": "S\u1eeda \u1ea3nh",
-"Image options": "T\u00f9y ch\u1ecdn h\u00ecnh \u1ea3nh",
-"Zoom in": "Ph\u00f3ng to",
-"Zoom out": "Thu nh\u1ecf",
-"Crop": "X\u00e9n",
-"Resize": "Thay \u0111\u1ed5i k\u00edch th\u01b0\u1edbc",
-"Orientation": "\u0110\u1ecbnh h\u01b0\u1edbng",
-"Brightness": "\u0110\u1ed9 s\u00e1ng",
-"Sharpen": "\u0110\u1ed9 s\u1eafc n\u00e9t",
-"Contrast": "\u0110\u1ed9 t\u01b0\u01a1ng ph\u1ea3n",
-"Color levels": "M\u1ee9c \u0111\u1ed9 m\u00e0u s\u1eafc",
-"Gamma": "M\u00e0u Gamma",
-"Invert": "\u0110\u1ea3o ng\u01b0\u1ee3c",
-"Apply": "\u00c1p d\u1ee5ng",
-"Back": "Tr\u1edf l\u1ea1i",
-"Insert date\/time": "Th\u00eam ng\u00e0y \/ gi\u1edd",
-"Date\/time": "Ng\u00e0y\/gi\u1edd",
-"Insert link": "Th\u00eam li\u00ean k\u1ebft",
-"Insert\/edit link": "Th\u00eam \/ s\u1eeda li\u00ean k\u1ebft",
-"Text to display": "Ch\u1eef hi\u1ec3n th\u1ecb",
-"Url": "Li\u00ean k\u1ebft",
-"Target": "M\u1ee5c ti\u00eau",
-"None": "Kh\u00f4ng",
-"New window": "C\u1eeda s\u1ed5 m\u1edbi",
-"Remove link": "Xo\u00e1 li\u00ean k\u1ebft",
-"Anchors": "Ghim",
-"Link": "Li\u00ean k\u1ebft",
-"Paste or type a link": "D\u00e1n ho\u1eb7c nh\u1eadp li\u00ean k\u1ebft",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL b\u1ea1n nh\u1eadp v\u00e0o c\u00f3 v\u1ebb l\u00e0 m\u1ed9t \u0111\u1ecba ch\u1ec9 email. B\u1ea1n c\u00f3 mu\u1ed1n th\u00eam c\u00e1c y\u00eau c\u1ea7u mailto: ti\u1ec1n t\u1ed1?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL b\u1ea1n nh\u1eadp v\u00e0o c\u00f3 v\u1ebb l\u00e0 m\u1ed9t li\u00ean k\u1ebft b\u00ean ngo\u00e0i. B\u1ea1n c\u00f3 mu\u1ed1n th\u00eam ti\u1ec1n t\u1ed1 http:\/\/ c\u1ea7n thi\u1ebft?",
-"Link list": "Danh s\u00e1ch li\u00ean k\u1ebft",
-"Insert video": "Th\u00eam video",
-"Insert\/edit video": "Th\u00eam \/ s\u1eeda video",
-"Insert\/edit media": "Ch\u00e8n\/ch\u1ec9nh s\u1eeda ph\u01b0\u01a1ng ti\u1ec7n truy\u1ec1n th\u00f4ng",
-"Alternative source": "Ngu\u1ed3n thay th\u1ebf",
-"Poster": "Ng\u01b0\u1eddi \u0111\u0103ng",
-"Paste your embed code below:": "D\u00e1n m\u00e3 embed v\u00e0o:",
-"Embed": "Embed",
-"Media": "Ph\u01b0\u01a1ng ti\u1ec7n truy\u1ec1n th\u00f4ng",
-"Nonbreaking space": "Kh\u00f4ng ng\u1eaft kho\u1ea3ng",
-"Page break": "Ng\u1eaft trang",
-"Paste as text": "D\u00e1n nh\u01b0 v\u0103n b\u1ea3n",
-"Preview": "Xem tr\u01b0\u1edbc",
-"Print": "In",
-"Save": "L\u01b0u",
-"Find": "T\u00ecm",
-"Replace with": "Thay th\u1ebf b\u1eb1ng",
-"Replace": "Thay th\u1ebf",
-"Replace all": "Thay th\u1ebf t\u1ea5t c\u1ea3",
-"Prev": "Tr\u01b0\u1edbc",
-"Next": "Sau",
-"Find and replace": "T\u00ecm v\u00e0 thay th\u1ebf",
-"Could not find the specified string.": "Kh\u00f4ng t\u00ecm th\u1ea5y chu\u1ed7i y\u00eau c\u1ea7u",
-"Match case": "Ph\u00e2n bi\u1ec7t hoa th\u01b0\u1eddng",
-"Whole words": "T\u1ea5t c\u1ea3 \u0111o\u1ea1n",
-"Spellcheck": "Ki\u1ec3m tra ch\u00ednh t\u1ea3",
-"Ignore": "L\u1edd qua",
-"Ignore all": "L\u1edd t\u1ea5t c\u1ea3",
-"Finish": "Ho\u00e0n t\u1ea5t",
-"Add to Dictionary": "Th\u00eam v\u00e0o t\u1eeb \u0111i\u1ec3n",
-"Insert table": "Th\u00eam b\u1ea3ng",
-"Table properties": "Thu\u1ed9c t\u00ednh b\u1ea3ng",
-"Delete table": "Xo\u00e1 b\u1ea3ng",
-"Cell": "\u00d4",
-"Row": "D\u00f2ng",
-"Column": "C\u1ed9t",
-"Cell properties": "Thu\u1ed9c t\u00ednh \u00f4",
-"Merge cells": "N\u1ed1i \u00f4",
-"Split cell": "Chia \u00f4",
-"Insert row before": "Th\u00eam d\u00f2ng ph\u00eda tr\u00ean",
-"Insert row after": "Th\u00eam d\u00f2ng ph\u00eda d\u01b0\u1edbi",
-"Delete row": "Xo\u00e1 d\u00f2ng",
-"Row properties": "Thu\u1ed9c t\u00ednh d\u00f2ng",
-"Cut row": "C\u1eaft d\u00f2ng",
-"Copy row": "Ch\u00e9p d\u00f2ng",
-"Paste row before": "D\u00e1n v\u00e0o ph\u00eda tr\u01b0\u1edbc, tr\u00ean",
-"Paste row after": "D\u00e1n v\u00e0o ph\u00eda sau, d\u01b0\u1edbi",
-"Insert column before": "Th\u00eam c\u1ed9t b\u00ean tr\u00e1i",
-"Insert column after": "Th\u00eam c\u1ed9t b\u00ean ph\u1ea3i",
-"Delete column": "Xo\u00e1 c\u1ed9t",
-"Cols": "C\u1ed9t",
-"Rows": "D\u00f2ng",
-"Width": "R\u1ed9ng",
-"Height": "Cao",
-"Cell spacing": "Kho\u1ea3ng c\u00e1ch \u00f4",
-"Cell padding": "Kho\u1ea3ng c\u00e1ch trong \u00f4",
-"Caption": "Ti\u00eau \u0111\u1ec1",
-"Left": "Tr\u00e1i",
-"Center": "Gi\u1eefa",
-"Right": "Ph\u1ea3i",
-"Cell type": "Lo\u1ea1i \u00f4",
-"Scope": "Quy\u1ec1n",
-"Alignment": "Canh ch\u1ec9nh",
-"H Align": "X\u1ebfp ngang",
-"V Align": "X\u1ebfp d\u1ecdc",
-"Top": "\u0110\u1ec9nh",
-"Middle": "Gi\u1eefa",
-"Bottom": "\u0110\u00e1y",
-"Header cell": "Ti\u00eau \u0111\u1ec1 \u00f4",
-"Row group": "Nh\u00f3m d\u00f2ng",
-"Column group": "Nh\u00f3m c\u1ed9t",
-"Row type": "Lo\u1ea1i d\u00f2ng",
-"Header": "Ti\u00eau \u0111\u1ec1",
-"Body": "N\u1ed9i dung",
-"Footer": "Ch\u00e2n",
-"Border color": "M\u00e0u vi\u1ec1n",
-"Insert template": "Th\u00eam m\u1eabu",
-"Templates": "M\u1eabu",
-"Template": "B\u1ea3n m\u1eabu",
-"Text color": "M\u00e0u ch\u1eef",
-"Background color": "M\u00e0u n\u1ec1n",
-"Custom...": "T\u00f9y ch\u1ecdn...",
-"Custom color": "M\u00e0u t\u00f9y ch\u1ecdn",
-"No color": "Kh\u00f4ng m\u00e0u",
-"Table of Contents": "M\u1ee5c l\u1ee5c",
-"Show blocks": "Hi\u1ec3n th\u1ecb kh\u1ed1i",
-"Show invisible characters": "Hi\u1ec3n th\u1ecb c\u00e1c k\u00fd t\u1ef1 \u1ea9n",
-"Words: {0}": "T\u1eeb: {0}",
-"{0} words": "{0} t\u1eeb",
-"File": "T\u1eadp tin",
-"Edit": "S\u1eeda",
-"Insert": "Th\u00eam",
-"View": "Xem",
-"Format": "\u0110\u1ecbnh d\u1ea1ng",
-"Table": "B\u1ea3ng",
-"Tools": "C\u00f4ng c\u1ee5",
-"Powered by {0}": "\u0110\u01b0\u1ee3c cung c\u1ea5p b\u1edfi {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Khu v\u1ef1c so\u1ea1n th\u1ea3o. Nh\u1ea5n ALT-F9 \u0111\u1ec3 hi\u1ec7n menu, ALT-F10 \u0111\u1ec3 hi\u1ec7n thanh c\u00f4ng c\u1ee5. C\u1ea7n tr\u1ee3 gi\u00fap nh\u1ea5n ALT-0"
-});
\ No newline at end of file

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube.php Changed

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube_imap.php Changed

roundcubemail-1.5.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit116707bd4b5148aeb78c8f2caad336cc
+class ComposerAutoloaderInit758ba27398a1a87e40d07c0405f425dd
 {
     private static $loader;
 
@@ -24,20 +24,20 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit116707bd4b5148aeb78c8f2caad336cc', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit758ba27398a1a87e40d07c0405f425dd', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit116707bd4b5148aeb78c8f2caad336cc', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit758ba27398a1a87e40d07c0405f425dd', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
                 $GLOBALS'__composer_autoload_files'$fileIdentifier = true;

roundcubemail-1.5.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc
+class ComposerStaticInit758ba27398a1a87e40d07c0405f425dd
 {
     public static $files = array (
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
@@ -1130,11 +1130,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit116707bd4b5148aeb78c8f2caad336cc::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit758ba27398a1a87e40d07c0405f425dd::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.tar.gz/vendor/composer/include_paths.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/installed.json Changed

@@ -2630,27 +2630,28 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.13",
-            "version_normalized": "1.10.13.0",
+            "version": "v1.10.14",
+            "version_normalized": "1.10.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d"
+                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d",
-                "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32",
+                "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32",
                 "shasum": ""
             },
             "require": {
                 "pear/console_getopt": "~1.4",
-                "pear/pear_exception": "~1.0"
+                "pear/pear_exception": "~1.0",
+                "php": ">=5.4"
             },
             "replace": {
                 "rsky/pear-core-min": "self.version"
             },
-            "time": "2023-04-19T19:15:47+00:00",
+            "time": "2023-11-26T16:15:38+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3047,17 +3048,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.44",
-            "version_normalized": "1.10.44.0",
+            "version": "1.10.57",
+            "version_normalized": "1.10.57.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b"
+                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bf84367c53a23f759513985c54ffe0d0c249825b",
-                "reference": "bf84367c53a23f759513985c54ffe0d0c249825b",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
+                "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
                 "shasum": ""
             },
             "require": {
@@ -3066,7 +3067,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-11-21T16:30:46+00:00",
+            "time": "2024-01-24T11:51:34+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"
@@ -3822,17 +3823,17 @@
         },
         {
             "name": "roundcube/rtf-html-php",
-            "version": "v2.1",
-            "version_normalized": "2.1.0.0",
+            "version": "v2.2",
+            "version_normalized": "2.2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/roundcube/rtf-html-php.git",
-                "reference": "7b488113e6fe2fccd84643e5121070fe7f335cb2"
+                "reference": "a3432ca249b73bf24fec50114191a63ad8b1478c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/roundcube/rtf-html-php/zipball/7b488113e6fe2fccd84643e5121070fe7f335cb2",
-                "reference": "7b488113e6fe2fccd84643e5121070fe7f335cb2",
+                "url": "https://api.github.com/repos/roundcube/rtf-html-php/zipball/a3432ca249b73bf24fec50114191a63ad8b1478c",
+                "reference": "a3432ca249b73bf24fec50114191a63ad8b1478c",
                 "shasum": ""
             },
             "require": {
@@ -3841,9 +3842,10 @@
                 "php": ">=5.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7"
+                "phpstan/phpstan": "^1.2",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6 || ^7 | ^9.6"
             },
-            "time": "2021-07-11T06:43:46+00:00",
+            "time": "2023-12-31T14:01:02+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3872,23 +3874,23 @@
             ,
             "support": {
                 "issues": "https://github.com/roundcube/rtf-html-php/issues",
-                "source": "https://github.com/roundcube/rtf-html-php/tree/v2.1"
+                "source": "https://github.com/roundcube/rtf-html-php/tree/v2.2"
             },
             "install-path": "../roundcube/rtf-html-php"
         },
         {
             "name": "sabre/dav",
-            "version": "4.5.1",
-            "version_normalized": "4.5.1.0",
+            "version": "4.6.0",
+            "version_normalized": "4.6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/dav.git",
-                "reference": "b29899b675371aee73920165d1dc5a2235aa104b"
+                "reference": "554145304b4a026477d130928d16e626939b0b2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/dav/zipball/b29899b675371aee73920165d1dc5a2235aa104b",
-                "reference": "b29899b675371aee73920165d1dc5a2235aa104b",
+                "url": "https://api.github.com/repos/sabre-io/dav/zipball/554145304b4a026477d130928d16e626939b0b2a",
+                "reference": "554145304b4a026477d130928d16e626939b0b2a",
                 "shasum": ""
             },
             "require": {
@@ -3912,7 +3914,7 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.19",
-                "monolog/monolog": "^1.27",
+                "monolog/monolog": "^1.27 || ^2.0",
                 "phpstan/phpstan": "^0.12 || ^1.0",
                 "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
@@ -3922,7 +3924,7 @@
                 "ext-imap": "*",
                 "ext-pdo": "*"
             },
-            "time": "2023-11-23T04:33:31+00:00",
+            "time": "2023-12-11T13:01:23+00:00",
             "bin": 
                 "bin/sabredav",
                 "bin/naturalselection"
@@ -5071,17 +5073,17 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.2",
-            "version_normalized": "3.7.2.0",
+            "version": "3.8.1",
+            "version_normalized": "3.8.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
+                "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
-                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7",
+                "reference": "14f5fff1e64118595db5408e946f3a22c75807f7",
                 "shasum": ""
             },
             "require": {
@@ -5091,12 +5093,12 @@
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
             },
-            "time": "2023-02-22T23:07:41+00:00",
+            "time": "2024-01-11T20:47:48+00:00",
             "bin": 
-                "bin/phpcs",
-                "bin/phpcbf"
+                "bin/phpcbf",
+                "bin/phpcs"
             ,
             "type": "library",
             "extra": {
@@ -5112,21 +5114,44 @@
             "authors": 
                 {
                     "name": "Greg Sherwood",
-                    "role": "lead"
+                    "role": "Former lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "role": "Current lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
                 }
             ,
             "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
             "keywords": 
                 "phpcs",
                 "standards",
                 "static analysis"
             ,
             "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+                "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+                "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+                "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+                "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
             },
+            "funding": 
+                {
+                    "url": "https://github.com/PHPCSStandards",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/jrfnl",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/php_codesniffer",
+                    "type": "open_collective"
+                }
+            ,
             "install-path": "../squizlabs/php_codesniffer"
         },
         {

roundcubemail-1.5.tar.gz/vendor/composer/installed.php Changed

@@ -3,7 +3,7 @@
         'name' => 'roundcube/roundcubemail',
         'pretty_version' => 'dev-dev/kolab-1.5',
         'version' => 'dev-dev/kolab-1.5',
-        'reference' => 'b29ecec6bd39c4cd8d145d7ea8cd7d145d7a2ab2',
+        'reference' => '653149972c8f3e3fb9b9c5f075a8a52f340ad956',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -447,9 +447,9 @@
             'dev_requirement' => false,
         ),
         'pear/pear-core-minimal' => array(
-            'pretty_version' => 'v1.10.13',
-            'version' => '1.10.13.0',
-            'reference' => 'aed862e95fd286c53cc546734868dc38ff4b5b1d',
+            'pretty_version' => 'v1.10.14',
+            'version' => '1.10.14.0',
+            'reference' => 'a86fc145edb5caedbf96527214ce3cadc9de4a32',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/pear-core-minimal',
             'aliases' => array(),
@@ -510,9 +510,9 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.44',
-            'version' => '1.10.44.0',
-            'reference' => 'bf84367c53a23f759513985c54ffe0d0c249825b',
+            'pretty_version' => '1.10.57',
+            'version' => '1.10.57.0',
+            'reference' => '1627b1d03446904aaa77593f370c5201d2ecc34e',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
@@ -641,16 +641,16 @@
         'roundcube/roundcubemail' => array(
             'pretty_version' => 'dev-dev/kolab-1.5',
             'version' => 'dev-dev/kolab-1.5',
-            'reference' => 'b29ecec6bd39c4cd8d145d7ea8cd7d145d7a2ab2',
+            'reference' => '653149972c8f3e3fb9b9c5f075a8a52f340ad956',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'roundcube/rtf-html-php' => array(
-            'pretty_version' => 'v2.1',
-            'version' => '2.1.0.0',
-            'reference' => '7b488113e6fe2fccd84643e5121070fe7f335cb2',
+            'pretty_version' => 'v2.2',
+            'version' => '2.2.0.0',
+            'reference' => 'a3432ca249b73bf24fec50114191a63ad8b1478c',
             'type' => 'library',
             'install_path' => __DIR__ . '/../roundcube/rtf-html-php',
             'aliases' => array(),
@@ -659,13 +659,13 @@
         'rsky/pear-core-min' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => 'v1.10.13',
+                0 => 'v1.10.14',
             ),
         ),
         'sabre/dav' => array(
-            'pretty_version' => '4.5.1',
-            'version' => '4.5.1.0',
-            'reference' => 'b29899b675371aee73920165d1dc5a2235aa104b',
+            'pretty_version' => '4.6.0',
+            'version' => '4.6.0.0',
+            'reference' => '554145304b4a026477d130928d16e626939b0b2a',
             'type' => 'library',
             'install_path' => __DIR__ . '/../sabre/dav',
             'aliases' => array(),
@@ -825,9 +825,9 @@
             'dev_requirement' => false,
         ),
         'squizlabs/php_codesniffer' => array(
-            'pretty_version' => '3.7.2',
-            'version' => '3.7.2.0',
-            'reference' => 'ed8e00df0a83aa96acf703f8c2979ff33341f879',
+            'pretty_version' => '3.8.1',
+            'version' => '3.8.1.0',
+            'reference' => '14f5fff1e64118595db5408e946f3a22c75807f7',
             'type' => 'library',
             'install_path' => __DIR__ . '/../squizlabs/php_codesniffer',
             'aliases' => array(),

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@4aafbf272597.(none)> 1700827978 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@4aafbf272597.(none)> 1700827978 +0000	checkout: moving from master to master
-39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@4aafbf272597.(none)> 1700827978 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01
+0000000000000000000000000000000000000000 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@a966b73c000f.(none)> 1707132209 +0000	clone: from /home/default/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@a966b73c000f.(none)> 1707132209 +0000	checkout: moving from master to master
+39a754269fe6e5d94b0fe87215e89232876bda01 39a754269fe6e5d94b0fe87215e89232876bda01 default <default@a966b73c000f.(none)> 1707132209 +0000	reset: moving to 39a754269fe6e5d94b0fe87215e89232876bda01

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.5.tar.gz/vendor/pear/pear-core-minimal/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/pear/pear-core-minimal/src/PEAR.php Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/bootstrap.php Changed

@@ -3,12 +3,17 @@
 namespace PHPStan;
 
 use Composer\Autoload\ClassLoader;
+use function class_exists;
+use const PHP_VERSION_ID;
 
 final class PharAutoloader
 {
 	/** @var ClassLoader */
 	private static $composerAutoloader;
 
+	/** @var bool */
+	private static $polyfillsLoaded = false;
+
 	final public static function loadClass(string $class): void {
 		if (!extension_loaded('phar') || defined('__PHPSTAN_RUNNING__')) {
 			return;
@@ -39,6 +44,79 @@
 			throw new \Exception('Phar wrapper is not registered. Please review your php.ini settings.');
 		}
 
+		if (!self::$polyfillsLoaded) {
+			self::$polyfillsLoaded = true;
+
+			if (
+				PHP_VERSION_ID < 80000
+				&& empty($GLOBALS'__composer_autoload_files''a4a119a56e50fbb293281d9a48007e0e')
+				&& !class_exists(\Symfony\Polyfill\Php80\Php80::class, false)
+			) {
+				$GLOBALS'__composer_autoload_files''a4a119a56e50fbb293281d9a48007e0e' = true;
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php80/Php80.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php80/bootstrap.php';
+			}
+
+			if (
+				empty($GLOBALS'__composer_autoload_files''0e6d7bf4a5811bfa5cf40c5ccd6fae6a')
+				&& !class_exists(\Symfony\Polyfill\Mbstring\Mbstring::class, false)
+			) {
+				$GLOBALS'__composer_autoload_files''0e6d7bf4a5811bfa5cf40c5ccd6fae6a' = true;
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-mbstring/Mbstring.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-mbstring/bootstrap.php';
+			}
+
+			if (
+				empty($GLOBALS'__composer_autoload_files''e69f7f6ee287b969198c3c9d6777bd38')
+				&& !class_exists(\Symfony\Polyfill\Intl\Normalizer\Normalizer::class, false)
+			) {
+				$GLOBALS'__composer_autoload_files''e69f7f6ee287b969198c3c9d6777bd38' = true;
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-intl-normalizer/Normalizer.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-intl-normalizer/bootstrap.php';
+			}
+
+			if (
+				PHP_VERSION_ID < 70300
+				&& empty($GLOBALS'__composer_autoload_files''0d59ee240a4cd96ddbb4ff164fccea4d')
+				&& !class_exists(\Symfony\Polyfill\Php73\Php73::class, false)
+			) {
+				$GLOBALS'__composer_autoload_files''0d59ee240a4cd96ddbb4ff164fccea4d' = true;
+				// already loaded by bootstrap inside the hrtime condition
+				// require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php73/Php73.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php73/bootstrap.php';
+			}
+
+			if (
+				PHP_VERSION_ID < 70400
+				&& empty($GLOBALS'__composer_autoload_files''b686b8e46447868025a15ce5d0cb2634')
+				&& !class_exists(\Symfony\Polyfill\Php74\Php74::class, false)
+			) {
+				$GLOBALS'__composer_autoload_files''b686b8e46447868025a15ce5d0cb2634' = true;
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php74/Php74.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php74/bootstrap.php';
+			}
+
+			if (
+				!extension_loaded('intl')
+				&& empty($GLOBALS'__composer_autoload_files''8825ede83f2f289127722d4e842cf7e8')
+				&& !class_exists(\Symfony\Polyfill\Intl\Grapheme\Grapheme::class, false)
+			) {
+				$GLOBALS'__composer_autoload_files''8825ede83f2f289127722d4e842cf7e8' = true;
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-intl-grapheme/Grapheme.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-intl-grapheme/bootstrap.php';
+			}
+
+			if (
+				PHP_VERSION_ID < 80100
+				&& empty ($GLOBALS'__composer_autoload_files''23c18046f52bef3eea034657bafda50f')
+				&& !class_exists(\Symfony\Polyfill\Php81\Php81::class, false)
+			) {
+				$GLOBALS'__composer_autoload_files''23c18046f52bef3eea034657bafda50f' = true;
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php81/Php81.php';
+				require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/symfony/polyfill-php81/bootstrap.php';
+			}
+		}
+
 		$filename = str_replace('\\', DIRECTORY_SEPARATOR, $class);
 		if (strpos($class, 'PHPStan\\BetterReflection\\') === 0) {
 			$filename = substr($filename, strlen('PHPStan\\BetterReflection\\'));

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar.asc Changed

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmVc2xYACgkQUcZzBf/C
-5cALsA//anH6sd4y34I63DpmUIAkwhOcJ/a3EJAeMZcPfuK+9GQSb5uvTwcCVdd3
-eoBar36Nw/H9I0I+Ksl2CaxUkWhb5LwK1AyBelzIqXA/LgsGyAV0uNYxVaYA72XD
-6qXz5K2imvUpcTHtb3YhwpALhdv0DPW41WaWbBmZsxYqQoLS1O8E/eA9ZRqwjO2M
-buSHEu626a8q55N0j4Gnogzokm8cdkls3uOXI/pid4VCc0nllrAwXDI6MvXW+NvI
-wuqluWNXZsWtkyQzJqVoVbGhgXV91vbFLkwdh1T+ONVvtn6Xt2dBOfa+VdHEhTyZ
-cafB11phVXUNyh/B476SjVdYrSdgYWeeJpUVgiHUfbKZT3XJdNRj1bi/lSk4Po9V
-BkdMdBf6O1ffCjERfndHYhPiKWv8AEu2t1/a6qXou4DHIdop6VkCNvq/pCzspydg
-AXq/2Wd/d2giQXAYEH7ZGESqOTNEPeFy9OEnpY1PCPcTQZEmLepO+UuXqb1B0DHT
-sphBYMmrDbzOrWYT+OegzDt/V9w/4+SR7YiEXvNDIfrUjRcx6YeTk/CgfbrC9YLo
-QgfB1h+23AseU1M/64De4LMJPHdWg1yDsG7fRJY5UaER1bUGfO12ODjqTICmFoUS
-LtV7L7wNXRce5eDecIjk9v9owaywY+zQcdIlGw8B6U4yaij2lHc=
-=BpNt
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmWw+a0ACgkQUcZzBf/C
+5cAToQ/8D3XHtsO5mN1k9HUQKwSQIhWnFVVleRidk9vFRSZhPJjV7HelLNZw5bnp
+ojHGINUlqFHuOxlGGbdYSAQAcix6Jb+CE0kCI5mI3+OBfL2NiF9LHTgG6mMPLsSx
+Lvk0Q4Wbl14Zc33252pEiWkRIUGQREM2nYmmYF35SJfhABZhF0wxWTQEBLSDKyn4
+qoeVC55RtafIUJ0x/auxvszp6Z6ca7Z1fmjFyIglhwHLt0iSv2nWcxQKNng/AqHr
+a80J7qrcI8L1H69ScargAvh1X/CNp3YCMfDHj15NVOO7tZO+aEFtQARpw8JW+CJx
+zEfw6+B0Dk5AMt2KPxDgVKXth+3rKRQ5nF0bo3cyEEikrfVMqhHWu6d0crpDtRfW
+hQ5k3bSVbk5aY805pzU3PbGMea0eWY35igiWa/Kyu33dPvXxI/zkRF2zkL76d7K5
+JzWidcs9enz7hTqFTG3bKODogtaIlvN/vjw4hNrojhfam941DT6cicepntq6o6fy
+H40f1xQ4W4no7dRs+2HDg63BeYyxKeoya+yCWQY0/q/xFdp5xNS6rMNE9XHXKIPY
+3rUw7lbQELr/b1/Ob3o8zhrbpu/BKjkxCrU5bNlUspvBk5c2MA+DmYtbhTZBkUa/
+j99L6ysyNAmoCyy1uRkUR86qsYA3NjpVJntgmSZmbf79vjKa45M=
+=9AJu
 -----END PGP SIGNATURE-----

roundcubemail-1.5.tar.gz/vendor/roundcube/rtf-html-php/CHANGELOG.md Changed

roundcubemail-1.5.tar.gz/vendor/roundcube/rtf-html-php/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/roundcube/rtf-html-php/src/Document.php Changed

@@ -4,16 +4,20 @@
 
 class Document
 {
+    /** @var ?string Current character in an RTF stream */
+    protected $char;
     /** @var string RTF string being parsed */
     protected $rtf;
     /** @var int Current position in RTF string */
     protected $pos;
     /** @var int Length of RTF string */
     protected $len;
-    /** @var Group Current RTF group */
+    /** @var ?Group Current RTF group */
     protected $group;
+    /** @var array */
+    protected $uc = ;
 
-    /** @var Group Root group */
+    /** @var ?Group Root group */
     public $root = null;
 
     /**
@@ -27,10 +31,10 @@
     }
 
     /**
-     * Get the next character from the RTF stream.
+     * Position on the next character from the RTF stream.
      * Parsing is aborted when reading beyond end of input string.
      *
-     * @return string
+     * @return void
      */
     protected function getChar()
     {
@@ -110,7 +114,7 @@
     {
         $group = new Group();
 
-        if ($this->group != null) {
+        if ($this->group) {
             // Make the new group a child of the current group
             $group->parent = $this->group;
 
@@ -170,7 +174,7 @@
             if ($parameter === null) {
                 $parameter = 0;
             }
-            $parameter = $parameter * 10 + $this->char;
+            $parameter = $parameter * 10 + (int) $this->char;
             $this->getChar();
         }
 
@@ -349,7 +353,7 @@
 
         // If there is no current group, then this is not a valid RTF file.
         // Throw an exception.
-        if ($this->group == null) {
+        if (!$this->group) {
             throw new \Exception("Parse error: RTF text outside of group.");
         }

roundcubemail-1.5.tar.gz/vendor/roundcube/rtf-html-php/src/Html/Font.php Changed

roundcubemail-1.5.tar.gz/vendor/roundcube/rtf-html-php/src/Html/HtmlFormatter.php Changed

@@ -6,10 +6,15 @@
 
 class HtmlFormatter
 {
-    protected $output = '';
     protected $encoding;
     protected $defaultFont;
     protected $fromhtml = false;
+    protected $openedTags = ;
+    protected $output = '';
+    protected $previousState;
+    protected $rtfEncoding;
+    protected $state;
+    protected $states = ;
 
     /**
      * Object constructor.
@@ -65,8 +70,8 @@
         $this->processGroup($document->root);
 
         // Instead of removing opened tags, we close them
-        $this->output .= $this->openedTags'span' ? '</span>' : '';
-        $this->output .= $this->openedTags'p' ? '</p>' : '';
+        $this->output .= $this->openedTags'span' ? '</span>' : ''; // @phpstan-ignore-line
+        $this->output .= $this->openedTags'p' ? '</p>' : ''; // @phpstan-ignore-line
 
         // Remove extra empty paragraph at the end
         // TODO: Find the real reason it's there and fix it
@@ -490,7 +495,7 @@
             return;
         }
 
-        if ($this->openedTags'p' === null) {
+        if (!isset($this->openedTags'p')) {
             // Create the first paragraph
             $this->openTag('p');
         }
@@ -499,9 +504,7 @@
         // 1st case: style change occured
         // 2nd case: there is no change in style but the already created 'span'
         // element is somehow closed (ex. because of an end of paragraph)
-        if (!$this->state->equals($this->previousState)
-            || ($this->state->equals($this->previousState) && !$this->openedTags'span')
-        ) {
+        if (!$this->state->equals($this->previousState) || empty($this->openedTags'span')) {
             // If applicable close previously opened 'span' tag
             $this->closeTag('span');
 
@@ -535,7 +538,7 @@
             return;
         }
 
-        if ($this->openedTags$tag) {
+        if (!empty($this->openedTags$tag)) {
             // Check for empty html elements
             if (substr($this->output, -strlen("<{$tag}>")) == "<{$tag}>") {
                 switch ($tag) {
@@ -649,6 +652,8 @@
         if (isset($map$charset)) {
             return $map$charset;
         }
+
+        return null;
     }
 
     /**
@@ -702,12 +707,14 @@
         if (isset($map$cpg)) {
             return $map$cpg;
         }
+
+        return null;
     }
 
     protected function ordUtf8($chr)
     {
         $ord0 = ord($chr);
-        if ($ord0 >= 0 && $ord0 <= 127) {
+        if ($ord0 <= 127) {
             return $ord0;
         }

roundcubemail-1.5.tar.gz/vendor/roundcube/rtf-html-php/src/Html/Image.php Changed

roundcubemail-1.5.tar.gz/vendor/roundcube/rtf-html-php/src/Html/State.php Changed

roundcubemail-1.5.tar.gz/vendor/sabre/dav/composer.json Changed

roundcubemail-1.5.tar.gz/vendor/sabre/dav/lib/DAV/Client.php Changed

@@ -174,27 +174,98 @@
     }
 
     /**
-     * Does a PROPFIND request.
+     * Does a PROPFIND request with filtered response returning only available properties.
      *
      * The list of requested properties must be specified as an array, in clark
      * notation.
      *
-     * The returned array will contain a list of filenames as keys, and
-     * properties as values.
+     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+     * made to the server to also return all child resources.
+     *
+     * For depth 0, just the array of properties for the resource is returned.
+     *
+     * For depth 1, the returned array will contain a list of resource names as keys,
+     * and an array of properties as values.
      *
-     * The properties array will contain the list of properties. Only properties
-     * that are actually returned from the server (without error) will be
+     * The array of properties will contain the properties as keys with their values as the value.
+     * Only properties that are actually returned from the server without error will be
      * returned, anything else is discarded.
      *
+     * @param 1|0 $depth
+     */
+    public function propFind($url, array $properties, $depth = 0): array
+    {
+        $result = $this->doPropFind($url, $properties, $depth);
+
+        // If depth was 0, we only return the top item
+        if (0 === $depth) {
+            reset($result);
+            $result = current($result);
+
+            return isset($result200) ? $result200 : ;
+        }
+
+        $newResult = ;
+        foreach ($result as $href => $statusList) {
+            $newResult$href = isset($statusList200) ? $statusList200 : ;
+        }
+
+        return $newResult;
+    }
+
+    /**
+     * Does a PROPFIND request with unfiltered response.
+     *
+     * The list of requested properties must be specified as an array, in clark
+     * notation.
+     *
      * Depth should be either 0 or 1. A depth of 1 will cause a request to be
      * made to the server to also return all child resources.
      *
-     * @param string $url
-     * @param int    $depth
+     * For depth 0, just the multi-level array of status and properties for the resource is returned.
      *
-     * @return array
+     * For depth 1, the returned array will contain a list of resources as keys and
+     * a multi-level array containing status and properties as value.
+     *
+     * The multi-level array of status and properties is formatted the same as what is
+     * documented for parseMultiStatus.
+     *
+     * All properties that are actually returned from the server are returned by this method.
+     *
+     * @param 1|0 $depth
+     */
+    public function propFindUnfiltered(string $url, array $properties, int $depth = 0): array
+    {
+        $result = $this->doPropFind($url, $properties, $depth);
+
+        // If depth was 0, we only return the top item
+        if (0 === $depth) {
+            reset($result);
+
+            return current($result);
+        } else {
+            return $result;
+        }
+    }
+
+    /**
+     * Does a PROPFIND request.
+     *
+     * The list of requested properties must be specified as an array, in clark
+     * notation.
+     *
+     * Depth should be either 0 or 1. A depth of 1 will cause a request to be
+     * made to the server to also return all child resources.
+     *
+     * The returned array will contain a list of resources as keys and
+     * a multi-level array containing status and properties as value.
+     *
+     * The multi-level array of status and properties is formatted the same as what is
+     * documented for parseMultiStatus.
+     *
+     * @param 1|0 $depth
      */
-    public function propFind($url, array $properties, $depth = 0)
+    private function doPropFind($url, array $properties, $depth = 0): array
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
         $dom->formatOutput = true;
@@ -232,22 +303,7 @@
             throw new HTTP\ClientHttpException($response);
         }
 
-        $result = $this->parseMultiStatus($response->getBodyAsString());
-
-        // If depth was 0, we only return the top item
-        if (0 === $depth) {
-            reset($result);
-            $result = current($result);
-
-            return isset($result200) ? $result200 : ;
-        }
-
-        $newResult = ;
-        foreach ($result as $href => $statusList) {
-            $newResult$href = isset($statusList200) ? $statusList200 : ;
-        }
-
-        return $newResult;
+        return $this->parseMultiStatus($response->getBodyAsString());
     }
 
     /**
@@ -385,7 +441,7 @@
     {
         return Uri\resolve(
             $this->baseUri,
-            $url
+            (string) $url
         );
     }

roundcubemail-1.5.tar.gz/vendor/sabre/dav/lib/DAV/Version.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/CHANGELOG.md Added

@@ -0,0 +1,5721 @@
+# Changelog
+The file documents changes to the PHP_CodeSniffer project.
+
+## Unreleased
+
+_Nothing yet._
+
+
+## 3.8.1 - 2024-01-11
+
+### Added
+- Documentation has been added for the following sniffs:
+    - Generic.CodeAnalysis.EmptyPHPStatement
+    - Generic.Formatting.SpaceBeforeCast
+    - Generic.PHP.Syntax
+    - Generic.WhiteSpace.LanguageConstructSpacing
+    - PSR12.Classes.ClosingBrace
+    - PSR12.Classes.OpeningBraceSpace
+    - PSR12.ControlStructures.BooleanOperatorPlacement
+    - PSR12.Files.OpenTag
+    - Thanks to Rodrigo Primo@rodrigoprimo and Denis Žoljom@dingo-d for the patches
+
+### Changed
+- GitHub releases will now always only contain unversioned release assets (PHARS + asc files) (same as it previously was in the squizlabs repo). See #205 for context.
+    - Thanks to Shivam Mathur@shivammathur for opening a discussion about this
+- Various housekeeping, includes improvements to the tests and documentation
+    - Thanks to Dan Wallis@fredden, Lucas Hoffmann@lucc, Rodrigo Primo@rodrigoprimo and Juliette Reinders Folmer@jrfnl for their contributions
+
+### Fixed
+- Fixed bug #124 : Report Full : avoid unnecessarily wrapping lines when `-s` is used
+    - Thanks to Brad Jorsch@anomiex for the patch
+- Fixed bug #124 : Report Full : fix incorrect bolding of pipes when `-s` is used and messages wraps
+    - Thanks to Brad Jorsch@anomiex for the patch
+- Fixed bug #150 : Squiz.WhiteSpace.KeywordSpacing : prevent a PHP notice when run during live coding
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #154 : Report Full : delimiter line calculation could go wonky on wide screens when a report contains multi-line messages
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #178 : Squiz.Commenting.VariableComment : docblocks were incorrectly being flagged as missing when a property declaration used PHP native union/intersection type declarations
+    - Thanks to Ferdinand Kuhl@fcool for the patch
+- Fixed bug #211 : Squiz.Commenting.VariableComment : docblocks were incorrectly being flagged as missing when a property declaration used PHP 8.2+ stand-alone `true`/`false`/`null` type declarations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #211 : Squiz.Commenting.VariableComment : docblocks were incorrectly being flagged as missing when a property declaration used PHP native `parent`, `self` or a namespace relative class name type declaration
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #226 : Generic.CodeAnalysis.ForLoopShouldBeWhileLoop : prevent a potential PHP 8.3 deprecation notice during live coding
+    - Thanks to Rodrigo Primo@rodrigoprimo for the patch
+
+#124: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/124
+#150: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/150
+#154: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/154
+#178: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/178
+#205: https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/205
+#211: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/211
+#226: https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/226
+
+
+## 3.8.0 - 2023-12-08
+
+Squizlabs/PHP_CodeSniffer(https://github.com/squizlabs/PHP_CodeSniffer) is dead. Long live PHPCSStandards/PHP_CodeSniffer(https://github.com/PHPCSStandards/PHP_CodeSniffer)!
+
+### Breaking Changes
+- The `squizlabs/PHP_CodeSniffer` repository has been abandoned. The `PHPCSStandards/PHP_CodeSniffer` repository will serve as the continuation of the project. For more information about this change, please read the announcement(https://github.com/squizlabs/PHP_CodeSniffer/issues/3932).
+    - Installation of PHP_CodeSniffer via PEAR is no longer supported.
+        - Users will need to switch to another installation method.
+        - Note: this does not affect the PEAR sniffs.
+    - For Composer users, nothing changes.
+        - **_In contrast to earlier information, the `squizlabs/php_codesniffer` package now points to the new repository and everything will continue to work as before._**
+    - PHIVE users may need to clear the PHIVE URL cache.
+        - PHIVE users who don't use the package alias, but refer to the package URL, will need to update the URL from `https://squizlabs.github.io/PHP_CodeSniffer/phars/` to `https://phars.phpcodesniffer.com/phars/`.
+    - Users who download the PHAR files using curl or wget, will need to update the download URL from `https://squizlabs.github.io/PHP_CodeSniffer/phpcs|phpcbf.phar` or `https://github.com/squizlabs/PHP_CodeSnifffer/releases/latest/download/phpcs|phpcbf.phar` to `https://phars.phpcodesniffer.com/phpcs|phpcbf.phar`.
+    - For users who install PHP_CodeSniffer via the setup-php(https://github.com/shivammathur/setup-php/) action runner for GitHub Actions, nothing changes.
+    - Users using a git clone will need to update the clone address from `git@github.com:squizlabs/PHP_CodeSniffer.git` to `git@github.com:PHPCSStandards/PHP_CodeSniffer.git`.
+        - Contributors will need to fork the new repo and add both the new fork as well as the new repo as remotes to their local git copy of PHP_CodeSniffer.
+        - Users who have (valid) open issues or pull requests in the `squizlabs/PHP_CodeSniffer` repository are invited to resubmit these to the `PHPCSStandards/PHP_CodeSniffer` repository.
+
+### Added
+- Runtime support for PHP 8.3. All known PHP 8.3 deprecation notices have been fixed
+    - Syntax support for new PHP 8.3 features will follow in a future release
+    - If you find any PHP 8.3 deprecation notices which were missed, please report them
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patches
+- Added support for PHP 8.2 readonly classes to File::getClassProperties() through a new is_readonly array index in the return value
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for PHP 8.2 readonly classes to a number of sniffs
+    - Generic.CodeAnalysis.UnnecessaryFinalModifier
+    - PEAR.Commenting.ClassComment
+    - PEAR.Commenting.FileComment
+    - PSR1.Files.SideEffects
+    - PSR2.Classes.ClassDeclaration
+    - PSR12.Files.FileHeader
+    - Squiz.Classes.ClassDeclaration
+    - Squiz.Classes.LowercaseClassKeywords
+    - Squiz.Commenting.ClassComment
+    - Squiz.Commenting.DocCommentAlignment
+    - Squiz.Commenting.FileComment
+    - Squiz.Commenting.InlineComment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for PHP 8.2 `true` as a stand-alone type declaration
+    - The `File::getMethodProperties()`, `File::getMethodParameters()` and `File::getMemberProperties()` methods now all support the `true` type
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for PHP 8.2 `true` as a stand-alone type to a number of sniffs
+    - Generic.PHP.LowerCaseType
+    - PSr12.Functions.NullableTypeDeclaration
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added a Performance report to allow for finding "slow" sniffs
+    - To run this report, run PHPCS with --report=Performance.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.RequireStrictTypes : new warning for when there is a declare statement, but the strict_types directive is set to 0
+    - The warning can be turned off by excluding the `Generic.PHP.RequireStrictTypes.Disabled` error code
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.FunctionComment : new `ParamNameUnexpectedAmpersandPrefix` error for parameters annotated as passed by reference while the parameter is not passed by reference
+    - Thanks to Dan Wallis@fredden for the patch
+- Documentation has been added for the following sniffs:
+    - PSR2.Files.ClosingTag
+    - PSR2.Methods.FunctionCallSignature
+    - PSR2.Methods.FunctionClosingBrace
+    - Thanks to Atsushi Okui@blue32a for the patch
+- Support for PHPUnit 8 and 9 to the test suite
+    - Test suites for external standards which run via the PHPCS native test suite can now run on PHPUnit 4-9 (was 4-7)
+    - If any of these tests use the PHPUnit `setUp()`/`tearDown()` methods or overload the `setUp()` in the `AbstractSniffUnitTest` test case, they will need to be adjusted. See the PR details for further information(https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/59/commits/26384ebfcc0b1c1651b0e1e40c9b6c8c22881832)
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Changed
+- Changes have been made to the way PHPCS handles invalid sniff properties being set in a custom ruleset
+    - Fixes PHP 8.2 deprecation notices for properties set in a (custom) ruleset for complete standards/complete sniff categories
+    - Invalid sniff properties set for individual sniffs will now result in an error and halt the execution of PHPCS
+        - A descriptive error message is provided to allow users to fix their ruleset
+    - Sniff properties set for complete standards/complete sniff categories will now only be set on sniffs which explicitly support the property
+        - The property will be silently ignored for those sniffs which do not support the property
+    - Invalid sniff properties set for sniffs via inline annotations will result in an informative `Internal.PropertyDoesNotExist` errror on line 1 of the scanned file, but will not halt the execution of PHPCS
+    - For sniff developers, it is strongly recommended for sniffs to explicitly declare any user-adjustable public properties
+        - If dynamic properties need to be supported for a sniff, either declare the magic __set()/__get()/__isset()/__unset() methods on the sniff or let the sniff extend stdClass
+        - Note: The #\AllowDynamicProperties attribute will have no effect for properties which are being set in rulesets
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The third parameter for the Ruleset::setSniffProperty() method has been changed to expect an array
+    - Sniff developers/integrators of PHPCS may need to make some small adjustments to allow for this change
+    - Existing code will continue to work but will throw a deprecation error
+    - The backwards compatiblity layer will be removed in PHPCS 4.0
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- When using `auto` report width (the default) a value of 80 columns will be used if the width cannot be determined
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Sniff error messages are now more informative to help bugs get reported to the correct project
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.CodeAnalysis.UnusedFunctionParameter will now ignore magic methods for which the signature is defined by PHP
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Functions.OpeningFunctionBraceBsdAllman will now check the brace indent before the opening brace for empty functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Functions.OpeningFunctionBraceKernighanRitchie will now check the spacing before the opening brace for empty functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.WhiteSpace.IncrementDecrementSpacing now detects more spacing issues
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PSR2.Classes.PropertyDeclaration now enforces that the readonly modifier comes after the visibility modifier
+    - PSR2 and PSR12 do not have documented rules for this as they pre-date the readonly modifier
+    - PSR-PER has been used to confirm the order of this keyword so it can be applied to PSR2 and PSR12 correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PEAR.Commenting.FunctionComment + Squiz.Commenting.FunctionComment: the SpacingAfter error can now be auto-fixed
+    - Thanks to Dan Wallis@fredden for the patch
+- Squiz.PHP.InnerFunctions sniff no longer reports on OO methods for OO structures declared within a function or closure
+    - Thanks to @Daimona for the patch
+- Squiz.PHP.NonExecutableCode will now also flag redundant return statements just before a closure close brace
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Runtime performance improvement for PHPCS CLI users. The improvement should be most noticeable for users on Windows.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The following sniffs have received performance related improvements:
+    - Generic.PHP.LowerCaseConstant
+    - Generic.PHP.LowerCaseType
+    - PSR12.Files.OpenTag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patches
+- The -e (explain) command will now list sniffs in natural order
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Tests using the PHPCS native test framework with multiple test case files will now run the test case files in numeric order.
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The following sniffs have received minor message readability improvements:
+    - Generic.Arrays.ArrayIndent
+    - Generic.Formatting.SpaceAfterCast
+    - Generic.Formatting.SpaceAfterNot
+    - Generic.WhiteSpace.SpreadOperatorSpacingAfter
+    - Squiz.Arrays.ArrayDeclaration
+    - Squiz.Commenting.DocCommentAlignment
+    - Squiz.ControlStructures.ControlSignature
+    - Thanks to Danny van der Sluijs@DannyvdSluijs and Juliette Reinders Folmer@jrfnl for the patches
+- Improved README syntax highlighting
+    - Thanks to Benjamin Loison@Benjamin-Loison for the patch
+- Various documentation improvements
+    - Thanks to Andrew Dawes@AndrewDawes, Danny van der Sluijs@DannyvdSluijs and Juliette Reinders Folmer@jrfnl for the patches
+
+### Removed
+- Removed support for installation via PEAR
+    - Use composer or the PHAR files instead
+
+### Fixed
+- Fixed bug #2857 : Squiz/NonExecutableCode: prevent false positives when exit is used in a ternary expression or as default with null coalesce
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3386 : PSR1/SideEffects : improved recognition of disable/enable annotations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3557 : Squiz.Arrays.ArrayDeclaration will now ignore PHP 7.4 array unpacking when determining whether an array is associative
+    - Thanks to Volker Dusch@edorian for the patch
+- Fixed bug #3592 : Squiz/NonExecutableCode: prevent false positives when a PHP 8.0+ inline throw expression is encountered
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3715 : Generic/UnusedFunctionParameter: fixed incorrect errorcode for closures/arrow functions nested within extended classes/classes which implement
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3717 : Squiz.Commenting.FunctionComment: fixed false positive for `InvalidNoReturn` when type is never
+    - Thanks to Choraimy Kroonstuiver@axlon for the patch
+- Fixed bug #3720 : Generic/RequireStrictTypes : will now bow out silently in case of parse errors/live coding instead of throwing false positives/false negatives
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3720 : Generic/RequireStrictTypes : did not handle multi-directive declare statements
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3722 : Potential "Uninitialized string offset 1" in octal notation backfill
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3736 : PEAR/FunctionDeclaration: prevent fixer removing the close brace (and creating a parse error) when there is no space between the open brace and close brace of a function
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3739 : PEAR/FunctionDeclaration: prevent fixer conflict, and potentially creating a parse error, for unconventionally formatted return types
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3770 : Squiz/NonExecutableCode: prevent false positives for switching between PHP and HTML
+    - Thanks to Dan Wallis@fredden for the patch
+- Fixed bug #3773 : Tokenizer/PHP: tokenization of the readonly keyword when used in combination with PHP 8.2 disjunctive normal types
+    - Thanks to Dan Wallis@fredden and Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3776 : Generic/JSHint: error when JSHint is not available
+    - Thanks to Dan Wallis@fredden for the patch
+- Fixed bug #3777 : Squiz/NonExecutableCode: slew of bug fixes, mostly related to modern PHP
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3778 : Squiz/LowercasePHPFunctions: bug fix for class names in attributes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3779 : Generic/ForbiddenFunctions: bug fix for class names in attributes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3785 : Squiz.Commenting.FunctionComment: potential "Uninitialized string offset 0" when a type contains a duplicate pipe symbol
+    - Thanks to Dan Wallis@fredden for the patch
+- Fixed bug #3787 : PEAR/Squiz/MultiLineFunctionDeclaration: allow for PHP 8.1 new in initializers
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3789 : Incorrect tokenization for ternary operator with `match` inside of it
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3790 : PSR12/AnonClassDeclaration: prevent fixer creating parse error when there was no space before the open brace
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3797 : Tokenizer/PHP: more context sensitive keyword fixes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3801 : File::getMethodParameters(): allow for readonly promoted properties without visibility
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3805 : Generic/FunctionCallArgumentSpacing: prevent fixer conflict over PHP 7.3+ trailing comma's in function calls
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3806 : Squiz.PHP.InnerFunctions sniff now correctly reports inner functions declared within a closure
+    - Thanks to @Daimona for the patch
+- Fixed bug #3809 : GitBlame report was broken when passing a basepath
+    - Thanks to Chris@datengraben for the patch
+- Fixed bug #3813 : Squiz.Commenting.FunctionComment: false positive for parameter name mismatch on parameters annotated as passed by reference
+    - Thanks to Dan Wallis@fredden for the patch
+- Fixed bug #3833 : Generic.PHP.LowerCaseType: fixed potential undefined array index notice
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3846 : PSR2.Classes.ClassDeclaration.CloseBraceAfterBody : fixer will no longer remove indentation on the close brace line
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3854 : Fatal error when using Gitblame report in combination with `--basepath` and running from project subdirectory
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3856 : PSR12.Traits.UseDeclaration was using the wrong error code - SpacingAfterAs - for spacing issues after the `use` keyword
+    - These will now be reported using the SpacingAfterUse error code
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3856 : PSR12.Traits.UseDeclaration did not check spacing after `use` keyword for multi-line trait use statements
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3867 : Tokenizer/PHP: union type and intersection type operators were not correctly tokenized for static properties without explicit visibility
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3877 : Filter names can be case-sensitive. The -h help text will now display the correct case for the available filters
+    - Thanks to @simonsan for the patch
+- Fixed bug #3893 : Generic/DocComment : the SpacingAfterTagGroup fixer could accidentally remove ignore annotations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3898 : Squiz/NonExecutableCode : the sniff could get confused over comments in unexpected places
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3904 : Squiz/FunctionSpacing : prevent potential fixer conflict
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3906 : Tokenizer/CSS: bug fix related to the unsupported slash comment syntax
+    - Thanks to Dan Wallis@fredden for the patch
+- Fixed bug #3913 : Config did not always correctly store unknown "long" arguments in the `$unknown` property
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+Thanks go to Dan Wallis@fredden and Danny van der Sluijs@DannyvdSluijs for reviewing quite a few of the PRs for this release.
+Additionally, thanks to Alexander Turek@derrabus for consulting on the repo change over.
+
+#2857: https://github.com/squizlabs/PHP_CodeSniffer/issues/2857
+#3386: https://github.com/squizlabs/PHP_CodeSniffer/issues/3386
+#3557: https://github.com/squizlabs/PHP_CodeSniffer/issues/3557
+#3592: https://github.com/squizlabs/PHP_CodeSniffer/issues/3592
+#3715: https://github.com/squizlabs/PHP_CodeSniffer/pull/3715
+#3717: https://github.com/squizlabs/PHP_CodeSniffer/pull/3717
+#3720: https://github.com/squizlabs/PHP_CodeSniffer/pull/3720
+#3722: https://github.com/squizlabs/PHP_CodeSniffer/pull/3722
+#3736: https://github.com/squizlabs/PHP_CodeSniffer/issues/3736
+#3739: https://github.com/squizlabs/PHP_CodeSniffer/pull/3739
+#3770: https://github.com/squizlabs/PHP_CodeSniffer/pull/3770
+#3773: https://github.com/squizlabs/PHP_CodeSniffer/pull/3773
+#3776: https://github.com/squizlabs/PHP_CodeSniffer/pull/3776
+#3777: https://github.com/squizlabs/PHP_CodeSniffer/pull/3777
+#3778: https://github.com/squizlabs/PHP_CodeSniffer/issues/3778
+#3779: https://github.com/squizlabs/PHP_CodeSniffer/pull/3779
+#3785: https://github.com/squizlabs/PHP_CodeSniffer/pull/3785
+#3787: https://github.com/squizlabs/PHP_CodeSniffer/pull/3787
+#3789: https://github.com/squizlabs/PHP_CodeSniffer/issues/3789
+#3790: https://github.com/squizlabs/PHP_CodeSniffer/issues/3790
+#3797: https://github.com/squizlabs/PHP_CodeSniffer/pull/3797
+#3801: https://github.com/squizlabs/PHP_CodeSniffer/pull/3801
+#3805: https://github.com/squizlabs/PHP_CodeSniffer/pull/3805
+#3806: https://github.com/squizlabs/PHP_CodeSniffer/issues/3806
+#3809: https://github.com/squizlabs/PHP_CodeSniffer/pull/3809
+#3813: https://github.com/squizlabs/PHP_CodeSniffer/pull/3813
+#3833: https://github.com/squizlabs/PHP_CodeSniffer/pull/3833
+#3846: https://github.com/squizlabs/PHP_CodeSniffer/pull/3846
+#3854: https://github.com/squizlabs/PHP_CodeSniffer/issues/3854
+#3856: https://github.com/squizlabs/PHP_CodeSniffer/pull/3856
+#3867: https://github.com/squizlabs/PHP_CodeSniffer/pull/3867
+#3877: https://github.com/squizlabs/PHP_CodeSniffer/issues/3877
+#3893: https://github.com/squizlabs/PHP_CodeSniffer/pull/3893
+#3898: https://github.com/squizlabs/PHP_CodeSniffer/pull/3898
+#3904: https://github.com/squizlabs/PHP_CodeSniffer/issues/3904
+#3906: https://github.com/squizlabs/PHP_CodeSniffer/pull/3906
+#3913: https://github.com/squizlabs/PHP_CodeSniffer/pull/3913
+
+## 3.7.2 - 2023-02-23
+### Changed
+- Newer versions of Composer will now suggest installing PHPCS using require-dev instead of require
+    - Thanks to Gary Jones@GaryJones for the patch
+- A custom Out Of Memory error will now be shown if PHPCS or PHPCBF run out of memory during a run
+    - Error message provides actionable information about how to fix the problem and ensures the error is not silent
+    - Thanks to Juliette Reinders Folmer@jrfnl and Alain Schlesser@schlessera for the patch
+- Generic.PHP.LowerCaseType sniff now correctly examines types inside arrow functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Formatting.OperatorBracket no longer reports false positives in match() structures
+
+### Fixed
+- Fixed bug #3616 : Squiz.PHP.DisallowComparisonAssignment false positive for PHP 8 match expression
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3618 : Generic.WhiteSpace.ArbitraryParenthesesSpacing false positive for return new parent()
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3632 : Short list not tokenized correctly in control structures without braces
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3639 : Tokenizer not applying tab replacement to heredoc/nowdoc closers
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3640 : Generic.WhiteSpace.DisallowTabIndent not reporting errors for PHP 7.3 flexible heredoc/nowdoc syntax
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3645 : PHPCS can show 0 exit code when running in parallel even if child process has fatal error
+    - Thanks to Alex Panshin@enl for the patch
+- Fixed bug #3653 : False positives for match() in OperatorSpacingSniff
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #3666 : PEAR.Functions.FunctionCallSignature incorrect indent fix when checking mixed HTML/PHP files
+- Fixed bug #3668 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive when instantiating parent classes
+    - Similar issues also fixed in Generic.Functions.FunctionCallArgumentSpacing and Squiz.Formatting.OperatorBracket
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3672 : Incorrect ScopeIndent.IncorrectExact report for match inside array literal
+- Fixed bug #3694 : Generic.WhiteSpace.SpreadOperatorSpacingAfter does not ignore spread operator in PHP 8.1 first class   callables
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.7.1 - 2022-06-18
+### Fixed
+- Fixed bug #3609 : Methods/constants with name empty/isset/unset are always reported as error
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.7.0 - 2022-06-13
+### Added
+- Added support for PHP 8.1 explicit octal notation
+    - This new syntax has been backfilled for PHP versions less than 8.1
+    - Thanks to Mark Baker@MarkBaker for the patch
+    - Thanks to Juliette Reinders Folmer@jrfnl for additional fixes
+- Added support for PHP 8.1 enums
+    - This new syntax has been backfilled for PHP versions less than 8.1
+    - Includes a new T_ENUM_CASE token to represent the case statements inside an enum
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+    - Thanks to Juliette Reinders Folmer@jrfnl for additional core and sniff support
+- Added support for the PHP 8.1 readonly token
+    - Tokenzing of the readonly keyword has been backfilled for PHP versions less than 8.1
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Added support for PHP 8.1 intersection types
+    - Includes a new T_TYPE_INTERSECTION token to represent the ampersand character inside intersection types
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+
+### Changed
+- File::getMethodParameters now supports the new PHP 8.1 readonly token
+    - When constructor property promotion is used, a new property_readonly array index is included in the return value
+        - This is a boolean value indicating if the property is readonly
+    - If the readonly token is detected, a new readonly_token array index is included in the return value
+        - This contains the token index of the readonly keyword
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Support for new PHP 8.1 readonly keyword has been added to the following sniffs:
+    - Generic.PHP.LowerCaseKeyword
+    - PSR2.Classes.PropertyDeclaration
+    - Squiz.Commenting.BlockComment
+    - Squiz.Commenting.DocCommentAlignment
+    - Squiz.Commenting.VariableComment
+    - Squiz.WhiteSpace.ScopeKeywordSpacing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patches
+- The parallel feature is now more efficient and runs faster in some situations due to improved process management
+    - Thanks to Sergei Morozov@morozov for the patch
+- The list of installed coding standards now has consistent ordering across all platforms
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.UpperCaseConstant and Generic.PHP.LowerCaseConstant now ignore type declarations
+    - These sniffs now only report errors for true/false/null when used as values
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.LowerCaseType now supports the PHP 8.1 never type
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+
+### Fixed
+- Fixed bug #3502 : A match statement within an array produces Squiz.Arrays.ArrayDeclaration.NoKeySpecified
+- Fixed bug #3503 : Squiz.Commenting.FunctionComment.ThrowsNoFullStop false positive when one line @throw
+- Fixed bug #3505 : The nullsafe operator is not counted in Generic.Metrics.CyclomaticComplexity
+    - Thanks to Mark Baker@MarkBaker for the patch
+- Fixed bug #3526 : PSR12.Properties.ConstantVisibility false positive when using public final const syntax
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3530 : Line indented incorrectly false positive when using match-expression inside switch case
+- Fixed bug #3534 : Name of typed enum tokenized as T_GOTO_LABEL
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3546 : Tokenizer/PHP: bug fix - parent/static keywords in class instantiations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3550 : False positive from PSR2.ControlStructures.SwitchDeclaration.TerminatingComment when using trailing   comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3575: Squiz.Scope.MethodScope misses visibility keyword on previous line
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3604: Tokenizer/PHP: bug fix for double quoted strings using ${
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.6.2 - 2021-12-13
+### Changed
+- Processing large code bases that use tab indenting inside comments and strings will now be faster
+    - Thanks to Thiemo Kreuz@thiemowmde for the patch
+
+### Fixed
+- Fixed bug #3388 : phpcs does not work when run from WSL drives
+    - Thanks to Juliette Reinders Folmer@jrfnl and Graham Wharton@gwharton for the patch
+- Fixed bug #3422 : Squiz.WhiteSpace.ScopeClosingBrace fixer removes HTML content when fixing closing brace alignment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3437 : PSR12 does not forbid blank lines at the start of the class body
+    - Added new PSR12.Classes.OpeningBraceSpace sniff to enforce this
+- Fixed bug #3440 : Squiz.WhiteSpace.MemberVarSpacing false positives when attributes used without docblock
+    - Thanks to Vadim Borodavko@javer for the patch
+- Fixed bug #3448 : PHP 8.1 deprecation notice while generating running time value
+    - Thanks to Juliette Reinders Folmer@jrfnl and Andy Postnikov for the patch
+- Fixed bug #3456 : PSR12.Classes.ClassInstantiation.MissingParentheses false positive using attributes on anonymous class
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3460 : Generic.Formatting.MultipleStatementAlignment false positive on closure with parameters
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3468 : do/while loops are double-counted in Generic.Metrics.CyclomaticComplexity
+    - Thanks to Mark Baker@MarkBaker for the patch
+- Fixed bug #3469 : Ternary Operator and Null Coalescing Operator are not counted in Generic.Metrics.CyclomaticComplexity
+    - Thanks to Mark Baker@MarkBaker for the patch
+- Fixed bug #3472 : PHP 8 match() expression is not counted in Generic.Metrics.CyclomaticComplexity
+    - Thanks to Mark Baker@MarkBaker for the patch
+
+## 3.6.1 - 2021-10-11
+### Changed
+- PHPCS annotations can now be specified using hash-style comments
+    - Previously, only slash-style and block-style comments could be used to do things like disable errors
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The new PHP 8.1 tokenisation for ampersands has been reverted to use the existing PHP_CodeSniffer method
+    - The PHP 8.1 tokens T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG and T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG are unsued
+    - Ampersands continue to be tokenized as T_BITWISE_AND for all PHP versions
+    - Thanks to Juliette Reinders Folmer@jrfnl and Anna Filina@afilina for the patch
+- File::getMethodParameters() no longer incorrectly returns argument attributes in the type hint array index
+    - A new has_attributes array index is available and set to TRUE if the argument has attributes defined
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed an issue where some sniffs would not run on PHP files that only used the short echo tag
+    - The following sniffs were affected:
+        - Generic.Files.ExecutableFile
+        - Generic.Files.LowercasedFilename
+        - Generic.Files.LineEndings
+        - Generic.Files.EndFileNewline
+        - Generic.Files.EndFileNoNewline
+        - Generic.PHP.ClosingPHPTag
+        - Generic.PHP.Syntax
+        - Generic.VersionControl.GitMergeConflict
+        - Generic.WhiteSpace.DisallowSpaceIndent
+        - Generic.WhiteSpace.DisallowTabIndent
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.BlockComment now correctly applies rules for block comments after a short echo tag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Generic.NamingConventions.ConstructorName no longer throws deprecation notices on PHP 8.1
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed false positives when using attributes in the following sniffs:
+    - PEAR.Commenting.FunctionComment
+    - Squiz.Commenting.InlineComment
+    - Squiz.Commenting.BlockComment
+    - Squiz.Commenting.VariableComment
+    - Squiz.WhiteSpace.MemberVarSpacing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3294 : Bug in attribute tokenization when content contains PHP end token or attribute closer on new line
+    - Thanks to Alessandro Chitolina@alekitto for the patch
+    - Thanks to Juliette Reinders Folmer@jrfnl for the tests
+- Fixed bug #3296 : PSR2.ControlStructures.SwitchDeclaration takes phpcs:ignore as content of case body
+- Fixed bug #3297 : PSR2.ControlStructures.SwitchDeclaration.TerminatingComment does not handle try/finally blocks
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3302 : PHP 8.0 | Tokenizer/PHP: bugfix for union types using namespace operator
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3303 : findStartOfStatement() doesn't work with T_OPEN_TAG_WITH_ECHO
+- Fixed bug #3316 : Arrow function not tokenized correctly when using null in union type
+- Fixed bug #3317 : Problem with how phpcs handles ignored files when running in parallel
+    - Thanks to Emil Andersson@emil-nasso for the patch
+- Fixed bug #3324 : PHPCS hangs processing some nested arrow functions inside a function call
+- Fixed bug #3326 : Generic.Formatting.MultipleStatementAlignment error with const DEFAULT
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3333 : Squiz.Objects.ObjectInstantiation: null coalesce operators are not recognized as assignment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3340 : Ensure interface and trait names are always tokenized as T_STRING
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3342 : PSR12/Squiz/PEAR standards all error on promoted properties with docblocks
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3345 : IF statement with no braces and double catch turned into syntax error by auto-fixer
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3352 : PSR2.ControlStructures.SwitchDeclaration can remove comments on the same line as the case statement while   fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3357 : Generic.Functions.OpeningFunctionBraceBsdAllman removes return type when additional lines are present
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3362 : Generic.WhiteSpace.ScopeIndent false positive for arrow functions inside arrays
+- Fixed bug #3384 : Squiz.Commenting.FileComment.SpacingAfterComment false positive on empty file
+- Fixed bug #3394 : Fix PHP 8.1 auto_detect_line_endings deprecation notice
+- Fixed bug #3400 : PHP 8.1: prevent deprecation notices about missing return types
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3424 : PHPCS fails when using PHP 8 Constructor property promotion with attributes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3425 : PHP 8.1 | Runner::processChildProcs(): fix passing null to non-nullable bug
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3445 : Nullable parameter after attribute incorrectly tokenized as ternary operator
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.6.0 - 2021-04-09
+### Added
+- Added support for PHP 8.0 union types
+    - A new T_TYPE_UNION token is available to represent the pipe character
+    - File::getMethodParameters(), getMethodProperties(), and getMemberProperties() will now return union types
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for PHP 8.0 named function call arguments
+    - A new T_PARAM_NAME token is available to represent the label with the name of the function argument in it
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for PHP 8.0 attributes
+    - The PHP-supplied T_ATTRIBUTE token marks the start of an attribute
+    - A new T_ATTRIBUTE_END token is available to mark the end of an attribute
+    - New attribute_owner and attribute_closer indexes are available in the tokens array for all tokens inside an attribute
+    - Tokenizing of attributes has been backfilled for older PHP versions
+    - The following sniffs have been updated to support attributes:
+        - PEAR.Commenting.ClassComment
+        - PEAR.Commenting.FileComment
+        - PSR1.Files.SideEffects
+        - PSR12.Files.FileHeader
+        - Squiz.Commenting.ClassComment
+        - Squiz.Commenting.FileComment
+        - Squiz.WhiteSpace.FunctionSpacing
+            - Thanks to Vadim Borodavko@javer for the patch
+    - Thanks to Alessandro Chitolina@alekitto for the patch
+- Added support for PHP 8.0 dereferencing of text strings with interpolated variables
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for PHP 8.0 match expressions
+    - Match expressions are now tokenised with parenthesis and scope openers and closers
+        - Sniffs can listen for the T_MATCH token to process match expressions
+        - Note that the case and default statements inside match expressions do not have scopes set
+    - A new T_MATCH_ARROW token is available to represent the arrows in match expressions
+    - A new T_MATCH_DEFAULT token is available to represent the default keyword in match expressions
+    - All tokenizing of match expressions has been backfilled for older PHP versions
+    - The following sniffs have been updated to support match expressions:
+        - Generic.CodeAnalysis.AssignmentInCondition
+        - Generic.CodeAnalysis.EmptyPHPStatement
+            - Thanks to Vadim Borodavko@javer for the patch
+        - Generic.CodeAnalysis.EmptyStatement
+        - Generic.PHP.LowerCaseKeyword
+        - PEAR.ControlStructures.ControlSignature
+        - PSR12.ControlStructures.BooleanOperatorPlacement
+        - Squiz.Commenting.LongConditionClosingComment
+        - Squiz.Commenting.PostStatementComment
+        - Squiz.ControlStructures.LowercaseDeclaration
+        - Squiz.ControlStructures.ControlSignature
+        - Squiz.Formatting.OperatorBracket
+        - Squiz.PHP.DisallowMultipleAssignments
+        - Squiz.Objects.ObjectInstantiation
+        - Squiz.WhiteSpace.ControlStructureSpacing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added Generic.NamingConventions.AbstractClassNamePrefix to enforce that class names are prefixed with "Abstract"
+    - Thanks to Anna Borzenko@annechko for the contribution
+- Added Generic.NamingConventions.InterfaceNameSuffix to enforce that interface names are suffixed with "Interface"
+    - Thanks to Anna Borzenko@annechko for the contribution
+- Added Generic.NamingConventions.TraitNameSuffix to enforce that trait names are suffixed with "Trait"
+    - Thanks to Anna Borzenko@annechko for the contribution
+
+### Changed
+- The value of the T_FN_ARROW token has changed from "T_FN_ARROW" to "PHPCS_T_FN_ARROW" to avoid package conflicts
+    - This will have no impact on custom sniffs unless they are specifically looking at the value of the T_FN_ARROW constant
+    - If sniffs are just using constant to find arrow functions, they will continue to work without modification
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- File::findStartOfStatement() now works correctly when passed the last token in a statement
+- File::getMethodParameters() now supports PHP 8.0 constructor property promotion
+    - Returned method params now include a "property_visibility" and "visibility_token" index if property promotion is detected
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- File::getMethodProperties() now includes a "return_type_end_token" index in the return value
+    - This indicates the last token in the return type, which is helpful when checking union types
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Include patterns are now ignored when processing STDIN
+    - Previously, checks using include patterns were excluded when processing STDIN when no file path was provided via --stdin-path
+    - Now, all include and exclude rules are ignored when no file path is provided, allowing all checks to run
+    - If you want include and exclude rules enforced when checking STDIN, use --stdin-path to set the file path
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Spaces are now correctly escaped in the paths to external on Windows
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.CodeAnalysis.UnusedFunctionParameter can now be configured to ignore variable usage for specific type hints
+    -- This allows you to suppress warnings for some variables that are not required, but leave warnings for others
+    -- Set the ignoreTypeHints array property to a list of type hints to ignore
+    -- Thanks to Petr Bugyík@o5 for the patch
+- Generic.Formatting.MultipleStatementAlignment can now align statements at the start of the assignment token
+    - Previously, the sniff enforced that the values were aligned, even if this meant the assignment tokens were not
+    - Now, the sniff can enforce that the assignment tokens are aligned, even if this means the values are not
+    - Set the "alignAtEnd" sniff property to "false" to align the assignment tokens
+    - The default remains at "true", so the assigned values are aligned
+    - Thanks to John P. Bloch@johnpbloch for the patch
+- Generic.PHP.LowerCaseType now supports checking of typed properties
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.LowerCaseType now supports checking of union types
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PEAR.Commenting.FunctionComment and Squiz.Commenting.FunctionComment sniffs can now ignore private and protected methods
+    - Set the "minimumVisibility" sniff property to "protected" to ignore private methods
+    - Set the "minimumVisibility" sniff property to "public" to ignore both private and protected methods
+    - The default remains at "private", so all methods are checked
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- PEAR.Commenting.FunctionComment and Squiz.Commenting.FunctionComment sniffs can now ignore return tags in any method
+    - Previously, only __construct and __destruct were ignored
+    - Set the list of method names to ignore in the "specialMethods" sniff property
+    - The default remains at "__construct" and "__destruct" only
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- PSR2.ControlStructures.SwitchDeclaration now supports nested switch statements where every branch terminates
+    - Previously, if a CASE only contained a SWITCH and no direct terminating statement, a fall-through error was displayed
+    - Now, the error is surpressed if every branch of the SWITCH has a terminating statement
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- The PSR2.Methods.FunctionCallSignature.SpaceBeforeCloseBracket error message is now reported on the closing parenthesis token
+    - Previously, the error was being reported on the function keyword, leading to confusing line numbers in the error report
+- Squiz.Commenting.FunctionComment is now able to ignore function comments that are only inheritdoc statements
+    - Set the skipIfInheritdoc sniff property to "true" to skip checking function comments if the content is only {@inhertidoc}
+    - The default remains at "false", so these comments will continue to report errors
+    - Thanks to Jess Myrbo@xjm for the patch
+- Squiz.Commenting.FunctionComment now supports the PHP 8 mixed type
+    - Thanks to Vadim Borodavko@javer for the patch
+- Squiz.PHP.NonExecutableCode now has improved handling of syntax errors
+    - Thanks to Thiemo Kreuz@thiemowmde for the patch
+- Squiz.WhiteSpace.ScopeKeywordSpacing now checks spacing when using PHP 8.0 constructor property promotion
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed an issue that could occur when checking files on network drives, such as with WSL2 on Windows 10
+    - This works around a long-standing PHP bug with is_readable()
+    - Thanks to Michael S@codebymikey for the patch
+- Fixed a number of false positives in the Squiz.PHP.DisallowMultipleAssignments sniff
+    - Sniff no longer errors for default value assignments in arrow functions
+    - Sniff no longer errors for assignments on first line of closure
+    - Sniff no longer errors for assignments after a goto label
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #2913 : Generic.WhiteSpace.ScopeIndent false positive when opening and closing tag on same line inside conditional
+- Fixed bug #2992 : Enabling caching using a ruleset produces invalid cache files when using --sniffs and --exclude CLI args
+- Fixed bug #3003 : Squiz.Formatting.OperatorBracket autofix incorrect when assignment used with null coalescing operator
+- Fixed bug #3145 : Autoloading of sniff fails when multiple classes declared in same file
+- Fixed bug #3157 : PSR2.ControlStructures.SwitchDeclaration.BreakIndent false positive when case keyword is not indented
+- Fixed bug #3163 : Undefined index error with pre-commit hook using husky on PHP 7.4
+    - Thanks to Ismo Vuorinen@ivuorinen for the patch
+- Fixed bug #3165 : Squiz.PHP.DisallowComparisonAssignment false positive when comparison inside closure
+- Fixed bug #3167 : Generic.WhiteSpace.ScopeIndent false positive when using PHP 8.0 constructor property promotion
+- Fixed bug #3170 : Squiz.WhiteSpace.OperatorSpacing false positive when using negation with string concat
+    - This also fixes the same issue in the PSR12.Operators.OperatorSpacing sniff
+- Fixed bug #3177 : Incorrect tokenization of GOTO statements in mixed PHP/HTML files
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3184 : PSR2.Namespace.NamespaceDeclaration false positive on namespace operator
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3188 : Squiz.WhiteSpace.ScopeKeywordSpacing false positive for static return type
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3192 : findStartOfStatement doesn't work correctly inside switch
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- Fixed bug #3195 : Generic.WhiteSpace.ScopeIndent confusing message when combination of tabs and spaces found
+- Fixed bug #3197 : Squiz.NamingConventions.ValidVariableName does not use correct error code for all member vars
+- Fixed bug #3219 : Generic.Formatting.MultipleStatementAlignment false positive for empty anonymous classes and closures
+- Fixed bug #3258 : Squiz.Formatting.OperatorBracket duplicate error messages for unary minus
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3273 : Squiz.Functions.FunctionDeclarationArgumentSpacing reports line break as 0 spaces between parenthesis
+- Fixed bug #3277 : Nullable static return typehint causes whitespace error
+- Fixed bug #3284 : Unused parameter false positive when using array index in arrow function
+
+## 3.5.8 - 2020-10-23
+### Removed
+- Reverted a change to the way include/exclude patterns are processed for STDIN content
+    - This change is not backwards compatible and will be re-introduced in version 3.6.0
+
+## 3.5.7 - 2020-10-23
+### Added
+- The PHP 8.0 T_NULLSAFE_OBJECT_OPERATOR token has been made available for older versions
+    - Existing sniffs that check for T_OBJECT_OPERATOR have been modified to apply the same rules for the nullsafe object   operator
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The new method of PHP 8.0 tokenizing for namespaced names has been revert to thr pre 8.0 method
+    - This maintains backwards compatible for existing sniffs on PHP 8.0
+    - This change will be removed in PHPCS 4.0 as the PHP 8.0 tokenizing method will be backported for pre 8.0 versions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for changes to the way PHP 8.0 tokenizes hash comments
+    - The existing PHP 5-7 behaviour has been replicated for version 8, so no sniff changes are required
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Running the unit tests now includes warnings in the found and fixable error code counts
+      - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PSR12.Functions.NullableTypeDeclaration now supports the PHP8 static return type
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Changed
+- The autoloader has been changed to fix sniff class name detection issues that may occur when running on PHP 7.4+
+    - Thanks to Eloy Lafuente@stronk7 for the patch
+- PSR12.ControlStructures.BooleanOperatorPlacement.FoundMixed error message is now more accurate when using the allowOnly setting
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+
+### Fixed
+- Fixed Squiz.Formatting.OperatorBracket false positive when exiting with a negative number
+- Fixed Squiz.PHP.DisallowComparisonAssignment false positive for methods called on an object
+- Fixed bug #2882 : Generic.Arrays.ArrayIndent can request close brace indent to be less than the statement indent level
+- Fixed bug #2883 : Generic.WhiteSpace.ScopeIndent.Incorrect issue after NOWDOC
+- Fixed bug #2975 : Undefined offset in PSR12.Functions.ReturnTypeDeclaration when checking function return type inside ternary
+- Fixed bug #2988 : Undefined offset in Squiz.Strings.ConcatenationSpacing during live coding
+    - Thanks to Thiemo Kreuz@thiemowmde for the patch
+- Fixed bug #2989 : Incorrect auto-fixing in Generic.ControlStructures.InlineControlStructure during live coding
+    - Thanks to Thiemo Kreuz@thiemowmde for the patch
+- Fixed bug #3007 : Directory exclude pattern improperly excludes directories with names that start the same
+    - Thanks to Steve Talbot@SteveTalbot for the patch
+- Fixed bug #3043 : Squiz.WhiteSpace.OperatorSpacing false positive for negation in arrow function
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3049 : Incorrect error with arrow function and parameter passed as reference
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3053 : PSR2 incorrect fix when multiple use statements on same line do not have whitespace between them
+- Fixed bug #3058 : Progress gets unaligned when 100% happens at the end of the available dots
+- Fixed bug #3059 : Squiz.Arrays.ArrayDeclaration false positive when using type casting
+    - Thanks to Sergei Morozov@morozov for the patch
+- Fixed bug #3060 : Squiz.Arrays.ArrayDeclaration false positive for static functions
+    - Thanks to Sergei Morozov@morozov for the patch
+- Fixed bug #3065 : Should not fix Squiz.Arrays.ArrayDeclaration.SpaceBeforeComma if comment between element and comma
+    - Thanks to Sergei Morozov@morozov for the patch
+- Fixed bug #3066 : No support for namespace operator used in type declarations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3075 : PSR12.ControlStructures.BooleanOperatorPlacement false positive when operator is the only content on line
+- Fixed bug #3099 : Squiz.WhiteSpace.OperatorSpacing false positive when exiting with negative number
+    - Thanks to Sergei Morozov@morozov for the patch
+- Fixed bug #3102 : PSR12.Squiz.OperatorSpacing false positive for default values of arrow functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #3124 : PSR-12 not reporting error for empty lines with only whitespace
+- Fixed bug #3135 : Ignore annotations are broken on PHP 8.0
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.5.6 - 2020-08-10
+### Added
+- Added support for PHP 8.0 magic constant dereferencing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added support for changes to the way PHP 8.0 tokenizes comments
+    - The existing PHP 5-7 behaviour has been replicated for version 8, so no sniff changes are required
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- `File::getMethodProperties()` now detects the PHP 8.0 static return type
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The PHP 8.0 static return type is now supported for arrow functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Changed
+- The cache is no longer used if the list of loaded PHP extensions changes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- `Generic.NamingConventions.CamelCapsFunctionName` no longer reports `__serialize` and `__unserialize` as invalid names
+    - Thanks to Filip Š@filips123 for the patch
+- `PEAR.NamingConventions.ValidFunctionName` no longer reports `__serialize` and `__unserialize` as invalid names
+    - Thanks to Filip Š@filips123 for the patch
+- `Squiz.Scope.StaticThisUsage` now detects usage of `$this` inside closures and arrow functions
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+
+### Fixed
+- Fixed bug #2877 : PEAR.Functions.FunctionCallSignature false positive for array of functions
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- Fixed bug #2888 : PSR12.Files.FileHeader blank line error with multiple namespaces in one file
+- Fixed bug #2926 : phpcs hangs when using arrow functions that return heredoc
+- Fixed bug #2943 : Redundant semicolon added to a file when fixing PSR2.Files.ClosingTag.NotAllowed
+- Fixed bug #2967 : Markdown generator does not output headings correctly
+    - Thanks to Petr Bugyík@o5 for the patch
+- Fixed bug #2977 : File::isReference() does not detect return by reference for closures
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2994 : Generic.Formatting.DisallowMultipleStatements false positive for FOR loop with no body
+- Fixed bug #3033 : Error generated during tokenizing of goto statements on PHP 8
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.5.5 - 2020-04-17
+### Changed
+- The T_FN backfill now works more reliably so T_FN tokens only ever represent real arrow functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed an issue where including sniffs using paths containing multiple dots would silently fail
+- Generic.CodeAnalysis.EmptyPHPStatement now detects empty statements at the start of control structures
+
+### Fixed
+- Error wording in PEAR.Functions.FunctionCallSignature now always uses "parenthesis" instead of sometimes using "bracket"
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- Fixed bug #2787 : Squiz.PHP.DisallowMultipleAssignments not ignoring typed property declarations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2810 : PHPCBF fails to fix file with empty statement at start on control structure
+- Fixed bug #2812 : Squiz.Arrays.ArrayDeclaration not detecting some arrays with multiple arguments on the same line
+    - Thanks to Jakub Chábek@grongor for the patch
+- Fixed bug #2826 : Generic.WhiteSpace.ArbitraryParenthesesSpacing doesn't detect issues for statements directly after a   control structure
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- Fixed bug #2848 : PSR12.Files.FileHeader false positive for file with mixed PHP and HTML and no file header
+- Fixed bug #2849 : Generic.WhiteSpace.ScopeIndent false positive with arrow function inside array
+- Fixed bug #2850 : Generic.PHP.LowerCaseKeyword complains __HALT_COMPILER is uppercase
+- Fixed bug #2853 : Undefined variable error when using Info report
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2865 : Double arrow tokenized as T_STRING when placed after function named "fn"
+- Fixed bug #2867 : Incorrect scope matching when arrow function used inside IF condition
+- Fixed bug #2868 : phpcs:ignore annotation doesnt work inside a docblock
+- Fixed bug #2878 : PSR12.Files.FileHeader conflicts with Generic.Files.LineEndings
+- Fixed bug #2895 : PSR2.Methods.FunctionCallSignature.MultipleArguments false positive with arrow function argument
+
+## 3.5.4 - 2020-01-31
+### Changed
+- The PHP 7.4 numeric separator backfill now works correctly for more float formats
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The PHP 7.4 numeric separator backfill is no longer run on PHP version 7.4.0 or greater
+- File::getCondition() now accepts a 3rd argument that allows for the closest matching token to be returned
+    - By default, it continues to return the first matched token found from the top of the file
+- Fixed detection of array return types for arrow functions
+- Added Generic.PHP.DisallowRequestSuperglobal to ban the use of the $_REQUEST superglobal
+    - Thanks to Jeantwan Teuma@Morerice for the contribution
+- Generic.ControlStructures.InlineControlStructure no longer shows errors for WHILE and FOR statements without a body
+    - Previously it required these to have curly braces, but there were no statements to enclose in them
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PSR12.ControlStructures.BooleanOperatorPlacement can now be configured to enforce a specific operator position
+    - By default, the sniff ensures that operators are all at the begining or end of lines, but not a mix of both
+    - Set the allowOnly property to "first" to enforce all boolean operators to be at the start of a line
+    - Set the allowOnly property to "last" to enforce all boolean operators to be at the end of a line
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- PSR12.Files.ImportStatement now auto-fixes import statements by removing the leading slash
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Squiz.ControlStructures.ForLoopDeclaration now has a setting to ignore newline characters
+    - Default remains FALSE, so newlines are not allowed within FOR definitions
+    - Override the "ignoreNewlines" setting in a ruleset.xml file to change
+- Squiz.PHP.InnerFunctions now handles multiple nested anon classes correctly
+
+### Fixed
+- Fixed bug #2497 : Sniff properties not set when referencing a sniff using relative paths or non-native slashes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2657 : Squiz.WhiteSpace.FunctionSpacing can remove spaces between comment and first/last method during auto-fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2688 : Case statements not tokenized correctly when switch is contained within ternary
+- Fixed bug #2698 : PHPCS throws errors determining auto report width when shell_exec is disabled
+    - Thanks to Matthew Peveler@MasterOdin for the patch
+- Fixed bug #2730 : PSR12.ControlStructures.ControlStructureSpacing does not ignore comments between conditions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2732 : PSR12.Files.FileHeader misidentifies file header in mixed content file
+- Fixed bug #2745 : AbstractArraySniff wrong indices when mixed coalesce and ternary values
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #2748 : Wrong end of statement for fn closures
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #2751 : Autoload relative paths first to avoid confusion with files from the global include path
+    - Thanks to Klaus Purer@klausi for the patch
+- Fixed bug #2763 : PSR12 standard reports errors for multi-line FOR definitions
+- Fixed bug #2768 : Generic.Files.LineLength false positive for non-breakable strings at exactly the soft limit
+    - Thanks to Alex Miles@ghostal for the patch
+- Fixed bug #2773 : PSR2.Methods.FunctionCallSignature false positive when arrow function has array return type
+- Fixed bug #2790 : PSR12.Traits.UseDeclaration ignores block comments
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- Fixed bug #2791 : PSR12.Functions.NullableTypeDeclaration false positive when ternary operator used with instanceof
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2802 : Can't specify a report file path using the tilde shortcut
+- Fixed bug #2804 : PHP4-style typed properties not tokenized correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2805 : Undefined Offset notice during live coding of arrow functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2843 : Tokenizer does not support alternative syntax for declare statements
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.5.3 - 2019-12-04
+### Changed
+- The PHP 7.4 T_FN token has been made available for older versions
+    - T_FN represents the fn string used for arrow functions
+    - The double arrow becomes the scope opener, and uses a new T_FN_ARROW token type
+    - The token after the statement (normally a semicolon) becomes the scope closer
+    - The token is also associated with the opening and closing parenthesis of the statement
+    - Any functions named "fn" will cause have a T_FN token for the function name, but have no scope information
+    - Thanks to Michał Bundyra@michalbundyra for the help with this change
+- PHP 7.4 numeric separators are now tokenized in the same way when using older PHP versions
+    - Previously, a number like 1_000 would tokenize as T_LNUMBER (1), T_STRING (_000)
+    - Now, the number tokenizes as T_LNUMBER (1_000)
+    - Sniff developers should consider how numbers with underscores impact their custom sniffs
+- The PHPCS file cache now takes file permissions into account
+    - The cache is now invalidated for a file when its permissions are changed
+- File::getMethodParameters() now supports arrow functions
+- File::getMethodProperties() now supports arrow functions
+- Added Fixer::changeCodeBlockIndent() to change the indent of a code block while auto-fixing
+    - Can be used to either increase or decrease the indent
+    - Useful when moving the start position of something like a closure, where you want the content to also move
+- Added Generic.Files.ExecutableFile sniff
+    - Ensures that files are not executable
+    - Thanks to Matthew Peveler@MasterOdin for the contribution
+- Generic.CodeAnalysis.EmptyPhpStatement now reports unnecessary semicolons after control structure closing braces
+    - Thanks to Vincent Langlet@VincentLanglet for the patch
+- Generic.PHP.LowerCaseKeyword now enforces that the "fn" keyword is lowercase
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Generic.WhiteSpace.ScopeIndent now supports static arrow functions
+- PEAR.Functions.FunctionCallSignature now adjusts the indent of function argument contents during auto-fixing
+    - Previously, only the first line of an argument was changed, leading to inconsistent indents
+    - This change also applies to PSR2.Methods.FunctionCallSignature
+- PSR2.ControlStructures.ControlStructureSpacing now checks whitespace before the closing parenthesis of multi-line control structures
+    - Previously, it incorrectly applied the whitespace check for single-line definitions only
+- PSR12.Functions.ReturnTypeDeclaration now checks the return type of arrow functions
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- PSR12.Traits.UseDeclaration now ensures all trait import statements are grouped together
+    - Previously, the trait import section of the class ended when the first non-import statement was found
+    - Checking now continues throughout the class to ensure all statements are grouped together
+    - This also ensures that empty lines are not requested after an import statement that isn't the last one
+- Squiz.Functions.LowercaseFunctionKeywords now enforces that the "fn" keyword is lowercase
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+
+### Fixed
+- Fixed bug #2586 : Generic.WhiteSpace.ScopeIndent false positives when indenting open tags at a non tab-stop
+- Fixed bug #2638 : Squiz.CSS.DuplicateClassDefinitionSniff sees comments as part of the class name
+    - Thanks to Raphael Horber@rhorber for the patch
+- Fixed bug #2640 : Squiz.WhiteSpace.OperatorSpacing false positives for some negation operators
+    - Thanks to Jakub Chábek@grongor and Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2674 : Squiz.Functions.FunctionDeclarationArgumentSpacing prints wrong argument name in error message
+- Fixed bug #2676 : PSR12.Files.FileHeader locks up when file ends with multiple inline comments
+- Fixed bug #2678 : PSR12.Classes.AnonClassDeclaration incorrectly enforcing that closing brace be on a line by itself
+- Fixed bug #2685 : File::getMethodParameters() setting typeHintEndToken for vars with no type hint
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2694 : AbstractArraySniff produces invalid indices when using ternary operator
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #2702 : Generic.WhiteSpace.ScopeIndent false positive when using ternary operator with short arrays
+
+## 3.5.2 - 2019-10-28
+### Changed
+- Generic.ControlStructures.DisallowYodaConditions now returns less false positives
+    - False positives were being returned for array comparisions, or when performing some function calls
+- Squiz.WhiteSpace.SemicolonSpacing.Incorrect error message now escapes newlines and tabs
+    - Provides a clearer error message as whitespace is now visible
+    - Also allows for better output for report types such as CSV and XML
+- The error message for PSR12.Files.FileHeader.SpacingAfterBlock has been made clearer
+    - It now uses the wording from the published PSR-12 standard to indicate that blocks must be separated by a blank line
+    - Thanks to Craig Duncan@duncan3dc for the patch
+
+### Fixed
+- Fixed bug #2654 : Incorrect indentation for arguments of multiline function calls
+- Fixed bug #2656 : Squiz.WhiteSpace.MemberVarSpacing removes comments before first member var during auto fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2663 : Generic.NamingConventions.ConstructorName complains about old constructor in interfaces
+- Fixed bug #2664 : PSR12.Files.OpenTag incorrectly identifies PHP file with only an opening tag
+- Fixed bug #2665 : PSR12.Files.ImportStatement should not apply to traits
+- Fixed bug #2673 : PSR12.Traits.UseDeclaration does not allow comments or blank lines between use statements
+
+## 3.5.1 - 2019-10-17
+### Changed
+- Very very verbose diff report output has slightly changed to improve readability
+    - Output is printed when running PHPCS with the --report=diff and -vvv command line arguments
+    - Fully qualified class names have been replaced with sniff codes
+    - Tokens being changed now display the line number they are on
+- PSR2, PSR12, and PEAR standards now correctly check for blank lines at the start of function calls
+    - This check has been missing from these standards, but has now been implemented
+    - When using the PEAR standard, the error code is PEAR.Functions.FunctionCallSignature.FirstArgumentPosition
+    - When using PSR2 or PSR12, the error code is PSR2.Methods.FunctionCallSignature.FirstArgumentPosition
+- PSR12.ControlStructures.BooleanOperatorPlacement no longer complains when multiple expression appears on the same line
+    - Previously, boolean operators were enforce to appear at the start or end of lines only
+    - Boolean operators can now appear in the middle of the line
+- PSR12.Files.FileHeader no longer ignores comments preceding a use, namespace, or declare statement
+- PSR12.Files.FileHeader now allows a hashbang line at the top of the file
+
+### Fixed
+- Fixed bug #2506 : PSR2 standard can't auto fix multi-line function call inside a string concat statement
+- Fixed bug #2530 : PEAR.Commenting.FunctionComment does not support intersection types in comments
+- Fixed bug #2615 : Constant visibility false positive on non-class constants
+- Fixed bug #2616 : PSR12.Files.FileHeader false positive when file only contains docblock
+- Fixed bug #2619 : PSR12.Files.FileHeader locks up when inline comment is the last content in a file
+- Fixed bug #2621 : PSR12.Classes.AnonClassDeclaration.CloseBraceSameLine false positive for anon class passed as function argument
+    - Thanks to Martins Sipenko@martinssipenko for the patch
+- Fixed bug #2623 : PSR12.ControlStructures.ControlStructureSpacing not ignoring indentation inside multi-line string arguments
+- Fixed bug #2624 : PSR12.Traits.UseDeclaration doesnt apply the correct indent during auto fixing
+- Fixed bug #2626 : PSR12.Files.FileHeader detects @var annotations as file docblocks
+- Fixed bug #2628 : PSR12.Traits.UseDeclaration does not allow comments above a USE declaration
+- Fixed bug #2632 : Incorrect indentation of lines starting with "static" inside closures
+- Fixed bug #2641 : PSR12.Functions.NullableTypeDeclaration false positive when using new static()
+
+## 3.5.0 - 2019-09-27
+### Changed
+- The included PSR12 standard is now complete and ready to use
+    - Check your code using PSR-12 by running PHPCS with --standard=PSR12
+- Added support for PHP 7.4 typed properties
+    - The nullable operator is now tokenized as T_NULLABLE inside property types, as it is elsewhere
+    - To get the type of a member var, use the File::getMemberProperties() method, which now contains a "type" array index
+        - This contains the type of the member var, or a blank string if not specified
+        - If the type is nullable, the return type will contain the leading ?
+        - If a type is specified, the position of the first token in the type will be set in a "type_token" array index
+        - If a type is specified, the position of the last token in the type will be set in a "type_end_token" array index
+        - If the type is nullable, a "nullable_type" array index will also be set to TRUE
+        - If the type contains namespace information, it will be cleaned of whitespace and comments in the return value
+- The PSR1 standard now correctly bans alternate PHP tags
+    - Previously, it only banned short open tags and not the pre-7.0 alternate tags
+- Added support for only checking files that have been locally staged in a git repo
+    - Use --filter=gitstaged to check these files
+    - You still need to give PHPCS a list of files or directories in which to apply the filter
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- JSON reports now end with a newline character
+- The phpcs.xsd schema now validates phpcs-only and phpcbf-only attributes correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The tokenizer now correctly identifies inline control structures in more cases
+- All helper methods inside the File class now throw RuntimeException instead of TokenizerException
+    - Some tokenizer methods were also throwing RuntimeExpection but now correctly throw TokenizerException
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The File::getMethodParameters() method now returns more information, and supports closure USE groups
+    - If a type hint is specified, the position of the last token in the hint will be set in a "type_hint_end_token" array index
+    - If a default is specified, the position of the first token in the default value will be set in a "default_token" array   index
+    - If a default is specified, the position of the equals sign will be set in a "default_equal_token" array index
+    - If the param is not the last, the position of the comma will be set in a "comma_token" array index
+    - If the param is passed by reference, the position of the reference operator will be set in a "reference_token" array index
+    - If the param is variable length, the position of the variadic operator will be set in a "variadic_token" array index
+- The T_LIST token and it's opening and closing parentheses now contain references to each other in the tokens array
+    - Uses the same parenthesis_opener/closer/owner indexes as other tokens
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The T_ANON_CLASS token and it's opening and closing parentheses now contain references to each other in the tokens array
+    - Uses the same parenthesis_opener/closer/owner indexes as other tokens
+    - Only applicable if the anon class is passing arguments to the constructor
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The PHP 7.4 T_BAD_CHARACTER token has been made available for older versions
+    - Allows you to safely look for this token, but it will not appear unless checking with PHP 7.4+
+- Metrics are now available for Squiz.WhiteSpace.FunctionSpacing
+    - Use the "info" report to see blank lines before/after functions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Metrics are now available for Squiz.WhiteSpace.MemberVarSpacing
+    - Use the "info" report to see blank lines before member vars
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added Generic.ControlStructures.DisallowYodaConditions sniff
+    - Ban the use of Yoda conditions
+    - Thanks to Mponos George@gmponos for the contribution
+- Added Generic.PHP.RequireStrictTypes sniff
+    - Enforce the use of a strict types declaration in PHP files
+- Added Generic.WhiteSpace.SpreadOperatorSpacingAfter sniff
+    - Checks whitespace between the spread operator and the variable/function call it applies to
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added PSR12.Classes.AnonClassDeclaration sniff
+    - Enforces the formatting of anonymous classes
+- Added PSR12.Classes.ClosingBrace sniff
+    - Enforces that closing braces of classes/interfaces/traits/functions are not followed by a comment or statement
+- Added PSR12.ControlStructures.BooleanOperatorPlacement sniff
+    - Enforces that boolean operators between conditions are consistently at the start or end of the line
+- Added PSR12.ControlStructures.ControlStructureSpacing sniff
+    - Enforces that spacing and indents are correct inside control structure parenthesis
+- Added PSR12.Files.DeclareStatement sniff
+    - Enforces the formatting of declare statements within a file
+- Added PSR12.Files.FileHeader sniff
+    - Enforces the order and formatting of file header blocks
+- Added PSR12.Files.ImportStatement sniff
+    - Enforces the formatting of import statements within a file
+- Added PSR12.Files.OpenTag sniff
+    - Enforces that the open tag is on a line by itself when used at the start of a php-only file
+- Added PSR12.Functions.ReturnTypeDeclaration sniff
+    - Enforces the formatting of return type declarations in functions and closures
+- Added PSR12.Properties.ConstantVisibility sniff
+    - Enforces that constants must have their visibility defined
+    - Uses a warning instead of an error due to this conditionally requiring the project to support PHP 7.1+
+- Added PSR12.Traits.UseDeclaration sniff
+    - Enforces the formatting of trait import statements within a class
+- Generic.Files.LineLength ignoreComments property now ignores comments at the end of a line
+    - Previously, this property was incorrectly causing the sniff to ignore any line that ended with a comment
+    - Now, the trailing comment is not included in the line length, but the rest of the line is still checked
+- Generic.Files.LineLength now only ignores unwrappable comments when the comment is on a line by itself
+    - Previously, a short unwrappable comment at the end of the line would have the sniff ignore the entire line
+- Generic.Functions.FunctionCallArgumentSpacing no longer checks spacing around assignment operators inside function calls
+    - Use the Squiz.WhiteSpace.OperatorSpacing sniff to enforce spacing around assignment operators
+        - Note that this sniff checks spacing around all assignment operators, not just inside function calls
+    - The Generic.Functions.FunctionCallArgumentSpacing.NoSpaceBeforeEquals error has been removed
+        - use Squiz.WhiteSpace.OperatorSpacing.NoSpaceBefore instead
+    - The Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterEquals error has been removed
+        - use Squiz.WhiteSpace.OperatorSpacing.NoSpaceAfter instead
+    - This also changes the PEAR/PSR2/PSR12 standards so they no longer check assignment operators inside function calls
+        - They were previously checking these operators when they should not have
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.WhiteSpace.ScopeIndent no longer performs exact indents checking for chained method calls
+    - Other sniffs can be used to enforce chained method call indent rules
+    - Thanks to Pieter Frenssen@pfrenssen for the patch
+- PEAR.WhiteSpace.ObjectOperatorIndent now supports multi-level chained statements
+    - When enabled, chained calls must be indented 1 level more or less than the previous line
+    - Set the new "multilevel" setting to TRUE in a ruleset.xml file to enable this behaviour
+    - Thanks to Marcos Passos@marcospassos for the patch
+- PSR2.ControlStructures.ControlStructureSpacing now allows whitespace after the opening parenthesis if followed by a comment
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- PSR2.Classes.PropertyDeclaration now enforces a single space after a property type keyword
+    - The PSR2 standard itself excludes this new check as it is not defined in the written standard
+    - Using the PSR12 standard will enforce this check
+- Squiz.Commenting.BlockComment no longer requires blank line before comment if it's the first content after the PHP open tag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Functions.FunctionDeclarationArgumentSpacing now has more accurate error messages
+    - This includes renaming the SpaceAfterDefault error code to SpaceAfterEquals, which reflects the real error
+- Squiz.Functions.FunctionDeclarationArgumentSpacing now checks for no space after a reference operator
+    - If you don't want this new behaviour, exclude the SpacingAfterReference error message in a ruleset.xml file
+- Squiz.Functions.FunctionDeclarationArgumentSpacing now checks for no space after a variadic operator
+    - If you don't want this new behaviour, exclude the SpacingAfterVariadic error message in a ruleset.xml file
+- Squiz.Functions.MultiLineFunctionDeclaration now has improved fixing for the FirstParamSpacing and UseFirstParamSpacing errors
+- Squiz.Operators.IncrementDecrementUsage now suggests pre-increment of variables instead of post-increment
+    - This change does not enforce pre-increment over post-increment; only the suggestion has changed
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.PHP.DisallowMultipleAssignments now has a second error code for when assignments are found inside control structure   conditions
+    - The new error code is Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
+    - All other multiple assignment cases use the existing error code Squiz.PHP.DisallowMultipleAssignments.Found
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.FunctionSpacing now applies beforeFirst and afterLast spacing rules to nested functions
+    - Previously, these rules only applied to the first and last function in a class, interface, or trait
+    - These rules now apply to functions nested in any statement block, including other functions and conditions
+- Squiz.WhiteSpace.OperatorSpacing now has improved handling of parse errors
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.OperatorSpacing now checks spacing around the instanceof operator
+    - Thanks to Jakub Chábek@grongor for the patch
+- Squiz.WhiteSpace.OperatorSpacing can now enforce a single space before assignment operators
+    - Previously, the sniff this spacing as multiple assignment operators are sometimes aligned
+    - Now, you can set the ignoreSpacingBeforeAssignments sniff property to FALSE to enable checking
+    - Default remains TRUE, so spacing before assignments is not checked by default
+    - Thanks to Jakub Chábek@grongor for the patch
+
+### Fixed
+- Fixed bug #2391 : Sniff-specific ignore rules inside rulesets are filtering out too many files
+    - Thanks to Juliette Reinders Folmer@jrfnl and Willington Vega@wvega for the patch
+- Fixed bug #2478 : FunctionCommentThrowTag.WrongNumber when exception is thrown once but built conditionally
+- Fixed bug #2479 : Generic.WhiteSpace.ScopeIndent error when using array destructing with exact indent checking
+- Fixed bug #2498 : Squiz.Arrays.ArrayDeclaration.MultiLineNotAllowed autofix breaks heredoc
+- Fixed bug #2502 : Generic.WhiteSpace.ScopeIndent false positives with nested switch indentation and case fall-through
+- Fixed bug #2504 : Generic.WhiteSpace.ScopeIndent false positives with nested arrays and nowdoc string
+- Fixed bug #2511 : PSR2 standard not checking if closing paren of single-line function declaration is on new line
+- Fixed bug #2512 : Squiz.PHP.NonExecutableCode does not support alternate SWITCH control structure
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2522 : Text generator throws error when code sample line is too long
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2526 : XML report format has bad syntax on Windows
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2529 : Generic.Formatting.MultipleStatementAlignment wrong error for assign in string concat
+- Fixed bug #2534 : Unresolvable installed_paths can lead to open_basedir errors
+    - Thanks to Oliver Nowak@ndm2 for the patch
+- Fixed bug #2541 : Text doc generator does not allow for multi-line rule explanations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2549 : Searching for a phpcs.xml file can throw warnings due to open_basedir restrictions
+    - Thanks to Matthew Peveler@MasterOdin for the patch
+- Fixed bug #2558 : PHP 7.4 throwing offset syntax with curly braces is deprecated message
+    - Thanks to Matthew Peveler@MasterOdin for the patch
+- Fixed bug #2561 : PHP 7.4 compatibility fix / implode argument order
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2562 : Inline WHILE triggers SpaceBeforeSemicolon incorrectly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2565 : Generic.ControlStructures.InlineControlStructure confused by mixed short/long tags
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2566 : Author tag email validation doesn't support all TLDs
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2575 : Custom error messages don't have data replaced when cache is enabled
+- Fixed bug #2601 : Squiz.WhiteSpace.FunctionSpacing incorrect fix when spacing is 0
+- Fixed bug #2608 : PSR2 throws errors for use statements when multiple namespaces are defined in a file
+
+## 3.4.2 - 2019-04-11
+### Changed
+- Squiz.Arrays.ArrayDeclaration now has improved handling of syntax errors
+
+### Fixed
+- Fixed an issue where the PCRE JIT on PHP 7.3 caused PHPCS to die when using the parallel option
+    - PHPCS now disables the PCRE JIT before running
+- Fixed bug #2368 : MySource.PHP.AjaxNullComparison throws error when first function has no doc comment
+- Fixed bug #2414 : Indention false positive in switch/case/if combination
+- Fixed bug #2423 : Squiz.Formatting.OperatorBracket.MissingBrackets error with static
+- Fixed bug #2450 : Indentation false positive when closure containing nested IF conditions used as function argument
+- Fixed bug #2452 : LowercasePHPFunctions sniff failing on "new \File()"
+- Fixed bug #2453 : Squiz.CSS.SemicolonSpacingSniff false positive when style name proceeded by an asterisk
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2464 : Fixer conflict between Generic.WhiteSpace.ScopeIndent and Squiz.WhiteSpace.ScopeClosingBrace when class   indented 1 space
+- Fixed bug #2465 : Excluding a sniff by path is not working
+- Fixed bug #2467 : PHP open/close tags inside CSS files are replaced with internal PHPCS token strings when auto fixing
+
+## 3.4.1 - 2019-03-19
+### Changed
+- The PEAR installable version of PHPCS was missing some files, which have been re-included in this release
+    - The code report was not previously available for PEAR installs
+    - The Generic.Formatting.SpaceBeforeCast sniff was not previously available for PEAR installs
+    - The Generic.WhiteSpace.LanguageConstructSpacing sniff was not previously available for PEAR installs
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PHPCS will now refuse to run if any of the required PHP extensions are not loaded
+    - Previously, PHPCS only relied on requirements being checked by PEAR and Composer
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Ruleset XML parsing errors are now displayed in a readable format so they are easier to correct
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The PSR2 standard no longer throws duplicate errors for spacing around FOR loop parentheses
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- T_PHPCS_SET tokens now contain sniffCode, sniffProperty, and sniffPropertyValue indexes
+    - Sniffs can use this information instead of having to parse the token content manually
+- Added more guard code for syntax errors to various CSS sniffs
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Commenting.DocComment error messages now contain the name of the comment tag that caused the error
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.ControlStructures.InlineControlStructure now handles syntax errors correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Debug.JSHint now longer requires rhino and can be run directly from the npm install
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Files.LineEndings no longer adds superfluous new line at the end of JS and CSS files
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Formatting.DisallowMultipleStatements no longer tries fix lines containing phpcs:ignore statements
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Functions.FunctionCallArgumentSpacing now has improved performance and anonymous class support
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.WhiteSpace.ScopeIndent now respects changes to the "exact" property using phpcs:set mid-way through a file
+    - This allows you change the "exact" rule for only some parts of a file
+- Generic.WhiteSpace.ScopeIndent now disables exact indent checking inside all arrays
+    - Previously, this was only done when using long array syntax, but it now works for short array syntax as well
+- PEAR.Classes.ClassDeclaration now has improved handling of PHPCS annotations and tab indents
+- PSR12.Classes.ClassInstantiation has changed it's error code from MissingParenthesis to MissingParentheses
+- PSR12.Keywords.ShortFormTypeKeywords now ignores all spacing inside type casts during both checking and fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Classes.LowercaseClassKeywords now examines the class keyword for anonymous classes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.ControlStructures.ControlSignature now has improved handling of parse errors
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.PostStatementComment fixer no longer adds a blank line at the start of a JS file that begins with a comment
+    - Fixes a conflict between this sniff and the Squiz.WhiteSpace.SuperfluousWhitespace sniff
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.PostStatementComment now ignores comments inside control structure conditions, such as FOR loops
+    - Fixes a conflict between this sniff and the Squiz.ControlStructures.ForLoopDeclaration sniff
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.FunctionCommentThrowTag now has improved support for unknown exception types and namespaces
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.ControlStructures.ForLoopDeclaration has improved whitespace, closure, and empty expression support
+    - The SpacingAfterSecondNoThird error code has been removed as part of these fixes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.CSS.ClassDefinitionOpeningBraceSpace now handles comments and indentation correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.CSS.ClassDefinitionClosingBrace now handles comments, indentation, and multiple statements on the same line correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.CSS.Opacity now handles comments correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.CSS.SemicolonSpacing now handles comments and syntax errors correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.NamingConventions.ValidVariableName now supports variables inside anonymous classes correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.PHP.LowercasePHPFunctions now handles use statements, namespaces, and comments correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.FunctionSpacing now fixes function spacing correctly when a function is the first content in a file
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.SuperfluousWhitespace no longer throws errors for spacing between functions and properties in anon classes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Zend.Files.ClosingTag no longer adds a semi-colon during fixing of a file that only contains a comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Zend.NamingConventions.ValidVariableName now supports variables inside anonymous classes correctly
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed bug #2298 : PSR2.Classes.ClassDeclaration allows extended class on new line
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #2337 : Generic.WhiteSpace.ScopeIndent incorrect error when multi-line function call starts on same line as open   tag
+- Fixed bug #2348 : Cache not invalidated when changing a ruleset included by another
+- Fixed bug #2376 : Using __halt_compiler() breaks Generic.PHP.ForbiddenFunctions unless it's last in the function list
+    - Thanks to Sijun Zhu@Billz95 for the patch
+- Fixed bug #2393 : The gitmodified filter will infinitely loop when encountering deleted file paths
+    - Thanks to Lucas Manzke@lmanzke for the patch
+- Fixed bug #2396 : Generic.WhiteSpace.ScopeIndent incorrect error when multi-line IF condition mixed with HTML
+- Fixed bug #2431 : Use function/const not tokenized as T_STRING when preceded by comment
+
+## 3.4.0 - 2018-12-20
+### Deprecated
+- The Generic.Formatting.NoSpaceAfterCast sniff has been deprecated and will be removed in version 4
+    - The functionality of this sniff is now available in the Generic.Formatting.SpaceAfterCast sniff
+        - Include the Generic.Formatting.SpaceAfterCast sniff and set the "spacing" property to "0"
+    - As soon as possible, replace all instances of the old sniff code with the new sniff code and property setting
+        - The existing sniff will continue to work until version 4 has been released
+
+### Changed
+- Rule include patterns in a ruleset.xml file are now evaluated as OR instead of AND
+    - Previously, a file had to match every include pattern and no exclude patterns to be included
+    - Now, a file must match at least one include pattern and no exclude patterns to be included
+    - This is a bug fix as include patterns are already documented to work this way
+- New token T_BITWISE_NOT added for the bitwise not operator
+    - This token was previously tokenized as T_NONE
+    - Any sniffs specifically looking for T_NONE tokens with a tilde as the contents must now also look for T_BITWISE_NOT
+    - Sniffs can continue looking for T_NONE as well as T_BITWISE_NOT to support older PHP_CodeSniffer versions
+- All types of binary casting are now tokenized as T_BINARY_CAST
+    - Previously, the 'b' in 'b"some string with $var"' would be a T_BINARY_CAST, but only when the string contained a var
+    - This change ensures the 'b' is always tokenized as T_BINARY_CAST
+    - This change also converts '(binary)' from T_STRING_CAST to T_BINARY_CAST
+    - Thanks to Juliette Reinders Folmer@jrfnl for the help with this patch
+- Array properties set inside a ruleset.xml file can now extend a previous value instead of always overwriting it
+    - e.g., if you include a ruleset that defines forbidden functions, can you now add to that list instead of having to   redefine it
+    - To use this feature, add extends="true" to the property tag
+        - e.g., property name="forbiddenFunctionNames" type="array" extend="true"
+    - Thanks to Michael Moravec@Majkl578 for the patch
+- If $XDG_CACHE_HOME is set and points to a valid directory, it will be used for caching instead of the system temp directory
+- PHPCBF now disables parallel running if you are passing content on STDIN
+    - Stops an error from being shown after the fixed output is printed
+- The progress report now shows files with tokenizer errors as skipped (S) instead of a warning (W)
+    - The tokenizer error is still displayed in reports as normal
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The Squiz standard now ensures there is no space between an increment/decrement operator and its variable
+- The File::getMethodProperties() method now includes a has_body array index in the return value
+    - FALSE if the method has no body (as with abstract and interface methods) or TRUE otherwise
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- The File::getTokensAsString() method now throws an exception if the $start param is invalid
+    - If the $length param is invalid, an empty string will be returned
+    - Stops an infinite loop when the function is passed invalid data
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added new Generic.CodeAnalysis.EmptyPHPStatement sniff
+    - Warns when it finds empty PHP open/close tag combinations or superfluous semicolons
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added new Generic.Formatting.SpaceBeforeCast sniff
+    - Ensures there is exactly 1 space before a type cast, unless the cast statement is indented or multi-line
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added new Generic.VersionControl.GitMergeConflict sniff
+    - Detects merge conflict artifacts left in files
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added Generic.WhiteSpace.IncrementDecrementSpacing sniff
+    - Ensures there is no space between the operator and the variable it applies to
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added PSR12.Functions.NullableTypeDeclaration sniff
+    - Ensures there is no space after the question mark in a nullable type declaration
+    - Thanks to Timo Schinkel@timoschinkel for the contribution
+- A number of sniffs have improved support for methods in anonymous classes
+    - These sniffs would often throw the same error twice for functions in nested classes
+    - Error messages have also been changed to be less confusing
+    - The full list of affected sniffs is:
+        - Generic.NamingConventions.CamelCapsFunctionName
+        - PEAR.NamingConventions.ValidFunctionName
+        - PSR1.Methods.CamelCapsMethodName
+        - PSR2.Methods.MethodDeclaration
+        - Squiz.Scope.MethodScope
+        - Squiz.Scope.StaticThisUsage
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.CodeAnalysis.UnusedFunctionParameter now only skips functions with empty bodies when the class implements an   interface
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.CodeAnalysis.UnusedFunctionParameter now has additional error codes to indicate where unused params were found
+    - The new error code prefixes are:
+        - FoundInExtendedClass: when the class extends another
+        - FoundInImplementedInterface: when the class implements an interface
+        - Found: used in all other cases, including closures
+    - The new error code suffixes are:
+        - BeforeLastUsed: the unused param was positioned before the last used param in the function signature
+        - AfterLastUsed: the unused param was positioned after the last used param in the function signature
+    - This makes the new error code list for this sniff:
+        - Found
+        - FoundBeforeLastUsed
+        - FoundAfterLastUsed
+        - FoundInExtendedClass
+        - FoundInExtendedClassBeforeLastUsed
+        - FoundInExtendedClassAfterLastUsed
+        - FoundInImplementedInterface
+        - FoundInImplementedInterfaceBeforeLastUsed
+        - FoundInImplementedInterfaceAfterLastUsed
+    - These errors code make it easier for specific cases to be ignored or promoted using a ruleset.xml file
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Generic.Classes.DuplicateClassName now inspects traits for duplicate names as well as classes and interfaces
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- Generic.Files.InlineHTML now ignores a BOM at the start of the file
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- Generic.PHP.CharacterBeforePHPOpeningTag now ignores a BOM at the start of the file
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- Generic.Formatting.SpaceAfterCast now has a setting to specify how many spaces are required after a type cast
+    - Default remains 1
+    - Override the "spacing" setting in a ruleset.xml file to change
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Formatting.SpaceAfterCast now has a setting to ignore newline characters after a type cast
+    - Default remains FALSE, so newlines are not allowed
+    - Override the "ignoreNewlines" setting in a ruleset.xml file to change
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Formatting.SpaceAfterNot now has a setting to specify how many spaces are required after a NOT operator
+    - Default remains 1
+    - Override the "spacing" setting in a ruleset.xml file to change
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Formatting.SpaceAfterNot now has a setting to ignore newline characters after the NOT operator
+    - Default remains FALSE, so newlines are not allowed
+    - Override the "ignoreNewlines" setting in a ruleset.xml file to change
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PEAR.Functions.FunctionDeclaration now checks spacing before the opening parenthesis of functions with no body
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- PEAR.Functions.FunctionDeclaration now enforces no space before the semicolon in functions with no body
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- PSR2.Classes.PropertyDeclaration now checks the order of property modifier keywords
+    - This is a rule that is documented in PSR-2 but was not enforced by the included PSR2 standard until now
+    - This sniff is also able to fix the order of the modifier keywords if they are incorrect
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PSR2.Methods.MethodDeclaration now checks method declarations inside traits
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- Squiz.Commenting.InlineComment now has better detection of comment block boundaries
+- Squiz.Classes.ClassFileName now checks that a trait name matches the filename
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- Squiz.Classes.SelfMemberReference now supports scoped declarations and anonymous classes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Classes.SelfMemberReference now fixes multiple errors at once, increasing fixer performance
+    - Thanks to Gabriel Ostrolucký@ostrolucky for the patch
+- Squiz.Functions.LowercaseFunctionKeywords now checks abstract and final prefixes, and auto-fixes errors
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Objects.ObjectMemberComma.Missing has been renamed to Squiz.Objects.ObjectMemberComma.Found
+    - The error is thrown when the comma is found but not required, so the error code was incorrect
+    - If you are referencing the old error code in a ruleset XML file, please use the new code instead
+    - If you wish to maintain backwards compatibility, you can provide rules for both the old and new codes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.ObjectOperatorSpacing is now more tolerant of parse errors
+- Squiz.WhiteSpace.ObjectOperatorSpacing now fixes errors more efficiently
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed bug #2109 : Generic.Functions.CallTimePassByReference false positive for bitwise and used in function argument
+- Fixed bug #2165 : Conflict between Squiz.Arrays.ArrayDeclaration and ScopeIndent sniffs when heredoc used in array
+- Fixed bug #2167 : Generic.WhiteSpace.ScopeIndent shows invalid error when scope opener indented inside inline HTML
+- Fixed bug #2178 : Generic.NamingConventions.ConstructorName matches methods in anon classes with same name as containing   class
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2190 : PEAR.Functions.FunctionCallSignature incorrect error when encountering trailing PHPCS annotation
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2194 : Generic.Whitespace.LanguageConstructSpacing should not be checking namespace operators
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2202 : Squiz.WhiteSpace.OperatorSpacing throws error for negative index when using curly braces for string   access
+    - Same issue fixed in Squiz.Formatting.OperatorBracket
+    - Thanks to Andreas Buchenrieder@anbuc for the patch
+- Fixed bug #2210 : Generic.NamingConventions.CamelCapsFunctionName not ignoring SoapClient __getCookies() method
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2211 : PSR2.Methods.MethodDeclaration gets confused over comments between modifier keywords
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2212 : FUNCTION and CONST in use groups being tokenised as T_FUNCTION and T_CONST
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- Fixed bug #2214 : File::getMemberProperties() is recognizing method params as properties
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2236 : Memory info measurement unit is Mb but probably should be MB
+- Fixed bug #2246 : CSS tokenizer does not tokenize class names correctly when they contain the string NEW
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2278 : Squiz.Operators.ComparisonOperatorUsage false positive when inline IF contained in parentheses
+    - Thanks to Arnout Boks@aboks for the patch
+- Fixed bug #2284 : Squiz.Functions.FunctionDeclarationArgumentSpacing removing type hint during fixing
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #2297 : Anonymous class not tokenized correctly when used as argument to another anon class
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+
+## 2.9.2 - 2018-11-08
+### Changed
+- PHPCS should now run under PHP 7.3 without deprecation warnings
+    - Thanks to Nick Wilde@NickDickinsonWilde for the patch
+
+### Fixed
+- Fixed bug #1496 : Squiz.Strings.DoubleQuoteUsage not unescaping dollar sign when fixing
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #1549 : Squiz.PHP.EmbeddedPhp fixer conflict with // comment before PHP close tag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1890 : Incorrect Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose error between catch and finally statements
+
+## 3.3.2 - 2018-09-24
+### Changed
+- Fixed a problem where the report cache was not being cleared when the sniffs inside a standard were updated
+- The info report (--report=info) now has improved formatting for metrics that span multiple lines
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The unit test runner now skips .bak files when looking for test cases
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The Squiz standard now ensures underscores are not used to indicate visibility of private members vars and methods
+    - Previously, this standard enforced the use of underscores
+- Generic.PHP.NoSilencedErrors error messages now contain a code snippet to show the context of the error
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Arrays.ArrayDeclaration no longer reports errors for a comma on a line new after a here/nowdoc
+    - Also stops a parse error being generated when auto-fixing
+    - The SpaceBeforeComma error message has been changed to only have one data value instead of two
+- Squiz.Commenting.FunctionComment no longer errors when trying to fix indents of multi-line param comments
+- Squiz.Formatting.OperatorBracket now correctly fixes statements that contain strings
+- Squiz.PHP.CommentedOutCode now ignores more @-style annotations and includes better comment block detection
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed a problem where referencing a relative file path in a ruleset XML file could add unnecessary sniff exclusions
+    - This didn't actually exclude anything, but caused verbose output to list strange exclusion rules
+- Fixed bug #2110 : Squiz.WhiteSpace.FunctionSpacing is removing indents from the start of functions when fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2115 : Squiz.Commenting.VariableComment not checking var types when the @var line contains a comment
+- Fixed bug #2120 : Tokenizer fails to match T_INLINE_ELSE when used after function call containing closure
+- Fixed bug #2121 : Squiz.PHP.DisallowMultipleAssignments false positive in while loop conditions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2127 : File::findExtendedClassName() doesn't support nested classes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2138 : Tokenizer detects wrong token for php ::class feature with spaces
+- Fixed bug #2143 : PSR2.Namespaces.UseDeclaration does not properly fix "use function" and "use const" statements
+    - Thanks to Chris Wilkinson@thewilkybarkid for the patch
+- Fixed bug #2144 : Squiz.Arrays.ArrayDeclaration does incorrect align calculation in array with cyrillic keys
+- Fixed bug #2146 : Zend.Files.ClosingTag removes closing tag from end of file without inserting a semicolon
+- Fixed bug #2151 : XML schema not updated with the new array property syntax
+
+## 3.3.1 - 2018-07-27
+### Removed
+- Support for HHVM has been dropped due to recent unfixed bugs and HHVM refocus on Hack only
+    - Thanks to Walt Sorensen@photodude and Juliette Reinders Folmer@jrfnl for helping to remove all HHVM exceptions from the core
+
+### Changed
+- The full report (the default report) now has improved word wrapping for multi-line messages and sniff codes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The summary report now sorts files based on their directory location instead of just a basic string sort
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The source report now orders error codes by name when they have the same number of errors
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The junit report no longer generates validation errors with the Jenkins xUnit plugin
+    - Thanks to Nikolay Geo@nicholascus for the patch
+- Generic.Commenting.DocComment no longer generates the SpacingBeforeTags error if tags are the first content in the docblock
+    - The sniff will still generate a MissingShort error if there is no short comment
+    - This allows the MissingShort error to be suppressed in a ruleset to make short descriptions optional
+- Generic.Functions.FunctionCallArgumentSpacing now properly fixes multi-line function calls with leading commas
+    - Previously, newlines between function arguments would be removed
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.Syntax will now use PHP_BINARY instead of trying to discover the executable path
+    - This ensures that the sniff will always syntax check files using the PHP version that PHPCS is running under
+    - Setting the php_path config var will still override this value as normal
+    - Thanks to Willem Stuursma-Ruwen@willemstuursma for the patch
+- PSR2.Namespaces.UseDeclaration now supports commas at the end of group use declarations
+    - Also improves checking and fixing for use statements containing parse errors
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Arrays.ArrayDeclaration no longer removes the array opening brace while fixing
+    - This could occur when the opening brace was on a new line and the first array key directly followed
+    - This change also stops the KeyNotAligned error message being incorrectly reported in these cases
+- Squiz.Arrays.ArrayDeclaration no longer tries to change multi-line arrays to single line when they contain comments
+    - Fixes a conflict between this sniff and some indentation sniffs
+- Squiz.Classes.ClassDeclaration no longer enforces spacing rules when a class is followed by a function
+    - Fixes a conflict between this sniff and the Squiz.WhiteSpace.FunctionSpacing sniff
+- The Squiz.Classes.ValidClassName.NotCamelCaps message now references PascalCase instead of CamelCase
+    - The "CamelCase class name" metric produced by the sniff has been changed to "PascalCase class name"
+    - This reflects the fact that the class name check is actually a Pascal Case check and not really Camel Case
+    - Thanks to Tom H Anderson@TomHAnderson for the patch
+- Squiz.Commenting.InlineComment no longer enforces spacing rules when an inline comment is followed by a docblock
+    - Fixes a conflict between this sniff and the Squiz.WhiteSpace.FunctionSpacing sniff
+- Squiz.WhiteSpace.OperatorSpacing no longer tries to fix operator spacing if the next content is a comment on a new line
+    - Fixes a conflict between this sniff and the Squiz.Commenting.PostStatementComment sniff
+    - Also stops PHPCS annotations from being moved to a different line, potentially changing their meaning
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.FunctionSpacing no longer checks spacing of functions at the top of an embedded PHP block
+    - Fixes a conflict between this sniff and the Squiz.PHP.EmbeddedPHP sniff
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.MemberVarSpacing no longer checks spacing before member vars that come directly after methods
+    - Fixes a conflict between this sniff and the Squiz.WhiteSpace.FunctionSpacing sniff
+- Squiz.WhiteSpace.SuperfluousWhitespace now recognizes unicode whitespace at the start and end of a file
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed bug #2029 : Squiz.Scope.MemberVarScope throws fatal error when a property is found in an interface
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2047 : PSR12.Classes.ClassInstantiation false positive when instantiating class from array index
+- Fixed bug #2048 : GenericFormatting.MultipleStatementAlignment false positive when assigning values inside an array
+- Fixed bug #2053 : PSR12.Classes.ClassInstantiation incorrectly fix when using member vars and some variable formats
+- Fixed bug #2065 : Generic.ControlStructures.InlineControlStructure fixing fails when inline control structure contains closure
+- Fixed bug #2072 : Squiz.Arrays.ArrayDeclaration throws NoComma error when array value is a shorthand IF statement
+- Fixed bug #2082 : File with "defined() or define()" syntax triggers PSR1.Files.SideEffects.FoundWithSymbols
+- Fixed bug #2095 : PSR2.Namespaces.NamespaceDeclaration does not handle namespaces defined over multiple lines
+
+## 3.3.0 - 2018-06-07
+### Deprecated
+- The Squiz.WhiteSpace.LanguageConstructSpacing sniff has been deprecated and will be removed in version 4
+    - The sniff has been moved to the Generic standard, with a new code of Generic.WhiteSpace.LanguageConstructSpacing
+    - As soon as possible, replace all instances of the old sniff code with the new sniff code in your ruleset.xml files
+        - The existing Squiz sniff will continue to work until version 4 has been released
+    - The new Generic sniff now also checks many more language constructs to enforce additional spacing rules
+        - Thanks to Mponos George@gmponos for the contribution
+- The current method for setting array properties in ruleset files has been deprecated and will be removed in version 4
+    - Currently, setting an array value uses the string syntax "print=>echo,create_function=>null"
+    - Now, individual array elements are specified using a new "element" tag with "key" and "value" attributes
+        - For example, element key="print" value="echo"
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- The T_ARRAY_HINT token has been deprecated and will be removed in version 4
+    - The token was used to ensure array type hints were not tokenized as T_ARRAY, but no other type hints were given a special token
+    - Array type hints now use the standard T_STRING token instead
+    - Sniffs referencing this token type will continue to run without error until version 4, but will not find any T_ARRAY_HINT tokens
+- The T_RETURN_TYPE token has been deprecated and will be removed in version 4
+    - The token was used to ensure array/self/parent/callable return types were tokenized consistently
+    - For namespaced return types, only the last part of the string (the class name) was tokenized as T_RETURN_TYPE
+    - This was not consistent and so return types are now left using their original token types so they are not skipped by sniffs
+        - The exception are array return types, which are tokenized as T_STRING instead of T_ARRAY, as they are for type hints
+    - Sniffs referencing this token type will continue to run without error until version 4, but will not find any T_RETUTN_TYPE tokens
+    - To get the return type of a function, use the File::getMethodProperties() method, which now contains a "return_type" array index
+        - This contains the return type of the function or closer, or a blank string if not specified
+        - If the return type is nullable, the return type will contain the leading ?
+            - A nullable_return_type array index in the return value will also be set to true
+        - If the return type contains namespace information, it will be cleaned of whitespace and comments
+            - To access the original return value string, use the main tokens array
+
+### Added
+- This release contains an incomplete version of the PSR-12 coding standard
+    - Errors found using this standard should be valid, but it will miss a lot of violations until it is complete
+    - If you'd like to test and help, you can use the standard by running PHPCS with --standard=PSR12
+
+### Changed
+- Config values set using --runtime-set now override any config values set in rulesets or the CodeSniffer.conf file
+- You can now apply include-pattern rules to individual message codes in a ruleset like you can with exclude-pattern rules
+    - Previously, include-pattern rules only applied to entire sniffs
+    - If a message code has both include and exclude patterns, the exclude patterns will be ignored
+- Using PHPCS annotations to selectively re-enable sniffs is now more flexible
+    - Previously, you could only re-enable a sniff/category/standard using the exact same code that was disabled
+    - Now, you can disable a standard and only re-enable a specific category or sniff
+    - Or, you can disable a specific sniff and have it re-enable when you re-enable the category or standard
+- The value of array sniff properties can now be set using phpcs:set annotations
+    - e.g., phpcs:set Standard.Category.SniffName property key=>value,key2=>value2
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- PHPCS annotations now remain as T_PHPCS_* tokens instead of reverting to comment tokens when --ignore-annotations is used
+    - This stops sniffs (especially commenting sniffs) from generating a large number of false errors when ignoring
+    - Any custom sniffs that are using the T_PHPCS_* tokens to detect annotations may need to be changed to ignore them
+        - Check $phpcsFile->config->annotations to see if annotations are enabled and ignore when false
+- You can now use fully or partially qualified class names for custom reports instead of absolute file paths
+    - To support this, you must specify an autoload file in your ruleset.xml file and use it to register an autoloader
+    - Your autoloader will need to load your custom report class when requested
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The JSON report format now does escaping in error source codes as well as error messages
+    - Thanks to Martin Vasel@marvasDE for the patch
+- Invalid installed_paths values are now ignored instead of causing a fatal error
+- Improved testability of custom rulesets by allowing the installed standards to be overridden
+    - Thanks to Timo Schinkel@timoschinkel for the patch
+- The key used for caching PHPCS runs now includes all set config values
+    - This fixes a problem where changing config values (e.g., via --runtime-set) used an incorrect cache file
+- The "Function opening brace placement" metric has been separated into function and closure metrics in the info report
+    - Closures are no longer included in the "Function opening brace placement" metric
+    - A new "Closure opening brace placement" metric now shows information for closures
+- Multi-line T_YIELD_FROM statements are now replicated properly for older PHP versions
+- The PSR2 standard no longer produces 2 error messages when the AS keyword in a foreach loop is not lowercase
+- Specifying a path to a non-existent dir when using the --report-reportType=/path/to/report CLI option no longer throws an exception
+    - This now prints a readable error message, as it does when using --report-file
+- The File::getMethodParamaters() method now includes a type_hint_token array index in the return value
+    - Provides the position in the token stack of the first token in the type hint
+- The File::getMethodProperties() method now includes a return_type_token array index in the return value
+    - Provides the position in the token stack of the first token in the return type
+- The File::getTokensAsString() method can now optionally return original (non tab-replaced) content
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Removed Squiz.PHP.DisallowObEndFlush from the Squiz standard
+    - If you use this sniff and want to continue banning ob_end_flush(), use Generic.PHP.ForbiddenFunctions instead
+    - You will need to set the forbiddenFunctions property in your ruleset.xml file
+- Removed Squiz.PHP.ForbiddenFunctions from the Squiz standard
+    - Replaced by using the forbiddenFunctions property of Generic.PHP.ForbiddenFunctions in the Squiz ruleset.xml
+    - Functionality of the Squiz standard remains the same, but the error codes are now different
+    - Previously, Squiz.PHP.ForbiddenFunctions.Found and Squiz.PHP.ForbiddenFunctions.FoundWithAlternative
+    - Now, Generic.PHP.ForbiddenFunctions.Found and Generic.PHP.ForbiddenFunctions.FoundWithAlternative
+- Added new Generic.PHP.LowerCaseType sniff
+    - Ensures PHP types used for type hints, return types, and type casting are lowercase
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added new Generic.WhiteSpace.ArbitraryParenthesesSpacing sniff
+    - Generates an error for whitespace inside parenthesis that don't belong to a function call/declaration or control structure
+    - Generates a warning for any empty parenthesis found
+    - Allows the required spacing to be set using the spacing sniff property (default is 0)
+    - Allows newlines to be used by setting the ignoreNewlines sniff property (default is false)
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added new PSR12.Classes.ClassInstantiation sniff
+    - Ensures parenthesis are used when instantiating a new class
+- Added new PSR12.Keywords.ShortFormTypeKeywords sniff
+    - Ensures the short form of PHP types is used when type casting
+- Added new PSR12.Namespaces.CompundNamespaceDepth sniff
+    - Ensures compound namespace use statements have a max depth of 2 levels
+    - The max depth can be changed by setting the 'maxDepth' sniff property in a ruleset.xml file
+- Added new PSR12.Operators.OperatorSpacing sniff
+    - Ensures operators are preceded and followed by at least 1 space
+- Improved core support for grouped property declarations
+    - Also improves support in Squiz.WhiteSpace.ScopeKeywordSpacing and Squiz.WhiteSpace.MemberVarSpacing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Commenting.DocComment now produces a NonParamGroup error when tags are mixed in with the @param tag group
+    - It would previously throw either a NonParamGroup or ParamGroup error depending on the order of tags
+    - This change allows the NonParamGroup error to be suppressed in a ruleset to allow the @param group to contain other tags
+    - Thanks to Phil Davis@phil-davis for the patch
+- Generic.Commenting.DocComment now continues checks param tags even if the doc comment short description is missing
+    - This change allows the MissingShort error to be suppressed in a ruleset without all other errors being suppressed as well
+    - Thanks to Phil Davis@phil-davis for the patch
+- Generic.CodeAnalysis.AssignmentInCondition now reports a different error code for assignments found in WHILE conditions
+    - The return value of a function call is often assigned in a WHILE condition, so this change makes it easier to exclude these cases
+    - The new code for this error message is Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
+    - The error code for all other cases remains as Generic.CodeAnalysis.AssignmentInCondition.Found
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Functions.OpeningFunctionBraceBsdAllman now longer leaves trailing whitespace when moving the opening brace during fixing
+    - Also applies to fixes made by PEAR.Functions.FunctionDeclaration and Squiz.Functions.MultiLineFunctionDeclaration
+- Generic.WhiteSpace.ScopeIndent now does a better job of fixing the indent of multi-line comments
+- Generic.WhiteSpace.ScopeIndent now does a better job of fixing the indent of PHP open and close tags
+- PEAR.Commenting.FunctionComment now report a different error code for param comment lines with too much padding
+    - Previously, any lines of a param comment that don't start at the exact comment position got the same error code
+    - Now, only comment lines with too little padding use ParamCommentAlignment as they are clearly mistakes
+    - Comment lines with too much padding may be using precision alignment as now use ParamCommentAlignmentExceeded
+    - This allows for excessive padding to be excluded from a ruleset while continuing to enforce a minimum padding
+- PEAR.WhiteSpace.ObjectOperatorIndent now checks the indent of more chained operators
+    - Previously, it only checked chains beginning with a variable
+    - Now, it checks chains beginning with function calls, static class names, etc
+- Squiz.Arrays.ArrayDeclaration now continues checking array formatting even if the key indent is not correct
+    - Allows for using different array indent rules while still checking/fixing double arrow and value alignment
+- Squiz.Commenting.BlockComment has improved support for tab-indented comments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.BlockComment auto fixing no longer breaks when two block comments follow each other
+    - Also stopped single-line block comments from being auto fixed when they are embedded in other code
+    - Also fixed as issue found when PHPCS annotations were used inside a block comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.BlockComment.LastLineIndent is now able to be fixed with phpcbf
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.BlockComment now aligns star-prefixed lines under the opening tag while fixing, instead of indenting them
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.FunctionComment.IncorrectTypeHint message no longer contains cut-off suggested type hints
+- Squiz.Commenting.InlineComment now uses a new error code for inline comments at the end of a function
+    - Previously, all inline comments followed by a blank line threw a Squiz.Commenting.InlineComment.SpacingAfter error
+    - Now, inline comments at the end of a function will instead throw Squiz.Commenting.InlineComment.SpacingAfterAtFunctionEnd
+    - If you previously excluded SpacingAfter, add an exclusion for SpacingAfterAtFunctionEnd to your ruleset as well
+    - If you previously only included SpacingAfter, consider including SpacingAfterAtFunctionEnd as well
+    - The Squiz standard now excludes SpacingAfterAtFunctionEnd as the blank line is checked elsewhere
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.ControlStructures.ControlSignature now errors when a comment follows the closing brace of an earlier body
+    - Applies to catch, finally, else, elseif, and do/while structures
+    - The included PSR2 standard now enforces this rule
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Formatting.OperatorBracket.MissingBrackets message has been changed to remove the word "arithmetic"
+    - The sniff checks more than just arithmetic operators, so the message is now clearer
+- Sniffs.Operators.ComparisonOperatorUsage now detects more cases of implicit true comparisons
+    - It could previously be confused by comparisons used as function arguments
+- Squiz.PHP.CommentedOutCode now ignores simple @-style annotation comments so they are not flagged as commented out code
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.PHP.CommentedOutCode now ignores a greater number of short comments so they are not flagged as commented out code
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.PHP.DisallowComparisonAssignment no longer errors when using the null coalescing operator
+    - Given this operator is used almost exclusively to assign values, it didn't make sense to generate an error
+- Squiz.WhiteSpacing.FunctionSpacing now has a property to specify how many blank lines should be before the first class method
+    - Only applies when a method is the first code block in a class (i.e., there are no member vars before it)
+    - Override the 'spacingBeforeFirst' property in a ruleset.xml file to change
+    - If not set, the sniff will use whatever value is set for the existing 'spacing' property
+- Squiz.WhiteSpacing.FunctionSpacing now has a property to specify how many blank lines should be after the last class method
+    - Only applies when a method is the last code block in a class (i.e., there are no member vars after it)
+    - Override the 'spacingAfterLast' property in a ruleset.xml file to change
+    - If not set, the sniff will use whatever value is set for the existing 'spacing' property
+
+### Fixed
+- Fixed bug #1863 : File::findEndOfStatement() not working when passed a scope opener
+- Fixed bug #1876 : PSR2.Namespaces.UseDeclaration not giving error for use statements before the namespace declaration
+    - Adds a new PSR2.Namespaces.UseDeclaration.UseBeforeNamespace error message
+- Fixed bug #1881 : Generic.Arrays.ArrayIndent is indenting sub-arrays incorrectly when comma not used after the last value
+- Fixed bug #1882 : Conditional with missing braces confused by indirect variables
+- Fixed bug #1915 : JS tokenizer fails to tokenize regular expression proceeded by boolean not operator
+- Fixed bug #1920 : Directory exclude pattern improperly excludes files with names that start the same
+    - Thanks to Jeff Puckett@jpuck for the patch
+- Fixed bug #1922 : Equal sign alignment check broken when list syntax used before assignment operator
+- Fixed bug #1925 : Generic.Formatting.MultipleStatementAlignment skipping assignments within closures
+- Fixed bug #1931 : Generic opening brace placement sniffs do not correctly support function return types
+- Fixed bug #1932 : Generic.ControlStructures.InlineControlStructure fixer moves new PHPCS annotations
+- Fixed bug #1938 : Generic opening brace placement sniffs incorrectly move PHPCS annotations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1939 : phpcs:set annotations do not cause the line they are on to be ignored
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1949 : Squiz.PHP.DisallowMultipleAssignments false positive when using namespaces with static assignments
+- Fixed bug #1959 : SquizMultiLineFunctionDeclaration error when param has trailing comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1963 : Squiz.Scope.MemberVarScope does not work for multiline member declaration
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1971 : Short array list syntax not correctly tokenized if short array is the first content in a file
+- Fixed bug #1979 : Tokenizer does not change heredoc to nowdoc token if the start tag contains spaces
+- Fixed bug #1982 : Squiz.Arrays.ArrayDeclaration fixer sometimes puts a comma in front of the last array value
+- Fixed bug #1993 : PSR1/PSR2 not reporting or fixing short open tags
+- Fixed bug #1996 : Custom report paths don't work on case-sensitive filesystems
+- Fixed bug #2006 : Squiz.Functions.FunctionDeclarationArgumentSpacing fixer removes comment between parens when no args
+    - The SpacingAfterOpenHint error message has been removed
+        - It is replaced by the the existing SpacingAfterOpen message
+    - The error message format for the SpacingAfterOpen and SpacingBeforeClose messages has been changed
+        - These used to contain 3 pieces of data, but now only contain 2
+    - If you have customised the error messages of this sniff, please review your ruleset after upgrading
+- Fixed bug #2018 : Generic.Formatting.MultipleStatementAlignment does see PHP close tag as end of statement block
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #2027 : PEAR.NamingConventions.ValidFunctionName error when function name includes double underscore
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.2.3 - 2018-02-21
+### Changed
+- The new phpcs: comment syntax can now be prefixed with an at symbol ( @phpcs: )
+    - This restores the behaviour of the previous syntax where these comments are ignored by doc generators
+- The current PHP version ID is now used to generate cache files
+    - This ensures that only cache files generated by the current PHP version are selected
+    - This change fixes caching issues when using sniffs that produce errors based on the current PHP version
+- A new Tokens::$phpcsCommentTokens array is now available for sniff developers to detect phpcs: comment syntax
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The PEAR.Commenting.FunctionComment.Missing error message now includes the name of the function
+    - Thanks to Yorman Arias@cixtor for the patch
+- The PEAR.Commenting.ClassComment.Missing and Squiz.Commenting.ClassComment.Missing error messages now include the name of the class
+    - Thanks to Yorman Arias@cixtor for the patch
+- PEAR.Functions.FunctionCallSignature now only forces alignment at a specific tab stop while fixing
+    - It was enforcing this during checking, but this meant invalid errors if the OpeningIndent message was being muted
+    - This fixes incorrect errors when using the PSR2 standard with some code blocks
+- Generic.Files.LineLength now ignores lines that only contain phpcs: annotation comments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Formatting.MultipleStatementAlignment now skips over arrays containing comments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.Syntax now forces display_errors to ON when linting
+    - Thanks to Raúl Arellano@raul338 for the patch
+- PSR2.Namespaces.UseDeclaration has improved syntax error handling and closure detection
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.PHP.CommentedOutCode now has improved comment block detection for improved accuracy
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.PHP.NonExecutableCode could fatal error while fixing file with syntax error
+- Squiz.PHP.NonExecutableCode now detects unreachable code after a goto statement
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.LanguageConstructSpacing has improved syntax error handling while fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Improved phpcs: annotation syntax handling for a number of sniffs
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Improved auto-fixing of files with incomplete comment blocks for various commenting sniffs
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed test suite compatibility with PHPUnit 7
+- Fixed bug #1793 : PSR2 forcing exact indent for function call opening statements
+- Fixed bug #1803 : Squiz.WhiteSpace.ScopeKeywordSpacing removes member var name while fixing if no space after scope keyword
+- Fixed bug #1817 : Blank line not enforced after control structure if comment on same line as closing brace
+- Fixed bug #1827 : A phpcs:enable comment is not tokenized correctly if it is outside a phpcs:disable block
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1828 : Squiz.WhiteSpace.SuperfluousWhiteSpace ignoreBlankLines property ignores whitespace after single line comments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1840 : When a comment has too many asterisks, phpcbf gives FAILED TO FIX error
+- Fixed bug #1867 : Cant use phpcs:ignore where the next line is HTML
+- Fixed bug #1870 : Invalid warning in multiple assignments alignment with closure or anon class
+- Fixed bug #1890 : Incorrect Squiz.WhiteSpace.ControlStructureSpacing.NoLineAfterClose error between catch and finally statements
+- Fixed bug #1891 : Comment on last USE statement causes false positive for PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse
+    - Thanks to Matt Coleman@iammattcoleman, Daniel Hensby@dhensby, and Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1901 : Fixed PHPCS annotations in multi-line tab-indented comments + not ignoring whole line for phpcs:set
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.2.2 - 2017-12-20
+### Changed
+- Disabled STDIN detection on Windows
+    - This fixes a problem with IDE plugins (e.g., PHPStorm) hanging on Windows
+
+## 3.2.1 - 2017-12-18
+### Changed
+- Empty diffs are no longer followed by a newline character (request #1781)
+- Generic.Functions.OpeningFunctionBraceKernighanRitchie no longer complains when the open brace is followed by a close tag
+    - This makes the sniff more useful when used in templates
+    - Thanks to Joseph Zidell@josephzidell for the patch
+
+### Fixed
+- Fixed problems with some scripts and plugins waiting for STDIN
+    - This was a notable problem with IDE plugins (e.g., PHPStorm) and build systems
+- Fixed bug #1782 : Incorrect detection of operator in ternary + anonymous function
+
+## 3.2.0 - 2017-12-13
+### Deprecated
+- This release deprecates the @codingStandards comment syntax used for sending commands to PHP_CodeSniffer
+    - The existing syntax will continue to work in all version 3 releases, but will be removed in version 4
+    - The comment formats have been replaced by a shorter syntax:
+        - @codingStandardsIgnoreFile becomes phpcs:ignoreFile
+        - @codingStandardsIgnoreStart becomes phpcs:disable
+        - @codingStandardsIgnoreEnd becomes phpcs:enable
+        - @codingStandardsIgnoreLine becomes phpcs:ignore
+        - @codingStandardsChangeSetting becomes phpcs:set
+    - The new syntax allows for additional developer comments to be added after a -- separator
+        - This is useful for describing why a code block is being ignored, or why a setting is being changed
+        - E.g., phpcs:disable -- This code block must be left as-is.
+    - Comments using the new syntax are assigned new comment token types to allow them to be detected:
+        - phpcs:ignoreFile has the token T_PHPCS_IGNORE_FILE
+        - phpcs:disable has the token T_PHPCS_DISABLE
+        - phpcs:enable has the token T_PHPCS_ENABLE
+        - phpcs:ignore has the token T_PHPCS_IGNORE
+        - phpcs:set has the token T_PHPCS_SET
+
+### Changed
+- The phpcs:disable and phpcs:ignore comments can now selectively ignore specific sniffs (request #604)
+    - E.g., phpcs:disable Generic.Commenting.Todo.Found for a specific message
+    - E.g., phpcs:disable Generic.Commenting.Todo for a whole sniff
+    - E.g., phpcs:disable Generic.Commenting for a whole category of sniffs
+    - E.g., phpcs:disable Generic for a whole standard
+    - Multiple sniff codes can be specified by comma separating them
+        - E.g., phpcs:disable Generic.Commenting.Todo,PSR1.Files
+- @codingStandardsIgnoreLine comments now only ignore the following line if they are on a line by themselves
+    - If they are at the end of an existing line, they will only ignore the line they are on
+    - Stops some lines from accidentally being ignored
+    - Same rule applies for the new phpcs:ignore comment syntax
+- PSR1.Files.SideEffects now respects the new phpcs:disable comment syntax
+    - The sniff will no longer check any code that is between phpcs:disable and phpcs:enable comments
+    - The sniff does not support phpcs:ignore; you must wrap code structures with disable/enable comments
+    - Previously, there was no way to have this sniff ignore parts of a file
+- Fixed a problem where PHPCS would sometimes hang waiting for STDIN, or read incomplete versions of large files
+    - Thanks to Arne Jørgensen@arnested for the patch
+- Array properties specified in ruleset files now have their keys and values trimmed
+    - This saves having to do this in individual sniffs and stops errors introduced by whitespace in rulesets
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added phpcs.xsd to allow validation of ruleset XML files
+    - Thanks to Renaat De Muynck@renaatdemuynck for the contribution
+- File paths specified using --stdin-path can now point to fake file locations (request #1488)
+    - Previously, STDIN files using fake file paths were excluded from checking
+- Setting an empty basepath (--basepath=) on the CLI will now clear a basepath set directly in a ruleset
+    - Thanks to Xaver Loppenstedt@xalopp for the patch
+- Ignore patterns are now checked on symlink target paths instead of symlink source paths
+    - Restores previous behaviour of this feature
+- Metrics were being double counted when multiple sniffs were recording the same metric
+- Added support for bash process substitution
+    - Thanks to Scott Dutton@exussum12 for the contribution
+- Files included in the cache file code hash are now sorted to aid in cache file reuse across servers
+- Windows BAT files can now be used outside a PEAR install
+    - You must have the path to PHP set in your PATH environment variable
+    - Thanks to Joris Debonnet@JorisDebonnet for the patch
+- The JS unsigned right shift assignment operator is now properly classified as an assignment operator
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The AbstractVariableSniff abstract sniff now supports anonymous classes and nested functions
+    - Also fixes an issue with Squiz.Scope.MemberVarScope where member vars of anonymous classes were not being checked
+- Added AbstractArraySniff to make it easier to create sniffs that check array formatting
+    - Allows for checking of single and multi line arrays easily
+    - Provides a parsed structure of the array including positions of keys, values, and double arrows
+- Added Generic.Arrays.ArrayIndent to enforce a single tab stop indent for array keys in multi-line arrays
+    - Also ensures the close brace is on a new line and indented to the same level as the original statement
+    - Allows for the indent size to be set using an "indent" property of the sniff
+- Added Generic.PHP.DiscourageGoto to warn about the use of the GOTO language construct
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Generic.Debug.ClosureLinter was not running the gjslint command
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Generic.WhiteSpace.DisallowSpaceIndent now fixes space indents in multi-line block comments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.WhiteSpace.DisallowSpaceIndent now fixes mixed space/tab indents more accurately
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.WhiteSpace.DisallowTabIndent now fixes tab indents in multi-line block comments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PEAR.Functions.FunctionDeclaration no longer errors when a function declaration is the first content in a JS file
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PEAR.Functions.FunctionCallSignature now requires the function name to be indented to an exact tab stop
+    - If the function name is not the start of the statement, the opening statement must be indented correctly instead
+    - Added a new fixable error code PEAR.Functions.FunctionCallSignature.OpeningIndent for this error
+- Squiz.Functions.FunctionDeclarationArgumentSpacing is no longer confused about comments in function declarations
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.PHP.NonExecutableCode error messages now indicate which line the code block ending is on
+    - Makes it easier to identify where the code block exited or returned
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.FunctionComment now supports nullable type hints
+- Squiz.Commenting.FunctionCommentThrowTag no longer assigns throw tags inside anon classes to the enclosing function
+- Squiz.WhiteSpace.SemicolonSpacing now ignores semicolons used for empty statements inside FOR conditions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.ControlStructures.ControlSignature now allows configuring the number of spaces before the colon in alternative syntax
+    - Override the 'requiredSpacesBeforeColon' setting in a ruleset.xml file to change
+    - Default remains at 1
+    - Thanks to Nikola Kovacs@nkovacs for the patch
+- The Squiz standard now ensures array keys are indented 4 spaces from the main statement
+    - Previously, this standard aligned keys 1 space from the start of the array keyword
+- The Squiz standard now ensures array end braces are aligned with the main statement
+    - Previously, this standard aligned the close brace with the start of the array keyword
+- The standard for PHP_CodeSniffer itself now enforces short array syntax
+- The standard for PHP_CodeSniffer itself now uses the Generic.Arrays/ArrayIndent sniff rules
+- Improved fixer conflicts and syntax error handling for a number of sniffs
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed bug #1462 : Error processing cyrillic strings in Tokenizer
+- Fixed bug #1573 : Squiz.WhiteSpace.LanguageConstructSpacing does not properly check for tabs and newlines
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #1590 : InlineControlStructure CBF issue while adding braces to an if thats returning a nested function
+- Fixed bug #1718 : Unclosed strings at EOF sometimes tokenized as T_WHITESPACE by the JS tokenizer
+- Fixed bug #1731 : Directory exclusions do not work as expected when a single file name is passed to phpcs
+- Fixed bug #1737 : Squiz.CSS.EmptyStyleDefinition sees comment as style definition and fails to report error
+- Fixed bug #1746 : Very large reports can sometimes become garbled when using the parallel option
+- Fixed bug #1747 : Squiz.Scope.StaticThisUsage incorrectly looking inside closures
+- Fixed bug #1757 : Unknown type hint "object" in Squiz.Commenting.FunctionComment
+- Fixed bug #1758 : PHPCS gets stuck creating file list when processing circular symlinks
+- Fixed bug #1761 : Generic.WhiteSpace.ScopeIndent error on multi-line function call with static closure argument
+- Fixed bug #1762 : Generic.WhiteSpace.DisallowSpace/TabIndent not inspecting content before open tag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1769 : Custom "define" function triggers a warning about declaring new symbols
+- Fixed bug #1776 : Squiz.Scope.StaticThisUsage incorrectly looking inside anon classes
+- Fixed bug #1777 : Generic.WhiteSpace.ScopeIndent incorrect indent errors when self called function proceeded by comment
+
+## 3.1.1 - 2017-10-17
+### Changed
+- Restored preference of non-dist files over dist files for phpcs.xml and phpcs.xml.dist
+    - The order that the files are searched is now: .phpcs.xml, phpcs.xml, .phpcs.xml.dist, phpcs.xml.dist
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Progress output now correctly shows skipped files
+- Progress output now shows 100% when the file list has finished processing (request #1697)
+- Stopped some IDEs complaining about testing class aliases
+    - Thanks to Vytautas Stankus@svycka for the patch
+- Squiz.Commenting.InlineComment incorrectly identified comment blocks in some cases, muting some errors
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+### Fixed
+- Fixed bug #1512 : PEAR.Functions.FunctionCallSignature enforces spaces when no arguments if required spaces is not 0
+- Fixed bug #1522 : Squiz Arrays.ArrayDeclaration and Strings.ConcatenationSpacing fixers causing parse errors with here/  nowdocs
+- Fixed bug #1570 : Squiz.Arrays.ArrayDeclaration fixer removes comments between array keyword and open parentheses
+- Fixed bug #1604 : File::isReference has problems with some bitwise operators and class property references
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1645 : Squiz.Commenting.InlineComment will fail to fix comments at the end of the file
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1656 : Using the --sniffs argument has a problem with case sensitivity
+- Fixed bug #1657 : Uninitialized string offset: 0 when sniffing CSS
+- Fixed bug #1669 : Temporary expression proceeded by curly brace is detected as function call
+- Fixed bug #1681 : Huge arrays are super slow to scan with Squiz.Arrays.ArrayDeclaration sniff
+- Fixed bug #1694 : Squiz.Arrays.ArrayBracketSpacing is removing some comments during fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1702 : Generic.WhiteSpaceDisallowSpaceIndent fixer bug when line only contains superfluous whitespace
+
+## 3.1.0 - 2017-09-20
+### Changed
+- This release includes a change to support newer versions of PHPUnit (versions 4, 5, and 6 are now supported)
+    - The custom PHP_CodeSniffer test runner now requires a bootstrap file
+    - Developers with custom standards using the PHP_CodeSniffer test runner will need to do one of the following:
+      - run your unit tests from the PHP_CodeSniffer root dir so the bootstrap file is included
+      - specify the PHP_CodeSniffer bootstrap file on the command line: phpunit --bootstrap=/path/to/phpcs/tests/bootstrap.php
+      - require the PHP_CodeSniffer bootstrap file from your own bootstrap file
+    - If you don't run PHP_CodeSniffer unit tests, this change will not affect you
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- A phpcs.xml or phpcs.xml.dist file now takes precedence over the default_standard config setting
+    - Thanks to Björn Fischer@Fischer-Bjoern for the patch
+- Both phpcs.xml and phpcs.xml.dist files can now be prefixed with a dot (request #1566)
+    - The order that the files are searched is: .phpcs.xml, .phpcs.xml.dist, phpcs.xml, phpcs.xml.dist
+- The autoloader will now search for files during unit tests runs from the same locations as during normal phpcs runs
+    - Allows for easier unit testing of custom standards that use helper classes or custom namespaces
+- Include patterns for sniffs now use OR logic instead of AND logic
+    - Previously, a file had to be in each of the include patterns to be processed by a sniff
+    - Now, a file has to only be in at least one of the patterns
+    - This change reflects the original intention of the feature
+- PHPCS will now follow symlinks under the list of checked directories
+    - This previously only worked if you specified the path to a symlink on the command line
+- Output from --config-show, --config-set, and --config-delete now includes the path to the loaded config file
+- PHPCS now cleanly exits if its config file is not readable
+    - Previously, a combination of PHP notices and PHPCS errors would be generated
+- Comment tokens that start with /** are now always tokenized as docblocks
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- The PHP-supplied T_YIELD and T_YIELD_FROM token have been replicated for older PHP versions
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Added new Generic.CodeAnalysis.AssignmentInCondition sniff to warn about variable assignments inside conditions
+    - Thanks to Juliette Reinders Folmer@jrfnl for the contribution
+- Added Generic.Files.OneObjectStructurePerFile sniff to ensure there is a single class/interface/trait per file
+    - Thanks to Mponos George@gmponos for the contribution
+- Function call sniffs now check variable function names and self/static object creation
+    - Specific sniffs are Generic.Functions.FunctionCallArgumentSpacing, PEAR.Functions.FunctionCallSignature, and   PSR2.Methods.FunctionCallSignature
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Generic.Files.LineLength can now be configured to ignore all comment lines, no matter their length
+    - Set the ignoreComments property to TRUE (default is FALSE) in your ruleset.xml file to enable this
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.LowerCaseKeyword now checks self, parent, yield, yield from, and closure (function) keywords
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- PEAR.Functions.FunctionDeclaration now removes a blank line if it creates one by moving the curly brace during fixing
+- Squiz.Commenting.FunctionCommentThrowTag now supports PHP 7.1 multi catch exceptions
+- Squiz.Formatting.OperatorBracket no longer throws errors for PHP 7.1 multi catch exceptions
+- Squiz.Commenting.LongConditionClosingComment now supports finally statements
+- Squiz.Formatting.OperatorBracket now correctly fixes pipe separated flags
+- Squiz.Formatting.OperatorBracket now correctly fixes statements containing short array syntax
+- Squiz.PHP.EmbeddedPhp now properly fixes cases where the only content in an embedded PHP block is a comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.ControlStructureSpacing now ignores comments when checking blank lines at the top of control structures
+- Squiz.WhiteSpace.ObjectOperatorSpacing now detects and fixes spaces around double colons
+    - Thanks to Julius Šmatavičius@bondas83 for the patch
+- Squiz.WhiteSpace.MemberVarSpacing can now be configured to check any number of blank lines between member vars
+    - Set the spacing property (default is 1) in your ruleset.xml file to set the spacing
+- Squiz.WhiteSpace.MemberVarSpacing can now be configured to check a different number of blank lines before the first member var
+    - Set the spacingBeforeFirst property (default is 1) in your ruleset.xml file to set the spacing
+- Added a new PHP_CodeSniffer\Util\Tokens::$ooScopeTokens static member var for quickly checking object scope
+    - Includes T_CLASS, T_ANON_CLASS, T_INTERFACE, and T_TRAIT
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PHP_CodeSniffer\Files\File::findExtendedClassName() now supports extended interfaces
+    - Thanks to Martin Hujer@mhujer for the patch
+
+### Fixed
+- Fixed bug #1550 : Squiz.Commenting.FunctionComment false positive when function contains closure
+- Fixed bug #1577 : Generic.InlineControlStructureSniff breaks with a comment between body and condition in do while loops
+- Fixed bug #1581 : Sniffs not loaded when one-standard directories are being registered in installed_paths
+- Fixed bug #1591 : Autoloader failing to load arbitrary files when installed_paths only set via a custom ruleset
+- Fixed bug #1605 : Squiz.WhiteSpace.OperatorSpacing false positive on unary minus after comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1615 : Uncaught RuntimeException when phpcbf fails to fix files
+- Fixed bug #1637 : Generic.WhiteSpaceScopeIndent closure argument indenting incorrect with multi-line strings
+- Fixed bug #1638 : Squiz.WhiteSpace.ScopeClosingBrace closure argument indenting incorrect with multi-line strings
+- Fixed bug #1640 : Squiz.Strings.DoubleQuoteUsage replaces tabs with spaces when fixing
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.0.2 - 2017-07-18
+### Changed
+- The code report now gracefully handles tokenizer exceptions
+- The phpcs and phpcbf scripts and now the only places that exit() in the code
+    - This allows for easier usage of core PHPCS functions from external scripts
+    - If you are calling Runner::runPHPCS() or Runner::runPHPCBF() directly, you will get back the full range of exit codes
+    - If not, catch the new DeepExitException to get the error message ($e->getMessage()) and exit code ($e->getCode());
+- NOWDOC tokens are now considered conditions, just as HEREDOC tokens are
+    - This makes it easier to find the start and end of a NOWDOC from any token within it
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Custom autoloaders are now only included once in case multiple standards are using the same one
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Improved tokenizing of fallthrough CASE and DEFAULT statements that share a closing statement and use curly braces
+- Improved the error message when Squiz.ControlStructures.ControlSignature detects a newline after the closing parenthesis
+
+### Fixed
+- Fixed a problem where the source report was not printing the correct number of errors found
+- Fixed a problem where the --cache=/path/to/cachefile CLI argument was not working
+- Fixed bug #1465 : Generic.WhiteSpace.ScopeIndent reports incorrect errors when indenting double arrows in short arrays
+- Fixed bug #1478 : Indentation in fallthrough CASE that contains a closure
+- Fixed bug #1497 : Fatal error if composer prepend-autoloader is set to false
+    - Thanks to Kunal Mehta@legoktm for the patch
+- Fixed bug #1503 : Alternative control structure syntax not always recognized as scoped
+- Fixed bug #1523 : Fatal error when using the --suffix argument
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1526 : Use of basepath setting can stop PHPCBF being able to write fixed files
+- Fixed bug #1530 : Generic.WhiteSpace.ScopeIndent can increase indent too much for lines within code blocks
+- Fixed bug #1547 : Wrong token type for backslash in use function
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #1549 : Squiz.PHP.EmbeddedPhp fixer conflict with // comment before PHP close tag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1560 : Squiz.Commenting.FunctionComment fatal error when fixing additional param comment lines that have no indent
+
+## 3.0.1 - 2017-06-14
+### Security
+- This release contains a fix for a security advisory related to the improper handling of a shell command
+    - A properly crafted filename would allow for arbitrary code execution when using the --filter=gitmodified command line option
+    - All version 3 users are encouraged to upgrade to this version, especially if you are checking 3rd-party code
+        - e.g., you run PHPCS over libraries that you did not write
+        - e.g., you provide a web service that runs PHPCS over user-uploaded files or 3rd-party repositories
+        - e.g., you allow external tool paths to be set by user-defined values
+    - If you are unable to upgrade but you check 3rd-party code, ensure you are not using the Git modified filter
+    - This advisory does not affect PHP_CodeSniffer version 2.
+    - Thanks to Sergei Morozov@morozov for the report and patch
+
+### Changed
+- Arguments on the command line now override or merge with those specified in a ruleset.xml file in all cases
+- PHPCS now stops looking for a phpcs.xml file as soon as one is found, favoring the closest one to the current dir
+- Added missing help text for the --stdin-path CLI option to --help
+- Re-added missing help text for the --file-list and --bootstrap CLI options to --help
+- Runner::runPHPCS() and Runner::runPHPCBF() now return an exit code instead of exiting directly (request #1484)
+- The Squiz standard now enforces short array syntax by default
+- The autoloader is now working correctly with classes created with class_alias()
+- The autoloader will now search for files inside all directories in the installed_paths config var
+    - This allows autoloading of files inside included custom coding standards without manually requiring them
+- You can now specify a namespace for a custom coding standard, used by the autoloader to load non-sniff helper files
+    - Also used by the autoloader to help other standards directly include sniffs for your standard
+    - Set the value to the namespace prefix you are using for sniff files (everything up to \Sniffs\)
+    - e.g., if your namespace format is MyProject\CS\Standard\Sniffs\Category set the namespace to MyProject\CS\Standard
+    - If omitted, the namespace is assumed to be the same as the directory name containing the ruleset.xml file
+    - The namespace is set in the ruleset tag of the ruleset.xml file
+    - e.g., ruleset name="My Coding Standard" namespace="MyProject\CS\Standard"
+- Rulesets can now specify custom autoloaders using the new autoload tag
+    - Autoloaders are included while the ruleset is being processed and before any custom sniffs are included
+    - Allows for very custom autoloading of helper classes well before the boostrap files are included
+- The PEAR standard now includes Squiz.Commenting.DocCommentAlignment
+    - It previously broke comments onto multiple lines, but didn't align them
+
+### Fixed
+- Fixed a problem where excluding a message from a custom standard's own sniff would exclude the whole sniff
+    - This caused some PSR2 errors to be under-reported
+- Fixed bug #1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
+- Fixed bug #1447 : Running the unit tests with a phpunit config file breaks the test suite
+    - Unknown arguments were not being handled correctly, but are now stored in $config->unknown
+- Fixed bug #1449 : Generic.Classes.OpeningBraceSameLine doesn't detect comment before opening brace
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1450 : Coding standard located under an installed_path with the same directory name throws an error
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1451 : Sniff exclusions/restrictions dont work with custom sniffs unless they use the PHP_CodeSniffer NS
+- Fixed bug #1454 : Squiz.WhiteSpace.OperatorSpacing is not checking spacing on either side of a short ternary operator
+    - Thanks to Mponos George@gmponos for the patch
+- Fixed bug #1495 : Setting an invalid installed path breaks all commands
+- Fixed bug #1496 : Squiz.Strings.DoubleQuoteUsage not unescaping dollar sign when fixing
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #1501 : Interactive mode is broken
+- Fixed bug #1504 : PSR2.Namespaces.UseDeclaration hangs fixing use statement with no trailing code
+
+## 2.9.1 - 2017-05-22
+### Fixed
+- Fixed bug #1442 : T_NULLABLE detection not working for nullable parameters and return type hints in some cases
+- Fixed bug #1448 : Generic.Classes.OpeningBraceSameLine doesn't detect comment before opening brace
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+
+## 3.0.0 - 2017-05-04
+### Changed
+- Added an --ignore-annotations command line argument to ignore all @codingStandards annotations in code comments (request #811)
+- This allows you to force errors to be shown that would otherwise be ignored by code comments
+    - Also stop files being able to change sniff properties mid way through processing
+- An error is now reported if no sniffs were registered to be run (request #1129)
+- The autoloader will now search for files inside the directory of any loaded coding standard
+    - This allows autoloading of any file inside a custom coding standard without manually requiring them
+    - Ensure your namespace begins with your coding standard's directory name and follows PSR-4
+    - e.g., StandardName\Sniffs\CategoryName\AbstractHelper or StandardName\Helpers\StringSniffHelper
+- Fixed an error where STDIN was sometimes not checked when using the --parallel CLI option
+- The is_closure index has been removed from the return value of File::getMethodProperties()
+    - This value was always false because T_FUNCTION tokens are never closures
+    - Closures have a token type of T_CLOSURE
+- The File::isAnonymousFunction() method has been removed
+    - This function always returned false because it only accepted T_FUNCTION tokens, which are never closures
+    - Closures have a token type of T_CLOSURE
+- Includes all changes from the 2.9.0 release
+
+### Fixed
+- Fixed bug #834 : PSR2.ControlStructures.SwitchDeclaration does not handle if branches with returns
+    - Thanks to Fabian Wiget@fabacino for the patch
+
+## 3.0.0RC4 - 2017-03-02
+### Security
+- This release contains a fix for a security advisory related to the improper handling of shell commands
+    - Uses of shell_exec() and exec() were not escaping filenames and configuration settings in most cases
+    - A properly crafted filename or configuration option would allow for arbitrary code execution when using some features
+    - All users are encouraged to upgrade to this version, especially if you are checking 3rd-party code
+        - e.g., you run PHPCS over libraries that you did not write
+        - e.g., you provide a web service that runs PHPCS over user-uploaded files or 3rd-party repositories
+        - e.g., you allow external tool paths to be set by user-defined values
+    - If you are unable to upgrade but you check 3rd-party code, ensure you are not using the following features:
+        - The diff report
+        - The notify-send report
+        - The Generic.PHP.Syntax sniff
+        - The Generic.Debug.CSSLint sniff
+        - The Generic.Debug.ClosureLinter sniff
+        - The Generic.Debug.JSHint sniff
+        - The Squiz.Debug.JSLint sniff
+        - The Squiz.Debug.JavaScriptLint sniff
+        - The Zend.Debug.CodeAnalyzer sniff
+    - Thanks to Klaus Purer@klausi for the report
+
+### Changed
+- The indent property of PEAR.Classes.ClassDeclaration has been removed
+    - Instead of calculating the indent of the brace, it just ensures the brace is aligned with the class keyword
+    - Other sniffs can be used to ensure the class itself is indented correctly
+- Invalid exclude rules inside a ruleset.xml file are now ignored instead of potentially causing out of memory errors
+    - Using the -vv command line argument now also shows the invalid exclude rule as XML
+- Includes all changes from the 2.8.1 release
+
+### Fixed
+- Fixed bug #1333 : The new autoloader breaks some frameworks with custom autoloaders
+- Fixed bug #1334 : Undefined offset when explaining standard with custom sniffs
+
+## 3.0.0RC3 - 2017-02-02
+### Changed
+- Added support for ES6 class declarations
+    - Previously, these class were tokenized as JS objects but are now tokenized as normal T_CLASS structures
+- Added support for ES6 method declarations, where the "function" keyword is not used
+    - Previously, these methods were tokenized as JS objects (fixes bug #1251)
+    - The name of the ES6 method is now assigned the T_FUNCTION keyword and treated like a normal function
+    - Custom sniffs that support JS and listen for T_FUNCTION tokens can't assume the token represents the word   "function"
+    - Check the contents of the token first, or use $phpcsFile->getDeclarationName($stackPtr) if you just want its name
+    - There is no change for custom sniffs that only check PHP code
+- PHPCBF exit codes have been changed so they are now more useful (request #1270)
+    - Exit code 0 is now used to indicate that no fixable errors were found, and so nothing was fixed
+    - Exit code 1 is now used to indicate that all fixable errors were fixed correctly
+    - Exit code 2 is now used to indicate that PHPCBF failed to fix some of the fixable errors it found
+    - Exit code 3 is now used for general script execution errors
+- Added PEAR.Commenting.FileComment.ParamCommentAlignment to check alignment of multi-line param comments
+- Includes all changes from the 2.8.0 release
+
+### Fixed
+- Fixed an issue where excluding a file using a @codingStandardsIgnoreFile comment would produce errors
+    - For PHPCS, it would show empty files being processed
+    - For PHPCBF, it would produce a PHP error
+- Fixed bug #1233 : Can't set config data inside ruleset.xml file
+- Fixed bug #1241 : CodeSniffer.conf not working with 3.x PHAR file
+
+## 3.0.0RC2 - 2016-11-30
+### Changed
+- Made the Runner class easier to use with wrapper scripts
+- Full usage information is no longer printed when a usage error is encountered (request #1186)
+    - Makes it a lot easier to find and read the error message that was printed
+- Includes all changes from the 2.7.1 release
+
+### Fixed
+- Fixed an undefined var name error that could be produced while running PHPCBF
+- Fixed bug #1167 : 3.0.0RC1 PHAR does not work with PEAR standard
+- Fixed bug #1208 : Excluding files doesn't work when using STDIN with a filename specified
+
+## 3.0.0RC1 - 2016-09-02
+### Changed
+- Progress output now shows E and W in green when a file has fixable errors or warnings
+    - Only supported if colors are enabled
+- PHPCBF no longer produces verbose output by default (request #699)
+    - Use the -v command line argument to show verbose fixing output
+    - Use the -q command line argument to disable verbose information if enabled by default
+- PHPBF now prints a summary report after fixing files
+    - Report shows files that were fixed, how many errors were fixed, and how many remain
+- PHPCBF now supports the -p command line argument to print progress information
+    - Prints a green F for files where fixes occurred
+    - Prints a red E for files that could not be fixed due to an error
+    - Use the -q command line argument to disable progress information if enabled by default
+- Running unit tests using --verbose no longer throws errors
+- Includes all changes from the 2.7.0 release
+
+### Fixed
+- Fixed shell error appearing on some systems when trying to find executable paths
+
+## 3.0.0a1 - 2016-07-20
+### Changed
+- Min PHP version increased from 5.1.2 to 5.4.0
+- Added optional caching of results between runs (request #530)
+    - Enable the cache by using the --cache command line argument
+    - If you want the cache file written somewhere specific, use --cache=/path/to/cacheFile
+    - Use the command "phpcs --config-set cache true" to turn caching on by default
+    - Use the --no-cache command line argument to disable caching if it is being turned on automatically
+- Add support for checking file in parallel (request #421)
+    - Tell PHPCS how many files to check at once using the --parallel command line argument
+    - To check 100 files at once, using --parallel=100
+    - To disable parallel checking if it is being turned on automatically, use --parallel=1
+    - Requires PHP to be compiled with the PCNTL package
+- The default encoding has been changed from iso-8859-1 to utf-8 (request #760)
+    - The --encoding command line argument still works, but you no longer have to set it to process files as utf-8
+    - If encoding is being set to utf-8 in a ruleset or on the CLI, it can be safely removed
+    - If the iconv PHP extension is not installed, standard non-multibyte aware functions will be used
+- Added a new "code" report type to show a code snippet for each error (request #419)
+    - The line containing the error is printed, along with 2 lines above and below it to show context
+    - The location of the errors is underlined in the code snippet if you also use --colors
+    - Use --report=code to generate this report
+- Added support for custom filtering of the file list
+    - Developers can write their own filter classes to perform custom filtering of the list before the run starts
+    - Use the command line arg --filter=/path/to/filter.php to specify a filter to use
+    - Extend \PHP_CodeSniffer\Filters\Filter to also support the core PHPCS extension and path filtering
+    - Extend \PHP_CodeSniffer\Filters\ExactMatch to get the core filtering and the ability to use blacklists and whitelists
+    - The included \PHP_CodeSniffer\Filters\GitModified filter is a good example of an ExactMatch filter
+- Added support for only checking files that have been locally modified or added in a git repo
+    - Use --filter=gitmodified to check these files
+    - You still need to give PHPCS a list of files or directories in which to check
+- Added automatic discovery of executable paths (request #571)
+    - Thanks to Sergei Morozov@morozov for the patch
+- You must now pass "-" on the command line to have PHPCS wait for STDIN
+    - E.g., phpcs --standard=PSR2 -
+    - You can still pipe content via STDIN as normal as PHPCS will see this and process it
+    - But without the "-", PHPCS will throw an error if no content or files are passed to it
+- All PHP errors generated by sniffs are caught, re-thrown as exceptions, and reported in the standard error reports
+    - This should stop bugs inside sniffs causing infinite loops
+    - Also stops invalid reports being produced as errors don't print to the screen directly
+- Sniff codes are no longer optional
+    - If a sniff throws and error or a warning, it must specify an internal code for that message
+- The installed_paths config setting can now point directly to a standard
+    - Previously, it had to always point to the directory in which the standard lives
+- Multiple reports can now be specified using the --report command line argument
+    - Report types are separated by commas
+    - E.g., --report=full,summary,info
+    - Previously, you had to use one argument for each report such as --report=full --report=summary --report=info
+- You can now set the severity, message type, and exclude patterns for and entire sniff, category, or standard
+    - Previously, this was only available for a single message
+- You can now include a single sniff code in a ruleset instead of having to include an entire sniff
+    - Including a sniff code will automatically exclude all other messages from that sniff
+    - If the sniff is already included by an imported standard, set the sniff severity to 0 and include the specific message you want
+- PHPCBF no longer uses patch
+    - Files are now always overwritten
+    - The --no-patch option has been removed
+- Added a --basepath option to strip a directory from the front of file paths in output (request #470)
+    - The basepath is absolute or relative to the current directory
+    - E.g., to output paths relative to current dir in reports, use --basepath=.
+- Ignore rules are now checked when using STDIN (request #733)
+- Added an include-pattern tag to rulesets to include a sniff for specific files and folders only (request #656)
+    - This is the exact opposite of the exclude-pattern tag
+    - This option is only usable within sniffs, not globally like exclude-patterns are
+- Added a new -m option to stop error messages from being recorded, which saves a lot of memory
+    - PHPCBF always uses this setting to reduce memory as it never outputs error messages
+    - Setting the $recordErrors member var inside custom report classes is no longer supported (use -m instead)
+- Exit code 2 is now used to indicate fixable errors were found (request #930)
+    - Exit code 3 is now used for general script execution errors
+    - Exit code 1 is used to indicate that coding standard errors were found, but none are fixable
+    - Exit code 0 is unchanged and continues to mean no coding standard errors found
+
+### Removed
+- The included PHPCS standard has been removed
+    - All rules are now found inside the phpcs.xml.dist file
+    - Running "phpcs" without any arguments from a git clone will use this ruleset
+- The included SVN pre-commit hook has been removed
+    - Hooks for version control systems will no longer be maintained within the PHPCS project
+
+## 2.9.0 - 2017-05-04
+### Changed
+- Added Generic.Debug.ESLint sniff to run ESLint over JS files and report errors
+    - Set eslint path using: phpcs --config-set eslint_path /path/to/eslint
+    - Thanks to Ryan McCue@rmccue for the contribution
+- T_POW is now properly considered an arithmetic operator, and will be checked as such
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- T_SPACESHIP and T_COALESCE are now properly considered comparison operators, and will be checked as such
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHP.DisallowShortOpenTag now warns about possible short open tags even when short_open_tag is set to OFF
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.WhiteSpace.DisallowTabIndent now finds and fixes improper use of spaces anywhere inside the line indent
+    - Previously, only the first part of the indent was used to determine the indent type
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PEAR.Commenting.ClassComment now supports checking of traits as well as classes and interfaces
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.FunctionCommentThrowTag now supports re-throwing exceptions (request #946)
+    - Thanks to Samuel Levy@samlev for the patch
+- Squiz.PHP.DisallowMultipleAssignments now ignores PHP4-style member var assignments
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.FunctionSpacing now ignores spacing above functions when they are preceded by inline comments
+    - Stops conflicts between this sniff and comment spacing sniffs
+- Squiz.WhiteSpace.OperatorSpacing no longer checks the equal sign in declare statements
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added missing error codes for a couple of sniffs so they can now be customised as normal
+
+### Fixed
+- Fixed bug #1266 : PEAR.WhiteSpace.ScopeClosingBrace can throw an error while fixing mixed PHP/HTML
+- Fixed bug #1364 : Yield From values are not recognised as returned values in Squiz FunctionComment sniff
+- Fixed bug #1373 : Error in tab expansion results in white-space of incorrect size
+    - Thanks to Mark Clements@MarkMaldaba for the patch
+- Fixed bug #1381 : Tokenizer: dereferencing incorrectly identified as short array
+- Fixed bug #1387 : Squiz.ControlStructures.ControlSignature does not handle alt syntax when checking space after closing   brace
+- Fixed bug #1392 : Scope indent calculated incorrectly when using array destructuring
+- Fixed bug #1394 : integer type hints appearing as TypeHintMissing instead of ScalarTypeHintMissing
+    - PHP 7 type hints were also being shown when run under PHP 5 in some cases
+- Fixed bug #1405 : Squiz.WhiteSpace.ScopeClosingBrace fails to fix closing brace within indented PHP tags
+- Fixed bug #1421 : Ternaries used in constant scalar expression for param default misidentified by tokenizer
+- Fixed bug #1431 : PHPCBF can't fix short open tags when they are not followed by a space
+    - Thanks to Gonçalo Queirós@ghunti for the patch
+- Fixed bug #1432 : PHPCBF can make invalid fixes to inline JS control structures that make use of JS objects
+
+## 2.8.1 - 2017-03-02
+### Security
+- This release contains a fix for a security advisory related to the improper handling of shell commands
+    - Uses of shell_exec() and exec() were not escaping filenames and configuration settings in most cases
+    - A properly crafted filename or configuration option would allow for arbitrary code execution when using some features
+    - All users are encouraged to upgrade to this version, especially if you are checking 3rd-party code
+          - e.g., you run PHPCS over libraries that you did not write
+          - e.g., you provide a web service that runs PHPCS over user-uploaded files or 3rd-party repositories
+          - e.g., you allow external tool paths to be set by user-defined values
+    - If you are unable to upgrade but you check 3rd-party code, ensure you are not using the following features:
+          - The diff report
+          - The notify-send report
+          - The Generic.PHP.Syntax sniff
+          - The Generic.Debug.CSSLint sniff
+          - The Generic.Debug.ClosureLinter sniff
+          - The Generic.Debug.JSHint sniff
+          - The Squiz.Debug.JSLint sniff
+          - The Squiz.Debug.JavaScriptLint sniff
+          - The Zend.Debug.CodeAnalyzer sniff
+    - Thanks to Klaus Purer@klausi for the report
+
+### Changed
+- The PHP-supplied T_COALESCE_EQUAL token has been replicated for PHP versions before 7.2
+- PEAR.Functions.FunctionDeclaration now reports an error for blank lines found inside a function declaration
+- PEAR.Functions.FunctionDeclaration no longer reports indent errors for blank lines in a function declaration
+- Squiz.Functions.MultiLineFunctionDeclaration no longer reports errors for blank lines in a function declaration
+    - It would previously report that only one argument is allowed per line
+- Squiz.Commenting.FunctionComment now corrects multi-line param comment padding more accurately
+- Squiz.Commenting.FunctionComment now properly fixes pipe-separated param types
+- Squiz.Commenting.FunctionComment now works correctly when function return types also contain a comment
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.ControlStructures.InlineIfDeclaration now supports the elvis operator
+    - As this is not a real PHP operator, it enforces no spaces between ? and : when the THEN statement is empty
+- Squiz.ControlStructures.InlineIfDeclaration is now able to fix the spacing errors it reports
+
+### Fixed
+- Fixed bug #1340 : STDIN file contents not being populated in some cases
+    - Thanks to David Biňovec@david-binda for the patch
+- Fixed bug #1344 : PEAR.Functions.FunctionCallSignatureSniff throws error for blank comment lines
+- Fixed bug #1347 : PSR2.Methods.FunctionCallSignature strips some comments during fixing
+    - Thanks to Algirdas Gurevicius@uniquexor for the patch
+- Fixed bug #1349 : Squiz.Strings.DoubleQuoteUsage.NotRequired message is badly formatted when string contains a CR newline char
+    - Thanks to Algirdas Gurevicius@uniquexor for the patch
+- Fixed bug #1350 : Invalid Squiz.Formatting.OperatorBracket error when using namespaces
+- Fixed bug #1369 : Empty line in multi-line function declaration cause infinite loop
+
+## 2.8.0 - 2017-02-02
+### Changed
+- The Internal.NoCodeFound error is no longer generated for content sourced from STDIN
+    - This should stop some Git hooks generating errors because PHPCS is trying to process the refs passed on STDIN
+- Squiz.Commenting.DocCommentAlignment now checks comments on class properties defined using the VAR keyword
+    - Thanks to Klaus Purer@klausi for the patch
+- The getMethodParameters() method now recognises "self" as a valid type hint
+    - The return array now contains a new "content" index containing the raw content of the param definition
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The getMethodParameters() method now supports nullable types
+    - The return array now contains a new "nullable_type" index set to true or false for each method param
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The getMethodParameters() method now supports closures
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added more guard code for JS files with syntax errors (request #1271 and request #1272)
+- Added more guard code for CSS files with syntax errors (request #1304)
+- PEAR.Commenting.FunctionComment fixers now correctly handle multi-line param comments
+- AbstractVariableSniff now supports anonymous classes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.NamingConventions.ConstructorName and PEAR.NamingConventions.ValidVariable now support anonymous classes
+- Generic.NamingConventions.CamelCapsFunctionName and PEAR.NamingConventions.ValidFunctionName now support anonymous   classes
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.CodeAnalysis.UnusedFunctionParameter and PEAR.Functions.ValidDefaultValue now support closures
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- PEAR.NamingConventions.ValidClassName and Squiz.Classes.ValidClassName now support traits
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.Functions.FunctionCallArgumentSpacing now supports closures other PHP-provided functions
+    - Thanks to Algirdas Gurevicius@uniquexor for the patch
+- Fixed an error where a nullable type character was detected as an inline then token
+    - A new T_NULLABLE token has been added to represent the ? nullable type character
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Squiz.WhiteSpace.SemicolonSpacing no longer removes comments while fixing the placement of semicolons
+    - Thanks to Algirdas Gurevicius@uniquexor for the patch
+
+### Fixed
+- Fixed bug #1230 : JS tokeniser incorrectly tokenises bitwise shifts as comparison
+    - Thanks to Ryan McCue@rmccue for the patch
+- Fixed bug #1237 : Uninitialized string offset in PHP Tokenizer on PHP 5.2
+- Fixed bug #1239 : Warning when static method name is 'default'
+- Fixed bug #1240 : False positive for function names starting with triple underscore
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1245 : SELF is not recognised as T_SELF token in: return new self
+- Fixed bug #1246 : A mix of USE statements with and without braces can cause the tokenizer to mismatch brace tokens
+    - Thanks to Michał Bundyra@michalbundyra for the patch
+- Fixed bug #1249 : GitBlame report requires a .git directory
+- Fixed bug #1252 : Squiz.Strings.ConcatenationSpacing fix creates syntax error when joining a number to a string
+- Fixed bug #1253 : Generic.ControlStructures.InlineControlStructure fix creates syntax error fixing if-try/catch
+- Fixed bug #1255 : Inconsistent indentation check results when ELSE on new line
+- Fixed bug #1257 : Double dash in CSS class name can lead to "Named colours are forbidden" false positives
+- Fixed bug #1260 : Syntax errors not being shown when error_prepend_string is set
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Fixed bug #1264 : Array return type hint is sometimes detected as T_ARRAY_HINT instead of T_RETURN_TYPE
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #1265 : ES6 arrow function raises unexpected operator spacing errors
+- Fixed bug #1267 : Fixer incorrectly handles filepaths with repeated dir names
+    - Thanks to Sergey Ovchinnikov@orx0r for the patch
+- Fixed bug #1276 : Commenting.FunctionComment.InvalidReturnVoid conditional issue with anonymous classes
+- Fixed bug #1277 : Squiz.PHP.DisallowMultipleAssignments.Found error when var assignment is on the same line as an   open tag
+- Fixed bug #1284 : Squiz.Arrays.ArrayBracketSpacing.SpaceBeforeBracket false positive match for short list syntax
+
+## 2.7.1 - 2016-11-30
+### Changed
+- Squiz.ControlStructures.ControlSignature.SpaceAfterCloseParenthesis fix now removes unnecessary whitespace
+- Squiz.Formatting.OperatorBracket no longer errors for negative array indexes used within a function call
+- Squiz.PHP.EmbeddedPhp no longer expects a semicolon after statements that are only opening a scope
+- Fixed a problem where the content of T_DOC_COMMENT_CLOSE_TAG tokens could sometimes be (boolean) false
+- Developers of custom standards with custom test runners can now have their standards ignored by the built-in test runner
+    - Set the value of an environment variable called PHPCS_IGNORE_TESTS with a comma separated list of your standard names
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- The unit test runner now loads the test sniff outside of the standard's ruleset so that exclude rules do not get applied
+    - This may have caused problems when testing custom sniffs inside custom standards
+    - Also makes the unit tests runs a little faster
+- The SVN pre-commit hook now works correctly when installed via composer
+    - Thanks to Sergey@sserbin for the patch
+
+### Fixed
+- Fixed bug #1135 : PEAR.ControlStructures.MultiLineCondition.CloseBracketNewLine not detected if preceded by multiline function call
+- Fixed bug #1138 : PEAR.ControlStructures.MultiLineCondition.Alignment not detected if closing brace is first token on line
+- Fixed bug #1141 : Sniffs that check EOF newlines don't detect newlines properly when the last token is a doc block
+- Fixed bug #1150 : Squiz.Strings.EchoedStrings does not properly fix bracketed statements
+- Fixed bug #1156 : Generic.Formatting.DisallowMultipleStatements errors when multiple short echo tags are used on the same line
+    - Thanks to Nikola Kovacs@nkovacs for the patch
+- Fixed bug #1161 : Absolute report path is treated like a relative path if it also exists within the current directory
+- Fixed bug #1170 : Javascript regular expression literal not recognized after comparison operator
+- Fixed bug #1180 : Class constant named FUNCTION is incorrectly tokenized
+- Fixed bug #1181 : Squiz.Operators.IncrementDecrementUsage.NoBrackets false positive when incrementing properties
+    - Thanks to Jürgen Henge-Ernst@hernst42 for the patch
+- Fixed bug #1188 : Generic.WhiteSpace.ScopeIndent issues with inline HTML and multi-line function signatures
+- Fixed bug #1190 : phpcbf on if/else with trailing comment generates erroneous code
+- Fixed bug #1191 : Javascript sniffer fails with function called "Function"
+- Fixed bug #1203 : Inconsistent behavior of PHP_CodeSniffer_File::findEndOfStatement
+- Fixed bug #1218 : CASE conditions using class constants named NAMESPACE/INTERFACE/TRAIT etc are incorrectly tokenized
+- Fixed bug #1221 : Indented function call with multiple closure arguments can cause scope indent error
+- Fixed bug #1224 : PHPCBF fails to fix code with heredoc/nowdoc as first argument to a function
+
+## 2.7.0 - 2016-09-02
+### Changed
+- Added --file-list command line argument to allow a list of files and directories to be specified in an external file
+    - Useful is you have a generated list of files to check that would be too long for the command line
+    - File and directory paths are listed one per line
+    - Usage is: phpcs --file-list=/path/to/file-list ...
+    - Thanks to Blotzu@andrei-propertyguru for the patch
+- Values set using @codingStandardsChangeSetting comments can now contain spaces
+- Sniff unit tests can now specify a list of test files instead of letting the runner pick them (request #1078)
+    - Useful if a sniff needs to exclude files based on the environment, or is checking filenames
+    - Override the new getTestFiles() method to specify your own list of test files
+- Generic.Functions.OpeningFunctionBraceKernighanRitchie now ignores spacing for function return types
+    - The sniff code Generic.Functions.OpeningFunctionBraceKernighanRitchie.SpaceAfterBracket has been removed
+    - Replaced by Generic.Functions.OpeningFunctionBraceKernighanRitchie.SpaceBeforeBrace
+    - The new error message is slightly clearer as it indicates that a single space is needed before the brace
+- Squiz.Commenting.LongConditionClosingComment now allows for the length of a code block to be configured
+    - Set the lineLimit property (default is 20) in your ruleset.xml file to set the code block length
+    - When the code block length is reached, the sniff will enforce a closing comment after the closing brace
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.Commenting.LongConditionClosingComment now allows for the end comment format to be configured
+    - Set the commentFormat property (default is "//end %s") in your ruleset.xml file to set the format
+    - The placeholder %s will be replaced with the type of condition opener, e.g., "//end foreach"
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Generic.PHPForbiddenFunctions now allows forbidden functions to have mixed case
+    - Previously, it would only do a strtolower comparison
+    - Error message now shows what case was found in the code and what the correct case should be
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added Generic.Classes.OpeningBraceSameLine to ensure opening brace of class/interface/trait is on the same line as the declaration
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added Generic.PHP.BacktickOperator to ban the use of the backtick operator for running shell commands
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Added Generic.PHP.DisallowAlternativePHPTags to ban the use of alternate PHP tags
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Squiz.WhiteSpace.LanguageConstructSpacing no longer checks for spaces if parenthesis are being used (request #1062)
+    - Makes this sniff more compatible with those that check parenthesis spacing of function calls
+- Squiz.WhiteSpace.ObjectOperatorSpacing now has a setting to ignore newline characters around object operators
+    - Default remains FALSE, so newlines are not allowed
+    - Override the "ignoreNewlines" setting in a ruleset.xml file to change
+    - Thanks to Alex Howansky@AlexHowansky for the patch
+- Squiz.Scope.MethodScope now sniffs traits as well as classes and interfaces
+    - Thanks to Jesse Donat@donatj for the patch
+- PHPCBF is now able to fix Squiz.SelfMemberReference.IncorrectCase errors
+    - Thanks to Nikola Kovacs@nkovacs for the patch
+- PHPCBF is now able to fix Squiz.Commenting.VariableComment.IncorrectVarType
+    - Thanks to Walt Sorensen@photodude for the patch
+- PHPCBF is now able to fix Generic.PHP.DisallowShortOpenTag
+    - Thanks to Juliette Reinders Folmer@jrfnl for the patch
+- Improved the formatting of the end brace when auto fixing InlineControlStructure errors (request #1121)
+- Generic.Functions.OpeningFunctionBraceKernighanRitchie.BraceOnNewLine fix no longer leaves blank line after brace (request #1085)
+- Generic UpperCaseConstantNameSniff now allows lowercase namespaces in constant definitions
+  - Thanks to Daniel Schniepp@dschniepp for the patch
+- Squiz DoubleQuoteUsageSniff is now more tolerant of syntax errors caused by mismatched string tokens
+- A few sniffs that produce errors based on the current PHP version can now be told to run using a specific PHP version
+    - Set the php_version config var using --config-set, --runtime-set, or in a ruleset to specify a specific PHP version
+    - The format of the PHP version is the same as the PHP_VERSION_ID constant (e.g., 50403 for version 5.4.3)
+    - Supported sniffs are Generic.PHP.DisallowAlternativePHPTags, PSR1.Classes.ClassDeclaration, Squiz.Commenting.FunctionComment
+    - Thanks to Finlay Beaton@ofbeaton for the patch
+
+### Fixed
+- Fixed bug #985  : Duplicate class definition detection generates false-positives in media queries
+    - Thanks to Raphael Horber@rhorber for the patch
+- Fixed bug #1014 : Squiz VariableCommentSniff doesn't always detect a missing comment
+- Fixed bug #1066 : Undefined index: quiet in CLI.php during unit test run with -v command line arg
+- Fixed bug #1072 : Squiz.SelfMemberReference.NotUsed not detected if leading namespace separator is used
+- Fixed bug #1089 : Rulesets cannot be loaded if the path contains urlencoded characters
+- Fixed bug #1091 : PEAR and Squiz FunctionComment sniffs throw errors for some invalid @param line formats
+- Fixed bug #1092 : PEAR.Functions.ValidDefaultValue should not flag type hinted methods with a NULL default argument
+- Fixed bug #1095 : Generic LineEndings sniff replaces tabs with spaces with --tab-width is set
+- Fixed bug #1096 : Squiz FunctionDeclarationArgumentSpacing gives incorrect error/fix when variadic operator is followed by a space
+- Fixed bug #1099 : Group use declarations are incorrectly fixed by the PSR2 standard
+    - Thanks to Jason McCreary@jasonmccreary for the patch
+- Fixed bug #1101 : Incorrect indent errors when breaking out of PHP inside an IF statement
+- Fixed bug #1102 : Squiz.Formatting.OperatorBracket.MissingBrackets faulty bracketing fix
+- Fixed bug #1109 : Wrong scope indent reported in anonymous class
+- Fixed bug #1112 : File docblock not recognized when require_once follows it
+- Fixed bug #1120 : InlineControlStructureSniff does not handle auto-fixing for control structures that make function calls
+- Fixed bug #1124 : Squiz.Operators.ComparisonOperatorUsage does not detect bracketed conditions for inline IF statements
+    - Thanks to Raphael Horber@rhorber for the patch
+
+## 2.6.2 - 2016-07-14
+### Changed
+- Added a new --exclude CLI argument to exclude a list of sniffs from checking and fixing (request #904)
+    - Accepts the same sniff codes as the --sniffs command line argument, but provides the opposite functionality
+- Added a new -q command line argument to disable progress and verbose information from being printed (request #969)
+    - Useful if a coding standard hard-codes progress or verbose output but you want PHPCS to be quiet
+    - Use the command "phpcs --config-set quiet true" to turn quiet mode on by default
+- Generic LineLength sniff no longer errors for comments that cannot be broken out onto a new line (request #766)
+    - A typical case is a comment that contains a very long URL
+    - The comment is ignored if putting the URL on a indented new comment line would be longer than the allowed length
+- Settings extensions in a ruleset no longer causes PHP notices during unit testing
+    - Thanks to Klaus Purer@klausi for the patch
+- Version control reports now show which errors are fixable if you are showing sources
+- Added a new sniff to enforce a single space after a NOT operator (request #1051)
+    - Include in a ruleset using the code Generic.Formatting.SpaceAfterNot
+- The Squiz.Commenting.BlockComment sniff now supports tabs for indenting comment lines (request #1056)
+
+### Fixed
+- Fixed bug #790 : Incorrect missing @throws error in methods that use closures
+- Fixed bug #908 : PSR2 standard is not checking that closing brace is on line following the body
+- Fixed bug #945 : Incorrect indent behavior using deep-nested function and arrays
+- Fixed bug #961 : Two anonymous functions passed as function/method arguments cause indentation false positive
+- Fixed bug #1005 : Using global composer vendor autoload breaks PHP lowercase built-in function sniff
+    - Thanks to Michael Butler@michaelbutler for the patch
+- Fixed bug #1007 : Squiz Unreachable code detection is not working properly with a closure inside a case
+- Fixed bug #1023 : PSR2.Classes.ClassDeclaration fails if class extends base class and "implements" is on trailing line
+- Fixed bug #1026 : Arrays in comma delimited class properties cause ScopeIndent to increase indent
+- Fixed bug #1028 : Squiz ArrayDeclaration incorrectly fixes multi-line array where end bracket is not on a new line
+- Fixed bug #1034 : Squiz FunctionDeclarationArgumentSpacing gives incorrect error when first arg is a variadic
+- Fixed bug #1036 : Adjacent assignments aligned analysis statement wrong
+- Fixed bug #1049 : Version control reports can show notices when the report width is very small
+- Fixed bug #21050 : PEAR MultiLineCondition sniff suppresses errors on last condition line
+
+## 2.6.1 - 2016-05-31
+### Changed
+- The PHP-supplied T_COALESCE token has been replicated for PHP versions before 7.0
+- Function return types of self, parent and callable are now tokenized as T_RETURN_TYPE
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- The default_standard config setting now allows multiple standards to be listed, like on the command line
+    - Thanks to Michael Mayer@schnittstabil for the patch
+- Installations done via composer now only include the composer autoloader for PHP 5.3.2+ (request #942)
+- Added a rollbackChangeset() method to the Fixer class to purposely rollback the active changeset
+
+### Fixed
+- Fixed bug #940 : Auto-fixing issue encountered with inconsistent use of braces
+- Fixed bug #943 : Squiz.PHP.InnerFunctions.NotAllowed reported in anonymous classes
+- Fixed bug #944 : PHP warning when running the latest phar
+- Fixed bug #951 : InlineIfDeclaration: invalid error produced with UTF-8 string
+- Fixed bug #957 : Operator spacing sniff errors when plus is used as part of a number
+    - Thanks to Klaus Purer@klausi for the patch
+- Fixed bug #959 : Call-time pass-by-reference false positive if there is a square bracket before the ampersand
+    - Thanks to Konstantin Leboev@realmfoo for the patch
+- Fixed bug #962 : Null coalescing operator (??) not detected as a token
+    - Thanks to Joel Posti@joelposti for the patch
+- Fixed bug #973 : Anonymous class declaration and PSR1.Files.SideEffects.FoundWithSymbols
+- Fixed bug #974 : Error when file ends with "function"
+- Fixed bug #979 : Anonymous function with return type hint is not refactored as expected
+- Fixed bug #983 : Squiz.WhiteSpace.MemberVarSpacing.AfterComment fails to fix error when comment is not a docblock
+- Fixed bug #1010 : Squiz NonExecutableCode sniff does not detect boolean OR
+    - Thanks to Derek Henderson@2shediac for the patch
+- Fixed bug #1015 : The Squiz.Commenting.FunctionComment sniff doesn't allow description in @return tag
+    - Thanks to Alexander Obuhovich@aik099 for the patch
+- Fixed bug #1022 : Duplicate spaces after opening bracket error with PSR2 standard
+- Fixed bug #1025 : Syntax error in JS file can cause undefined index for parenthesis_closer
+
+## 2.6.0 - 2016-04-04
+### Changed
+- Paths used when setting CLI arguments inside ruleset.xml files are now relative to the ruleset location (request #847)
+    - This change only applies to paths within ARG tags, used to set CLI arguments
+    - Previously, the paths were relative to the directory PHPCS was being run from
+    - Absolute paths are still allowed and work the same way they always have
+    - This change allows ruleset.xml files to be more portable
+- Content passed via STDIN will now be processed even if files are specified on the command line or in a ruleset
+- When passing content via STDIN, you can now specify the file path to use on the command line (request #934)
+    - This allows sniffs that check file paths to work correctly
+    - This is the same functionality provided by the phpcs_input_file line, except it is available on the command line
+- Files processed with custom tokenizers will no longer be skipped if they appear minified (request #877)
+    - If the custom tokenizer wants minified files skipped, it can set a $skipMinified member var to TRUE
+    - See the included JS and CSS tokenizers for an example
+- Config vars set in ruleset.xml files are now processed earlier, allowing them to be used during sniff registration
+    - Among other things, this allows the installed_paths config var to be set in ruleset.xml files
+    - Thanks to Pieter Frenssen@pfrenssen for the patch
+- Improved detection of regular expressions in the JS tokenizer
+- Generic PHP Syntax sniff now uses PHP_BINARY (if available) to determine the path to PHP if no other path is available
+    - You can still manually set php_path to use a specific binary for testing
+    - Thanks to Andrew Berry@deviantintegral for the patch
+- The PHP-supplied T_POW_EQUAL token has been replicated for PHP versions before 5.6
+- Added support for PHP7 use group declarations (request #878)
+    - New tokens T_OPEN_USE_GROUP and T_CLOSE_USE_GROUP are assigned to the open and close curly braces
+- Generic ScopeIndent sniff now reports errors for every line that needs the indent changed (request #903)
+    - Previously, it ignored lines that were indented correctly in the context of their block
+    - This change produces more technically accurate error messages, but is much more verbose
+- The PSR2 and Squiz standards now allow multi-line default values in function declarations (request #542)
+    - Previously, these would automatically make the function a multi-line declaration
+- Squiz InlineCommentSniff now allows docblocks on require(_once) and include(_once) statements
+    - Thanks to Gary Jones@GaryJones for the patch
+- Squiz and PEAR Class and File sniffs no longer assume the first comment in a file is always a file comment
+    - phpDocumentor assigns the comment to the file only if it is not followed by a structural element
+    - These sniffs now follow this same rule
+- Squiz ClassCommentSniff no longer checks for blank lines before class comments
+    - Removes the error Squiz.Commenting.ClassComment.SpaceBefore
+- Renamed Squiz.CSS.Opacity.SpacingAfterPoint to Squiz.CSS.Opacity.DecimalPrecision
+    - Please update your ruleset if you are referencing this error code directly
+- Fixed PHP tokenizer problem that caused an infinite loop when checking a comment with specific content
+- Generic Disallow Space and Tab indent sniffs now detect and fix indents inside embedded HTML chunks (request #882)
+- Squiz CSS IndentationSniff no longer assumes the class opening brace is at the end of a line
+- Squiz FunctionCommentThrowTagSniff now ignores non-docblock comments
+- Squiz ComparisonOperatorUsageSniff now allows conditions like while(true)
+- PEAR FunctionCallSignatureSniff (and the Squiz and PSR2 sniffs that use it) now correctly check the first argument
+    - Further fix for bug #698
+
+### Fixed
+- Fixed bug #791 : codingStandardsChangeSetting settings not working with namespaces
+- Fixed bug #872 : Incorrect detection of blank lines between CSS class names
+- Fixed bug #879 : Generic InlineControlStructureSniff can create parse error when case/if/elseif/else have mixed brace and braceless definitions
+- Fixed bug #883 : PSR2 is not checking for blank lines at the start and end of control structures
+- Fixed bug #884 : Incorrect indentation notice for anonymous classes
+- Fixed bug #887 : Using curly braces for a shared CASE/DEFAULT statement can generate an error in PSR2 SwitchDeclaration
+- Fixed bug #889 : Closure inside catch/else/elseif causes indentation error
+- Fixed bug #890 : Function call inside returned short array value can cause indentation error inside CASE statements
+- Fixed bug #897 : Generic.Functions.CallTimePassByReference.NotAllowed false positive when short array syntax
+- Fixed bug #900 : Squiz.Functions.FunctionDeclarationArgumentSpacing bug when no space between type hint and argument
+- Fixed bug #902 : T_OR_EQUAL and T_POW_EQUAL are not seen as assignment tokens
+- Fixed bug #910 : Unrecognized "extends" and indentation on anonymous classes
+- Fixed bug #915 : JS Tokenizer generates errors when processing some decimals
+- Fixed bug #928 : Endless loop when sniffing a PHP file with a git merge conflict inside a function
+- Fixed bug #937 : Shebang can cause PSR1 SideEffects warning
+    - Thanks to Clay Loveless@claylo for the patch
+- Fixed bug #938 : CallTimePassByReferenceSniff ignores functions with return value
+
+## 2.5.1 - 2016-01-20
+### Changed
+- The PHP-supplied T_SPACESHIP token has been replicated for PHP versions before 7.0
+- T_SPACESHIP is now correctly identified as an operator
+    - Thanks to Alexander Obuhovich@aik099 for the patch
+- Generic LowerCaseKeyword now ensures array type hints are lowercase as well
+    - Thanks to Mathieu Rochette@mathroc for the patch
+- Squiz ComparisonOperatorUsageSniff no longer hangs on JS FOR loops that don't use semicolons
+- PHP_CodesSniffer now includes the composer autoload.php file, if there is one
+    - Thanks to Klaus Purer@klausi for the patch
+- Added error Squiz.Commenting.FunctionComment.ScalarTypeHintMissing for PHP7 only (request #858)
+    - These errors were previously reported as Squiz.Commenting.FunctionComment.TypeHintMissing on PHP7
+    - Disable this error message in a ruleset.xml file if your code needs to run on both PHP5 and PHP7
+- The PHP 5.6 __debugInfo magic method no longer produces naming convention errors
+    - Thanks to Michael Nowack@syranez for the patch
+- PEAR and Squiz FunctionComment sniffs now support variadic functions (request #841)
+
+### Fixed
+- Fixed bug #622 : Wrong detection of Squiz.CSS.DuplicateStyleDefinition with media queries
+- Fixed bug #752 : The missing exception error is reported in first found DocBlock
+- Fixed bug #794 : PSR2 MultiLineFunctionDeclaration forbids comments after opening parenthesis of a multiline call
+- Fixed bug #820 : PEAR/PSR2 FunctionCallSignature sniffs suggest wrong indent when there are multiple arguments on a line
+- Fixed bug #822 : Ruleset hard-coded file paths are not used if not running from the same directory as the ruleset
+- Fixed bug #825 : FunctionCallArgumentSpacing sniff complains about more than one space before comment in multi-line function call
+- Fixed bug #828 : Null classname is tokenized as T_NULL instead of T_STRING
+- Fixed bug #829 : Short array argument not fixed correctly when multiple function arguments are on the same line
+- Fixed bug #831 : PHPCS freezes in an infinite loop under Windows if no standard is passed
+- Fixed bug #832 : Tokenizer does not support context sensitive parsing
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #835 : PEAR.Functions.FunctionCallSignature broken when closure uses return types
+- Fixed bug #838 : CSS indentation fixer changes color codes
+    - Thanks to Klaus Purer@klausi for the patch
+- Fixed bug #839 : "__()" method is marked as not camel caps
+    - Thanks to Tim Bezhashvyly@tim-bezhashvyly for the patch
+- Fixed bug #852 : Generic.Commenting.DocComment not finding errors when long description is omitted
+- Fixed bug #854 : Return typehints in interfaces are not reported as T_RETURN_TYPE
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #855 : Capital letter detection for multibyte strings doesn't work correctly
+- Fixed bug #857 : PSR2.ControlStructure.SwitchDeclaration shouldn't check indent of curly brace closers
+- Fixed bug #859 : Switch statement indention issue when returning function call with closure
+- Fixed bug #861 : Single-line arrays and function calls can generate incorrect indentation errors
+- Fixed bug #867 : Squiz.Strings.DoubleQuoteUsage broken for some escape codes
+    - Thanks to Jack Blower@ElvenSpellmaker for the help with the fix
+- Fixed bug #21005 : Incorrect indent detection when multiple properties are initialized to arrays
+- Fixed bug #21010 : Incorrect missing colon detection in CSS when first style is not on new line
+- Fixed bug #21011 : Incorrect error message text when newline found after opening brace
+
+## 2.5.0 - 2015-12-11
+### Changed
+- PHPCS will now look for a phpcs.xml file in parent directories as well as the current directory (request #626)
+- PHPCS will now use a phpcs.xml file even if files are specified on the command line
+    - This file is still only used if no standard is specified on the command line
+- Added support for a phpcs.xml.dist file (request #583)
+    - If both a phpcs.xml and phpcs.xml.dist file are present, the phpcs.xml file will be used
+- Added support for setting PHP ini values in ruleset.xml files (request #560)
+    - Setting the value of the new ini tags to name="memory_limit" value="32M" is the same as -d memory_limit=32M
+- Added support for one or more bootstrap files to be run before processing begins
+    - Use the --bootstrap=file,file,file command line argument to include bootstrap files
+    - Useful if you want to override some of the high-level settings of PHPCS or PHPCBF
+    - Thanks to John Maguire@johnmaguire for the patch
+- Added additional verbose output for CSS tokenizing
+- Squiz ComparisonOperatorUsageSniff now checks FOR, WHILE and DO-WHILE statements
+    - Thanks to Arnout Boks@aboks for the patch
+
+### Fixed
+- Fixed bug #660 : Syntax checks can fail on Windows with PHP5.6
+- Fixed bug #784 : $this->trait is seen as a T_TRAIT token
+- Fixed bug #786 : Switch indent issue with short array notation
+- Fixed bug #787 : SpacingAfterDefaultBreak confused by multi-line statements
+- Fixed bug #797 : Parsing CSS url() value breaks further parsing
+- Fixed bug #805 : Squiz.Commenting.FunctionComment.InvalidTypeHint on Scalar types on PHP7
+- Fixed bug #807 : Cannot fix line endings when open PHP tag is not on the first line
+- Fixed bug #808 : JS tokeniser incorrectly setting some function and class names to control structure tokens
+- Fixed bug #809 : PHPCBF can break a require_once statement with a space before the open parenthesis
+- Fixed bug #813 : PEAR FunctionCallSignature checks wrong indent when first token on line is part of a multi-line string
+
+## 2.4.0 - 2015-11-24
+### Changed
+- Added support for PHP 7 anonymous classes
+    - Anonymous classes are now tokenized as T_ANON_CLASS and ignored by normal class sniffs
+- Added support for PHP 7 function return type declarations
+    - Return types are now tokenized as T_RETURN_TYPE
+- Fixed tokenizing of the XOR operator, which was incorrectly identified as a power operator (bug #765)
+    - The T_POWER token has been removed and replaced by the T_BITWISE_XOR token
+    - The PHP-supplied T_POW token has been replicated for PHP versions before 5.6
+- Traits are now tokenized in PHP versions before 5.4 to make testing easier
+- Improved regular expression detection in JS files
+- PEAR FunctionCallSignatureSniff now properly detects indents in more mixed HTML/PHP code blocks
+- Full report now properly indents lines when newlines are found inside error messages
+- Generating documentation without specifying a standard now uses the default standard instead
+    - Thanks to Ken Guest@kenguest for the patch
+- Generic InlineControlStructureSniff now supports braceless do/while loops in JS
+    - Thanks to Pieter Frenssen@pfrenssen for the patch
+- Added more guard code for function declarations with syntax errors
+    - Thanks to Yun Young-jin for the patch
+- Added more guard code for foreach declarations with syntax errors
+    - Thanks to Johan de Ruijter@johanderuijter for the patch
+- Added more guard code for class declarations with syntax errors
+- Squiz ArrayDeclarationSniff now has guard code for arrays with syntax errors
+- Generic InlineControlStructureSniff now correctly fixes ELSEIF statements
+
+### Fixed
+- Fixed bug #601 : Expected type hint int; found array in Squiz FunctionCommentSniff
+    - Thanks to Scato Eggen@scato for the patch
+- Fixed bug #625 : Consider working around T_HASHBANG in HHVM 3.5.x and 3.6.x
+    - Thanks to Kunal Mehta@legoktm for the patch
+- Fixed bug #692 : Comment tokenizer can break when using mbstring function overloading
+- Fixed bug #694 : Long sniff codes can cause PHP warnings in source report when showing error codes
+- Fixed bug #698 : PSR2.Methods.FunctionCallSignature.Indent forces exact indent of ternary operator parameters
+- Fixed bug #704 : ScopeIndent can fail when an opening parenthesis is on a line by itself
+- Fixed bug #707 : Squiz MethodScopeSniff doesn't handle nested functions
+- Fixed bug #709 : Squiz.Sniffs.Whitespace.ScopeClosingBraceSniff marking indented endif in mixed inline HTML blocks
+- Fixed bug #711 : Sniffing from STDIN shows Generic.Files.LowercasedFilename.NotFound error
+- Fixed bug #714 : Fixes suppression of errors using docblocks
+    - Thanks to Andrzej Karmazyn@akarmazyn for the patch
+- Fixed bug #716 : JSON report is invalid when messages contain newlines or tabs
+    - Thanks to Pieter Frenssen@pfrenssen for the patch
+- Fixed bug #723 : ScopeIndent can fail when multiple array closers are on the same line
+- Fixed bug #730 : ScopeIndent can fail when a short array opening square bracket is on a line by itself
+- Fixed bug #732 : PHP Notice if @package name is made up of all invalid characters
+    - Adds new error code PEAR.Commenting.FileComment.InvalidPackageValue
+- Fixed bug #748 : Auto fix for Squiz.Commenting.BlockComment.WrongEnd is incorrect
+    - Thanks to J.D. Grimes@JDGrimes for the patch
+- Fixed bug #753 : PSR2 standard shouldn't require space after USE block when next code is a closing tag
+- Fixed bug #768 : PEAR FunctionCallSignature sniff forbids comments after opening parenthesis of a multiline call
+- Fixed bug #769 : Incorrect detection of variable reference operator when used with short array syntax
+    - Thanks to Klaus Purer@klausi for the patch
+- Fixed bug #772 : Syntax error when using PHPCBF on alternative style foreach loops
+- Fixed bug #773 : Syntax error when stripping trailing PHP close tag and previous statement has no semicolon
+- Fixed bug #778 : PHPCBF creates invalid PHP for inline FOREACH containing multiple control structures
+- Fixed bug #781 : Incorrect checking for PHP7 return types on multi-line function declarations
+- Fixed bug #782 : Conditional function declarations cause fixing conflicts in Squiz standard
+    - Squiz.ControlStructures.ControlSignature no longer enforces a single newline after open brace
+    - Squiz.WhiteSpace.ControlStructureSpacing can be used to check spacing at the start/end of control structures
+
+## 2.3.4 - 2015-09-09
+### Changed
+- JSON report format now includes the fixable status for each error message and the total number of fixable errors
+- Added more guard code for function declarations with syntax errors
+- Added tokenizer support for the PHP declare construct
+    - Thanks to Andy Blyler@ablyler for the patch
+- Generic UnnecessaryStringConcatSniff can now allow strings concatenated over multiple lines
+    - Set the allowMultiline property to TRUE (default is FALSE) in your ruleset.xml file to enable this
+    - By default, concat used only for getting around line length limits still generates an error
+    - Thanks to Stefan Lenselink@stefanlenselink for the contribution
+- Invalid byte sequences no longer throw iconv_strlen() errors (request #639)
+    - Thanks to Willem Stuursma@willemstuursma for the patch
+- Generic TodoSniff and FixmeSniff are now better at processing strings with invalid characters
+- PEAR FunctionCallSignatureSniff now ignores indentation of inline HTML content
+- Squiz ControlSignatureSniff now supports control structures with only inline HTML content
+
+### Fixed
+- Fixed bug #636 : Some class names cause CSS tokenizer to hang
+- Fixed bug #638 : VCS blame reports output error content from the blame commands for files not under VC
+- Fixed bug #642 : Method params incorrectly detected when default value uses short array syntax
+    - Thanks to Josh Davis@joshdavis11 for the patch
+- Fixed bug #644 : PEAR ScopeClosingBrace sniff does not work with mixed HTML/PHP
+- Fixed bug #645 : FunctionSignature and ScopeIndent sniffs don't detect indents correctly when PHP open tag is not on a line by itself
+- Fixed bug #648 : Namespace not tokenized correctly when followed by multiple use statements
+- Fixed bug #654 : Comments affect indent check for BSDAllman brace style
+- Fixed bug #658 : Squiz.Functions.FunctionDeclarationSpacing error for multi-line declarations with required spaces greater than zero
+    - Thanks to J.D. Grimes@JDGrimes for the patch
+- Fixed bug #663 : No space after class name generates: Class name "" is not in camel caps format
+- Fixed bug #667 : Scope indent check can go into infinite loop due to some parse errors
+- Fixed bug #670 : Endless loop in PSR1 SideEffects sniffer if no semicolon after last statement
+    - Thanks to Thomas Jarosch@thomasjfox for the patch
+- Fixed bug #672 : Call-time pass-by-reference false positive
+- Fixed bug #683 : Comments are incorrectly reported by PSR2.ControlStructures.SwitchDeclaration sniff
+- Fixed bug #687 : ScopeIndent does not check indent correctly for method prefixes like public and abstract
+- Fixed bug #689 : False error on some comments after class closing brace
+
+## 2.3.3 - 2015-06-24
+### Changed
+- Improved the performance of the CSS tokenizer, especially on very large CSS files (thousands of lines)
+    - Thanks to Klaus Purer@klausi for the patch
+- Defined tokens for lower PHP versions are now phpcs-specific strings instead of ints
+    - Stops conflict with other projects, like PHP_CodeCoverage
+- Added more guard code for syntax errors to various sniffs
+- Improved support for older HHVM versions
+    - Thanks to Kunal Mehta@legoktm for the patch
+- Squiz ValidLogicalOperatorsSniff now ignores XOR as type casting is different when using the ^ operator (request #567)
+- Squiz CommentedOutCodeSniff is now better at ignoring URLs inside comments
+- Squiz ControlSignatureSniff is now better at checking embedded PHP code
+- Squiz ScopeClosingBraceSniff is now better at checking embedded PHP code
+
+### Fixed
+- Fixed bug #584 : Squiz.Arrays.ArrayDeclaration sniff gives incorrect NoComma error for multiline string values
+- Fixed bug #589 : PEAR.Functions.FunctionCallSignature sniff not checking all function calls
+- Fixed bug #592 : USE statement tokenising can sometimes result in mismatched scopes
+- Fixed bug #594 : Tokenizer issue on closure that returns by reference
+- Fixed bug #595 : Colons in CSS selectors within media queries throw false positives
+    - Thanks to Klaus Purer@klausi for the patch
+- Fixed bug #598 : PHPCBF can break function/use closure brace placement
+- Fixed bug #603 : Squiz ControlSignatureSniff hard-codes opener type while fixing
+- Fixed bug #605 : Auto report-width specified in ruleset.xml ignored
+- Fixed bug #611 : Invalid numeric literal on CSS files under PHP7
+- Fixed bug #612 : Multi-file diff generating incorrectly if files do not end with EOL char
+- Fixed bug #615 : Squiz OperatorBracketSniff incorrectly reports and fixes operations using self::
+- Fixed bug #616 : Squiz DisallowComparisonAssignmentSniff inconsistent errors with inline IF statements
+- Fixed bug #617 : Space after switch keyword in PSR-2 is not being enforced
+- Fixed bug #621 : PSR2 SwitchDeclaration sniff doesn't detect, or correctly fix, case body on same line as statement
+
+## 2.3.2 - 2015-04-29
+### Changed
+- The error message for PSR2.ControlStructures.SwitchDeclaration.WrongOpenercase is now clearer (request #579)
+
+### Fixed
+- Fixed bug #545 : Long list of CASE statements can cause tokenizer to reach a depth limit
+- Fixed bug #565 : Squiz.WhiteSpace.OperatorSpacing reports negative number in short array
+    - Thanks to Vašek Purchart@VasekPurchart for the patch
+    - Same fix also applied to Squiz.Formatting.OperatorBracket
+- Fixed bug #569 : Generic ScopeIndentSniff throws PHP notices in JS files
+- Fixed bug #570 : Phar class fatals in PHP less than 5.3
+
+## 2.3.1 - 2015-04-23
+### Changed
+- PHPCS can now exit with 0 even if errors are found
+    - Set the ignore_errors_on_exit config variable to 1 to set this behaviour
+    - Use with the ignore_warnings_on_exit config variable to never return a non-zero exit code
+- Added Generic DisallowLongArraySyntaxSniff to enforce the use of the PHP short array syntax (request #483)
+    - Thanks to Xaver Loppenstedt@xalopp for helping with tests
+- Added Generic DisallowShortArraySyntaxSniff to ban the use of the PHP short array syntax (request #483)
+    - Thanks to Xaver Loppenstedt@xalopp for helping with tests
+- Generic ScopeIndentSniff no longer does exact checking for content inside parenthesis (request #528)
+    - Only applies to custom coding standards that set the "exact" flag to TRUE
+- Squiz ConcatenationSpacingSniff now has a setting to ignore newline characters around operators (request #511)
+    - Default remains FALSE, so newlines are not allowed
+    - Override the "ignoreNewlines" setting in a ruleset.xml file to change
+- Squiz InlineCommentSniff no longer checks the last char of a comment if the first char is not a letter (request #505)
+- The Squiz standard has increased the max padding for statement alignment from 12 to 20
+
+### Fixed
+- Fixed bug #479 : Yielded values are not recognised as returned values in Squiz FunctionComment sniff
+- Fixed bug #512 : Endless loop whilst parsing mixture of control structure styles
+- Fixed bug #515 : Spaces in JS block incorrectly flagged as indentation error
+- Fixed bug #523 : Generic ScopeIndent errors for IF in FINALLY
+- Fixed bug #527 : Closure inside IF statement is not tokenized correctly
+- Fixed bug #529 : Squiz.Strings.EchoedStrings gives false positive when echo'ing using an inline condition
+- Fixed bug #537 : Using --config-set is breaking phpcs.phar
+- Fixed bug #543 : SWITCH with closure in condition generates inline control structure error
+- Fixed bug #551 : Multiple catch blocks not checked in Squiz.ControlStructures.ControlSignature sniff
+- Fixed bug #554 : ScopeIndentSniff causes errors when encountering an unmatched parenthesis
+- Fixed bug #558 : PHPCBF adds brace for ELSE IF split over multiple lines
+- Fixed bug #564 : Generic MultipleStatementAlignment sniff reports incorrect errors for multiple assignments on a single line
+
+## 2.3.0 - 2015-03-04
+### Changed
+- The existence of the main config file is now cached to reduce is_file() calls when it doesn't exist (request #486)
+- Abstract classes inside the Sniffs directory are now ignored even if they are named NameSniff.php (request #476)
+    - Thanks to David Vernet@Decave for the patch
+- PEAR and Squiz FileComment sniffs no longer have @ in their error codes
+    - e.g., PEAR.Commenting.FileComment.Duplicate@categoryTag becomes PEAR.Commenting.FileComment.DuplicateCategoryTag
+    - e.g., Squiz.Commenting.FileComment.Missing@categoryTag becomes Squiz.Commenting.FileComment.MissingCategoryTag
+- PEAR MultiLineConditionSniff now allows comment lines inside multi-line IF statement conditions
+    - Thanks to Klaus Purer@klausi for the patch
+- Generic ForbiddenFunctionsSniff now supports setting null replacements in ruleset files (request #263)
+- Generic opening function brace sniffs now support checking of closures
+    - Set the checkClosures property to TRUE (default is FALSE) in your ruleset.xml file to enable this
+    - Can also set the checkFunctions property to FALSE (default is TRUE) in your ruleset.xml file to only check closures
+    - Affects OpeningFunctionBraceBsdAllmanSniff and OpeningFunctionBraceKernighanRitchieSniff
+- Generic OpeningFunctionBraceKernighanRitchieSniff can now fix all the errors it finds
+- Generic OpeningFunctionBraceKernighanRitchieSniff now allows empty functions with braces next to each other
+- Generic OpeningFunctionBraceBsdAllmanSniff now allows empty functions with braces next to each other
+- Improved auto report width for the "full" report
+- Improved conflict detection during auto fixing
+- Generic ScopeIndentSniff is no longer confused by empty closures
+- Squiz ControlSignatureSniff now always ignores comments (fixes bug #490)
+    - Include the Squiz.Commenting.PostStatementComment sniff in your ruleset.xml to ban these comments again
+- Squiz OperatorSpacingSniff no longer throws errors for code in the form ($foo || -1 === $bar)
+- Fixed errors tokenizing T_ELSEIF tokens on HHVM 3.5
+- Squiz ArrayDeclarationSniff is no longer tricked by comments after array values
+- PEAR IncludingFileSniff no longer produces invalid code when removing parenthesis from require/include statements
+
+### Fixed
+- Fixed bug #415 : The @codingStandardsIgnoreStart has no effect during fixing
+- Fixed bug #432 : Properties of custom sniffs cannot be configured
+- Fixed bug #453 : PSR2 standard does not allow closing tag for mixed PHP/HTML files
+- Fixed bug #457 : FunctionCallSignature sniffs do not support here/nowdoc syntax and can cause syntax error when fixing
+- Fixed bug #466 : PropertyLabelSpacing JS fixer issue when there is no space after colon
+- Fixed bug #473 : Writing a report for an empty folder to existing file includes the existing contents
+- Fixed bug #485 : PHP notice in Squiz.Commenting.FunctionComment when checking malformed @throws comment
+- Fixed bug #491 : Generic InlineControlStructureSniff can correct with missing semicolon
+    - Thanks to Jesse Donat@donatj for the patch
+- Fixed bug #492 : Use statements don't increase the scope indent
+- Fixed bug #493 : PSR1_Sniffs_Methods_CamelCapsMethodNameSniff false positives for some magic method detection
+    - Thanks to Andreas Möller@localheinz for the patch
+- Fixed bug #496 : Closures in PSR2 are not checked for a space after the function keyword
+- Fixed bug #497 : Generic InlineControlStructureSniff does not support alternative SWITCH syntax
+- Fixed bug #500 : Functions not supported as values in Squiz ArrayDeclaration sniff
+- Fixed bug #501 : ScopeClosingBrace and ScopeIndent conflict with closures used as array values
+    - Generic ScopeIndentSniff may now report fewer errors for closures, but perform the same fixes
+- Fixed bug #502 : PSR1 SideEffectsSniff sees declare() statements as side effects
+
+## 2.2.0 - 2015-01-22
+### Changed
+- Added (hopefully) tastefully used colors to report and progress output for the phpcs command
+    - Use the --colors command line argument to use colors in output
+    - Use the command "phpcs --config-set colors true" to turn colors on by default
+    - Use the --no-colors command line argument to turn colors off when the config value is set
+- Added support for using the full terminal width for report output
+    - Use the --report-width=auto command line argument to auto-size the reports
+    - Use the command "phpcs --config-set report_width auto" to use auto-sizing by default
+- Reports will now size to fit inside the report width setting instead of always using padding to fill the space
+- If no files or standards are specified, PHPCS will now look for a phpcs.xml file in the current directory
+    - This file has the same format as a standard ruleset.xml file
+    - The phpcs.xml file should specify (at least) files to process and a standard/sniffs to use
+    - Useful for running the phpcs and phpcbf commands without any arguments at the top of a repository
+- Default file paths can now be specified in a ruleset.xml file using the "file" tag
+    - File paths are only processed if no files were specified on the command line
+- Extensions specified on the CLI are now merged with those set in ruleset.xml files
+    - Previously, the ruleset.xml file setting replaced the CLI setting completely
+- Squiz coding standard now requires lowercase PHP constants (true, false and null)
+    - Removed Squiz.NamingConventions.ConstantCase sniff as the rule is now consistent across PHP and JS files
+- Squiz FunctionOpeningBraceSpaceSniff no longer does additional checks for JS functions
+    - PHP and JS functions and closures are now treated the same way
+- Squiz MultiLineFunctionDeclarationSniff now supports JS files
+- Interactive mode no longer breaks if you also specify a report type on the command line
+- PEAR InlineCommentSniff now fixes the Perl-style comments that it finds (request #375)
+- PSR2 standard no longer fixes the placement of docblock open tags as comments are excluded from this standard
+- PSR2 standard now sets a default tab width of 4 spaces
+- Generic DocCommentSniff now only disallows lowercase letters at the start of a long/short comment (request #377)
+    - All non-letter characters are now allowed, including markdown special characters and numbers
+- Generic DisallowMultipleStatementsSniff now allows multiple open/close tags on the same line (request #423)
+- Generic CharacterBeforePHPOpeningTagSniff now only checks the first PHP tag it finds (request #423)
+- Generic CharacterBeforePHPOpeningTagSniff now allows a shebang line at the start of the file (request #20481)
+- Generic InlineHTMLUnitTest now allows a shebang line at the start of the file (request #20481)
+- PEAR ObjectOperatorIndentSniff now only checks object operators at the start of a line
+- PEAR FileComment and ClassComment sniffs no longer have @ in their error codes
+    - E.g., PEAR.Commenting.FileComment.Missing@categoryTag becomes PEAR.Commenting.FileComment.MissingCategoryTag
+    - Thanks to Grzegorz Rygielski@grzr for the patch
+- Squiz ControlStructureSpacingSniff no longer enforces a blank line before CATCH statements
+- Squiz FunctionCommentSniff now fixes the return type in the @return tag (request #392)
+- Squiz BlockCommentSniff now only disallows lowercase letters at the start of the comment
+- Squiz InlineCommentSniff now only disallows lowercase letters at the start of the comment
+- Squiz OperatorSpacingSniff now has a setting to ignore newline characters around operators (request #348)
+    - Default remains FALSE, so newlines are not allowed
+    - Override the "ignoreNewlines" setting in a ruleset.xml file to change
+- PSR2 ControlStructureSpacingSniff now checks for, and fixes, newlines after the opening parenthesis
+- Added a markdown document generator (--generator=markdown to use)
+    - Thanks to Stefano Kowalke@Konafets for the contribution
+
+### Fixed
+- Fixed bug #379 : Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast incorrectly detects comments
+- Fixed bug #382 : JS tokenizer incorrect for inline conditionally created immediately invoked anon function
+- Fixed bug #383 : Squiz.Arrays.ArrayDeclaration.ValueNoNewline incorrectly detects nested arrays
+- Fixed bug #386 : Undefined offset in Squiz.FunctionComment sniff when param has no comment
+- Fixed bug #390 : Indentation of non-control structures isn't adjusted when containing structure is fixed
+- Fixed bug #400 : InlineControlStructureSniff fails to fix when statement has no semicolon
+- Fixed bug #401 : PHPCBF no-patch option shows an error when there are no fixable violations in a file
+- Fixed bug #405 : The "Squiz.WhiteSpace.FunctionSpacing" sniff removes class "}" during fixing
+- Fixed bug #407 : PEAR.ControlStructures.MultiLineCondition doesn't account for comments at the end of lines
+- Fixed bug #410 : The "Squiz.WhiteSpace.MemberVarSpacing" not respecting "var"
+- Fixed bug #411 : Generic.WhiteSpace.ScopeIndent.Incorrect - false positive with multiple arrays in argument list
+- Fixed bug #412 : PSR2 multi-line detection doesn't work for inline IF and string concats
+- Fixed bug #414 : Squiz.WhiteSpace.MemberVarSpacing - inconsistent checking of member vars with comment
+- Fixed bug #433 : Wrong detection of Squiz.Arrays.ArrayDeclaration.KeyNotAligned when key contains space
+- Fixed bug #434 : False positive for spacing around "=>" in inline array within foreach
+- Fixed bug #452 : Ruleset exclude-pattern for specific sniff code ignored when using CLI --ignore option
+- Fixed bug #20482 : Scope indent sniff can get into infinite loop when processing a parse error
+
+## 2.1.0 - 2014-12-18
+### Changed
+- Time and memory output is now shown if progress information is also shown (request #335)
+- A tilde can now be used to reference a user's home directory in a path to a standard (request #353)
+- Added PHP_CodeSniffer_File::findStartOfStatement() to find the first non-whitespace token in a statement
+    - Possible alternative for code using PHP_CodeSniffer_File::findPrevious() with the local flag set
+- Added PHP_CodeSniffer_File::findEndOfStatement() to find the last non-whitespace token in a statement
+    - Possible alternative for code using PHP_CodeSniffer_File::findNext() with the local flag set
+- Generic opening function brace sniffs now ensure the opening brace is the last content on the line
+    - Affects OpeningFunctionBraceBsdAllmanSniff and OpeningFunctionBraceKernighanRitchieSniff
+    - Also enforced in PEAR FunctionDeclarationSniff and Squiz MultiLineFunctionDeclarationSniff
+- Generic DisallowTabIndentSniff now replaces tabs everywhere it finds them, except in strings and here/now docs
+- Generic EmptyStatementSniff error codes now contain the type of empty statement detected (request #314)
+    - All messages generated by this sniff are now errors (empty CATCH was previously a warning)
+    - Message code Generic.CodeAnalysis.EmptyStatement.NotAllowed has been removed
+    - Message code Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning has been removed
+    - New message codes have the format Generic.CodeAnalysis.EmptyStatement.DetectedTYPE
+    - Example code is Generic.CodeAnalysis.EmptyStatement.DetectedCATCH
+    - You can now use a custom ruleset to change messages to warnings and to exclude them
+- PEAR and Squiz FunctionCommentSniffs no longer ban @return tags for constructors and destructors
+    - Removed message PEAR.Commenting.FunctionComment.ReturnNotRequired
+    - Removed message Squiz.Commenting.FunctionComment.ReturnNotRequired
+    - Change initiated by request #324 and request #369
+- Squiz EmptyStatementSniff has been removed
+    - Squiz standard now includes Generic EmptyStatementSniff and turns off the empty CATCH error
+- Squiz ControlSignatureSniff fixes now retain comments between the closing parenthesis and open brace
+- Squiz SuperfluousWhitespaceSniff now checks for extra blank lines inside closures
+    - Thanks to Sertan Danis@sertand for the patch
+- Squiz ArrayDeclarationSniff now skips function calls while checking multi-line arrays
+
+### Fixed
+- Fixed bug #337 : False positive with anonymous functions in Generic_Sniffs_WhiteSpace_ScopeIndentSniff
+- Fixed bug #339 : reformatting brace location can result in broken code
+- Fixed bug #342 : Nested ternary operators not tokenized correctly
+- Fixed bug #345 : Javascript regex not tokenized when inside array
+- Fixed bug #346 : PHP path can't be determined in some cases in "phpcs.bat" (on Windows XP)
+- Fixed bug #358 : False positives for Generic_Sniffs_WhiteSpace_ScopeIndentSniff
+- Fixed bug #361 : Sniff-specific exclude patterns don't work for Windows
+- Fixed bug #364 : Don't interpret "use function" as declaration
+- Fixed bug #366 : phpcbf with PSR2 errors on control structure alternative syntax
+- Fixed bug #367 : Nested Anonymous Functions Causing False Negative
+- Fixed bug #371 : Shorthand binary cast causes tokenizer errors
+    - New token T_BINARY_CAST added for the b"string" cast format (the 'b' is the T_BINARY_CAST token)
+- Fixed bug #372 : phpcbf parse problem, wrong brace placement for inline IF
+- Fixed bug #373 : Double quote usage fix removing too many double quotes
+- Fixed bug #20196 : 1.5.2 breaks scope_closer position
+
+## 2.0.0 - 2014-12-05
+### Changed
+- JS tokenizer now sets functions as T_CLOSUREs if the function is anonymous
+- JS tokenizer now sets all objects to T_OBJECT
+    - Object end braces are set to a new token T_CLOSE_OBJECT
+    - T_OBJECT tokens no longer act like scopes; i.e., they have no condition/opener/closer
+    - T_PROPERTY tokens no longer act like scopes; i.e., they have no condition/opener/closer
+    - T_OBJECT tokens have a bracket_closer instead, which can be used to find the ending
+    - T_CLOSE_OBJECT tokens have a bracket_opener
+- Improved regular expression detection in the JS tokenizer
+- You can now get PHP_CodeSniffer to ignore a single line by putting @codingStandardsIgnoreLine in a comment
+    - When the comment is found, the comment line and the following line will be ignored
+    - Thanks to Andy Bulford@abulford for the contribution
+- PHPCBF now prints output when it is changing into directories
+- Improved conflict detection during auto fixing
+- The -vvv command line argument will now output the current file content for each loop during fixing
+- Generic ScopeIndentSniff now checks that open/close PHP tags are aligned to the correct column
+- PEAR FunctionCallSignatureSniff now checks indent of closing parenthesis even if it is not on a line by itself
+- PEAR FunctionCallSignatureSniff now supports JS files
+- PEAR MultiLineConditionSniff now supports JS files
+- Squiz DocCommentAlignmentSniff now supports JS files
+- Fixed a problem correcting the closing brace line in Squiz ArrayDeclarationSniff
+- Fixed a problem auto-fixing the Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeNestedClose error
+- Squiz EmbeddedPhpSniff no longer reports incorrect alignment of tags when they are not on new lines
+- Squiz EmbeddedPhpSniff now aligns open tags correctly when moving them onto a new line
+- Improved fixing of arrays with multiple values in Squiz ArrayDeclarationSniff
+- Improved detection of function comments in Squiz FunctionCommentSpacingSniff
+- Improved fixing of lines after cases statements in Squiz SwitchDeclarationSniff
+
+### Fixed
+- Fixed bug #311 : Suppression of function prototype breaks checking of lines within function
+- Fixed bug #320 : Code sniffer indentation issue
+- Fixed bug #333 : Nested ternary operators causing problems
+
+## 1.5.6 - 2014-12-05
+### Changed
+- JS tokenizer now detects xor statements correctly
+- The --config-show command now pretty-prints the config values
+    - Thanks to Ken Guest@kenguest for the patch
+- Setting and removing config values now catches exceptions if the config file is not writable
+    - Thanks to Ken Guest@kenguest for the patch
+- Setting and removing config values now prints a message to confirm the action and show old values
+- You can now get PHP_CodeSniffer to ignore a single line by putting @codingStandardsIgnoreLine in a comment
+    - When the comment is found, the comment line and the following line will be ignored
+    - Thanks to Andy Bulford@abulford for the contribution
+- Generic ConstructorNameSniff no longer errors for PHP4 style constructors when __construct() is present
+    - Thanks to Thibaud Fabre@fabre-thibaud for the patch
+
+### Fixed
+- Fixed bug #280 : The --config-show option generates error when there is no config file
+- Fixed bug #306 : File containing only a namespace declaration raises undefined index notice
+- Fixed bug #308 : Squiz InlineIfDeclarationSniff fails on ternary operators inside closure
+- Fixed bug #310 : Variadics not recognized by tokenizer
+- Fixed bug #311 : Suppression of function prototype breaks checking of lines within function
+
+## 2.0.0RC4 - 2014-11-07
+### Changed
+- JS tokenizer now detects xor statements correctly
+- Improved detection of properties and objects in the JS tokenizer
+- Generic ScopeIndentSniff can now fix indents using tabs instead of spaces
+    - Set the tabIndent property to TRUE in your ruleset.xml file to enable this
+    - It is important to also set a tab-width setting, either in the ruleset or on the command line, for accuracy
+- Generic ScopeIndentSniff now checks and auto-fixes JS files
+- Generic DisallowSpaceIndentSniff is now able to replace space indents with tab indents during fixing
+- Support for phpcs-only and phpcbf-only attributes has been added to all ruleset.xml elements
+    - Allows parts of the ruleset to only apply when using a specific tool
+    - Useful for doing things like excluding indent fixes but still reporting indent errors
+- Unit tests can now set command line arguments during a test run
+    - Override getCliValues() and pass an array of CLI arguments for each file being tested
+- File-wide sniff properties can now be set using T_INLINE_HTML content during unit test runs
+    - Sniffs that start checking at the open tag can only, normally, have properties set using a ruleset
+- Generic ConstructorNameSniff no longer errors for PHP4 style constructors when __construct() is present
+    - Thanks to Thibaud Fabre@fabre-thibaud for the patch
+- Generic DocCommentSniff now checks that the end comment tag is on a new line
+- Generic MultipleStatementAlignmentSniff no longer skips assignments for closures
+- Squiz DocCommentAlignment sniff now has better checking for single line doc block
+- Running unit tests with the -v CLI argument no longer generates PHP errors
+
+### Fixed
+- Fixed bug #295 : ScopeIndentSniff hangs when processing nested closures
+- Fixed bug #298 : False positive in ScopeIndentSniff when anonymous functions are used with method chaining
+- Fixed bug #302 : Fixing code in Squiz InlineComment sniff can remove some comment text
+- Fixed bug #303 : Open and close tag on same line can cause a PHP notice checking scope indent
+- Fixed bug #306 : File containing only a namespace declaration raises undefined index notice
+- Fixed bug #307 : Conditional breaks in case statements get incorrect indentations
+- Fixed bug #308 : Squiz InlineIfDeclarationSniff fails on ternary operators inside closure
+- Fixed bug #310 : Variadics not recognized by tokenizer
+
+## 2.0.0RC3 - 2014-10-16
+### Changed
+- Improved default output for PHPCBF and removed the options to print verbose and progress output
+- If a .fixed file is supplied for a unit test file, the auto fixes will be checked against it during testing
+    - See Generic ScopeIndentUnitTest.inc and ScopeIndentUnitTest.inc.fixed for an example
+- Fixer token replacement methods now return TRUE if the change was accepted and FALSE if rejected
+- The --config-show command now pretty-prints the config values
+    - Thanks to Ken Guest@kenguest for the patch
+- Setting and removing config values now catches exceptions if the config file is not writable
+    - Thanks to Ken Guest@kenguest for the patch
+- Setting and removing config values now prints a message to confirm the action and show old values
+- Generic ScopeIndentSniff has been completely rewritten to improve fixing and embedded PHP detection
+- Generic DisallowTabIndent and DisallowSpaceIndent sniffs now detect indents at the start of block comments
+- Generic DisallowTabIndent and DisallowSpaceIndent sniffs now detect indents inside multi-line strings
+- Generic DisallowTabIndentSniff now replaces tabs inside doc block comments
+- Squiz ControlStructureSpacingSniff error codes have been corrected; they were reversed
+- Squiz EmbeddedPhpSniff now checks open and close tag indents and fixes some errors
+- Squiz FileCommentSniff no longer throws incorrect blank line before comment errors in JS files
+- Squiz ClassDeclarationSniff now has better checking for blank lines after a closing brace
+- Removed error Squiz.Classes.ClassDeclaration.NoNewlineAfterCloseBrace (request #285)
+    - Already handled by Squiz.Classes.ClassDeclaration.CloseBraceSameLine
+
+### Fixed
+- Fixed bug #280 : The --config-show option generates error when there is no config file
+
+## 2.0.0RC2 - 2014-09-26
+### Changed
+- Minified JS and CSS files are now detected and skipped (fixes bug #252 and bug #19899)
+    - A warning will be added to the file so it can be found in the report and ignored in the future
+- Fixed incorrect length of JS object operator tokens
+- PHP tokenizer no longer converts class/function names to special tokens types
+    - Class/function names such as parent and true would become special tokens such as T_PARENT and T_TRUE
+- PHPCS can now exit with 0 if only warnings were found (request #262)
+    - Set the ignore_warnings_on_exit config variable to 1 to set this behaviour
+    - Default remains at exiting with 0 only if no errors and no warnings were found
+    - Also changes return value of PHP_CodeSniffer_Reporting::printReport()
+- Rulesets can now set associative array properties
+    - property name="property" type="array" value="foo=>bar,baz=>qux"
+- Generic ForbiddenFunctionsSniff now has a public property called forbiddenFunctions (request #263)
+    - Override the property in a ruleset.xml file to define forbidden functions and their replacements
+    - A replacement of NULL indicates that no replacement is available
+    - e.g., value="delete=>unset,print=>echo,create_function=>null"
+    - Custom sniffs overriding this one will need to change the visibility of their member var
+- Improved closure support in Generic ScopeIndentSniff
+- Improved indented PHP tag support in Generic ScopeIndentSniff
+- Improved fixing of mixed line indents in Generic ScopeIndentSniff
+- Added conflict detection to the file fixer
+    - If 2 sniffs look to be conflicting, one change will be ignored to allow a fix to occur
+- Generic CamelCapsFunctionNameSniff now ignores a single leading underscore
+    - Thanks to Alex Slobodiskiy@xt99 for the patch
+- Standards can now be located within hidden directories (further fix for bug #20323)
+    - Thanks to Klaus Purer@klausi for the patch
+- Sniff ignore patterns now replace Win dir separators like file ignore patterns already did
+- Exclude patterns now use backtick delimiters, allowing all special characters to work correctly again
+    - Thanks to Jeremy Edgell@jedgell for the patch
+- Errors converted to warnings in a ruleset (and vice versa) now retain their fixable status
+    - Thanks to Alexander Obuhovich@aik099 for the patch
+- Squiz ConcatenationSpacingSniff now has a setting to specify how many spaces there should around concat operators
+    - Default remains at 0
+    - Override the "spacing" setting in a ruleset.xml file to change
+- Added auto-fixes for Squiz InlineCommentSniff
+- Generic DocCommentSniff now correctly fixes additional blank lines at the end of a comment
+- Squiz OperatorBracketSniff now correctly fixes operations that include arrays
+- Zend ClosingTagSniff fix now correctly leaves closing tags when followed by HTML
+- Added Generic SyntaxSniff to check for syntax errors in PHP files
+    - Thanks to Blaine Schmeisser@bayleedev for the contribution
+- Added Generic OneTraitPerFileSniff to check that only one trait is defined in each file
+    - Thanks to Alexander Obuhovich@aik099 for the contribution
+- Squiz DiscouragedFunctionsSniff now warns about var_dump()
+- PEAR ValidFunctionNameSniff no longer throws an error for _()
+- Squiz and PEAR FunctionCommentSniffs now support _()
+- Generic DisallowTabIndentSniff now checks for, and fixes, mixed indents again
+- Generic UpperCaseConstantSniff and LowerCaseConstantSniff now ignore function names
+
+### Fixed
+- Fixed bug #243 : Missing DocBlock not detected
+- Fixed bug #248 : FunctionCommentSniff expects ampersand on param name
+- Fixed bug #265 : False positives with type hints in ForbiddenFunctionsSniff
+- Fixed bug #20373 : Inline comment sniff tab handling way
+- Fixed bug #20377 : Error when trying to execute phpcs with report=json
+- Fixed bug #20378 : Report appended to existing file if no errors found in run
+- Fixed bug #20381 : Invalid "Comment closer must be on a new line"
+    - Thanks to Brad Kent@bkdotcom for the patch
+- Fixed bug #20402 : SVN pre-commit hook fails due to unknown argument error
+
+## 1.5.5 - 2014-09-25
+### Changed
+- PHP tokenizer no longer converts class/function names to special tokens types
+    - Class/function names such as parent and true would become special tokens such as T_PARENT and T_TRUE
+- Improved closure support in Generic ScopeIndentSniff
+- Improved indented PHP tag support in Generic ScopeIndentSniff
+- Generic CamelCapsFunctionNameSniff now ignores a single leading underscore
+    - Thanks to Alex Slobodiskiy@xt99 for the patch
+- Standards can now be located within hidden directories (further fix for bug #20323)
+    - Thanks to Klaus Purer@klausi for the patch
+- Added Generic SyntaxSniff to check for syntax errors in PHP files
+    - Thanks to Blaine Schmeisser@bayleedev for the contribution
+- Squiz DiscouragedFunctionsSniff now warns about var_dump()
+- PEAR ValidFunctionNameSniff no longer throws an error for _()
+- Squiz and PEAR FunctionCommentSnif now support _()
+- Generic UpperCaseConstantSniff and LowerCaseConstantSniff now ignore function names
+
+### Fixed
+- Fixed bug #248 : FunctionCommentSniff expects ampersand on param name
+- Fixed bug #265 : False positives with type hints in ForbiddenFunctionsSniff
+- Fixed bug #20373 : Inline comment sniff tab handling way
+- Fixed bug #20378 : Report appended to existing file if no errors found in run
+- Fixed bug #20381 : Invalid "Comment closer must be on a new line"
+    - Thanks to Brad Kent@bkdotcom for the patch
+- Fixed bug #20386 : Squiz.Commenting.ClassComment.SpacingBefore thrown if first block comment
+
+## 2.0.0RC1 - 2014-08-06
+### Changed
+- PHPCBF will now fix incorrect newline characters in a file
+- PHPCBF now exists cleanly when there are no errors to fix
+- Added phpcbf.bat file for Windows
+- Verbose option no longer errors when using a phar file with a space in the path
+- Fixed a reporting error when using HHVM
+    - Thanks to Martins Sipenko@martinssipenko for the patch
+- addFixableError() and addFixableWarning() now only return true if the fixer is enabled
+    - Saves checking ($phpcsFile->fixer->enabled === true) before every fix
+- Added addErrorOnLine() and addWarningOnLine() to add a non-fixable violation to a line at column 1
+    - Useful if you are generating errors using an external tool or parser and only know line numbers
+    - Thanks to Ondřej Mirtes@ondrejmirtes for the patch
+- CSS tokenizer now identifies embedded PHP code using the new T_EMBEDDED_PHP token type
+    - The entire string of PHP is contained in a single token
+- PHP tokenizer contains better detection of short array syntax
+- Unit test runner now also test any standards installed under the installed_paths config var
+- Exclude patterns now use {} delimiters, allowing the | special character to work correctly again
+- The filtering component of the --extensions argument is now ignored again when passing filenames
+    - Can still be used to specify a custom tokenizer for each extension when passing filenames
+    - If no tokenizer is specified, default values will be used for common file extensions
+- Diff report now produces relative paths on Windows, where possible (further fix for bug #20234)
+- If a token's content has been modified by the tab-width setting, it will now have an orig_content in the tokens array
+- Generic DisallowSpaceIndent and DisallowTabIndent sniffs now check original indent content even when tab-width is set
+    - Previously, setting --tab-width would force both to check the indent as spaces
+- Fixed a problem where PHPCBF could replace tabs with too many spaces when changing indents
+- Fixed a problem that could occur with line numbers when using HHVM to check files with Windows newline characters
+- Removed use of sys_get_temp_dir() as this is not supported by the min PHP version
+- Squiz ArrayDeclarationSniff now supports short array syntax
+- Squiz ControlSignatureSniff no longer uses the Abstract Pattern sniff
+    - If you are extending this sniff, you'll need to rewrite your code
+    - The rewrite allows this sniff to fix all control structure formatting issues it finds
+- The installed_paths config var now accepts relative paths
+    - The paths are relative to the PHP_CodeSniffer install directory
+    - Thanks to Weston Ruter@westonruter for the patch
+- Generic ScopeIndentSniff now accounts for different open tag indents
+- PEAR FunctionDeclarationSniff now ignores short arrays when checking indent
+    - Thanks to Daniel Tschinder@danez for the patch
+- PSR2 FunctionCallSignatureSniff now treats multi-line strings as a single-line argument, like arrays and closures
+    - Thanks to Dawid Nowak@MacDada for the patch
+- PSR2 UseDeclarationSniff now checks for a single space after the USE keyword
+- Generic ForbiddenFunctionsSniff now detects calls to functions in the global namespace
+    - Thanks to Ole Martin Handeland@olemartinorg for the patch
+- Generic LowerCaseConstantSniff and UpperCaseConstantSniff now ignore namespaces beginning with TRUE/FALSE/NULL
+    - Thanks to Renan Gonçalves@renan for the patch
+- Squiz InlineCommentSniff no longer requires a blank line after post-statement comments (request #20299)
+- Squiz SelfMemberReferenceSniff now works correctly with namespaces
+- Squiz FunctionCommentSniff is now more relaxed when checking namespaced type hints
+- Tab characters are now encoded in abstract pattern errors messages
+    - Thanks to Blaine Schmeisser@bayleedev for the patch
+- Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313)
+- Generic LineLengthSniff now shows a warning if the iconv module is disabled (request #20314)
+- Source report no longer shows errors if category or sniff names ends in an uppercase error
+    - Thanks to Jonathan Marcil@jmarcil for the patch
+
+### Fixed
+- Fixed bug #20261 : phpcbf has an endless fixing loop
+- Fixed bug #20268 : Incorrect documentation titles in PEAR documentation
+- Fixed bug #20296 : new array notion in function comma check fails
+- Fixed bug #20297 : phar does not work when renamed it to phpcs
+- Fixed bug #20307 : PHP_CodeSniffer_Standards_AbstractVariableSniff analyze traits
+- Fixed bug #20308 : Squiz.ValidVariableNameSniff - wrong variable usage
+- Fixed bug #20309 : Use "member variable" term in sniff "processMemberVar" method
+- Fixed bug #20310 : PSR2 does not check for space after function name
+- Fixed bug #20322 : Display rules set to type=error even when suppressing warnings
+- Fixed bug #20323 : PHPCS tries to load sniffs from hidden directories
+- Fixed bug #20346 : Fixer endless loop with Squiz.CSS sniffs
+- Fixed bug #20355 : No sniffs are registered with PHAR on Windows
+
+## 1.5.4 - 2014-08-06
+### Changed
+- Removed use of sys_get_temp_dir() as this is not supported by the min PHP version
+- The installed_paths config var now accepts relative paths
+    - The paths are relative to the PHP_CodeSniffer install directory
+    - Thanks to Weston Ruter@westonruter for the patch
+- Generic ScopeIndentSniff now accounts for different open tag indents
+- PEAR FunctionDeclarationSniff now ignores short arrays when checking indent
+    - Thanks to Daniel Tschinder@danez for the patch
+- PSR2 FunctionCallSignatureSniff now treats multi-line strings as a single-line argument, like arrays and closures
+    - Thanks to Dawid Nowak@MacDada for the patch
+- Generic ForbiddenFunctionsSniff now detects calls to functions in the global namespace
+    - Thanks to Ole Martin Handeland@olemartinorg for the patch
+- Generic LowerCaseConstantSniff and UpperCaseConstantSniff now ignore namespaces beginning with TRUE/FALSE/NULL
+    - Thanks to Renan Gonçalves@renan for the patch
+- Squiz InlineCommentSniff no longer requires a blank line after post-statement comments (request #20299)
+- Squiz SelfMemberReferenceSniff now works correctly with namespaces
+- Tab characters are now encoded in abstract pattern errors messages
+    - Thanks to Blaine Schmeisser@bayleedev for the patch
+- Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313)
+- Generic LineLengthSniff now shows a warning if the iconv module is disabled (request #20314)
+- Source report no longer shows errors if category or sniff names ends in an uppercase error
+    - Thanks to Jonathan Marcil@jmarcil for the patch
+
+### Fixed
+- Fixed bug #20268 : Incorrect documentation titles in PEAR documentation
+- Fixed bug #20296 : new array notion in function comma check fails
+- Fixed bug #20307 : PHP_CodeSniffer_Standards_AbstractVariableSniff analyze traits
+- Fixed bug #20308 : Squiz.ValidVariableNameSniff - wrong variable usage
+- Fixed bug #20309 : Use "member variable" term in sniff "processMemberVar" method
+- Fixed bug #20310 : PSR2 does not check for space after function name
+- Fixed bug #20322 : Display rules set to type=error even when suppressing warnings
+- Fixed bug #20323 : PHPCS tries to load sniffs from hidden directories
+
+## 2.0.0a2 - 2014-05-01
+### Changed
+- Added report type --report=info to show information about the checked code to make building a standard easier
+    - Checks a number of things, such as what line length you use, and spacing are brackets, but not everything
+    - Still highly experimental
+- Generic LineLengthSniff now shows warnings for long lines referring to licence and VCS information
+    - It previously ignored these lines, but at the expense of performance
+- Generic DisallowTabIndent and DisallowSpaceIndent sniffs no longer error when detecting mixed indent types
+    - Only the first type of indent found on a line (space or indent) is considered
+- Lots of little performance improvements that can add up to a substantial saving over large code bases
+    - Added a "length" array index to tokens so you don't need to call strlen() of them, or deal with encoding
+    - Can now use isset() to find tokens inside the PHP_CodeSniffer_Tokens static vars instead of in_array()
+- Custom reports can now specify a $recordErrors member var; this previously only worked for built-in reports
+    - When set to FALSE, error messages will not be recorded and only totals will be returned
+    - This can save significant memory while processing a large code base
+- Removed dependence on PHP_Timer
+- PHP tokenizer now supports DEFAULT statements opened with a T_SEMICOLON
+- The Squiz and PHPCS standards have increased the max padding for statement alignment from 8 to 12
+- Squiz EchoedStringsSniff now supports statements without a semicolon, such as PHP embedded in HTML
+- Squiz DoubleQuoteUsageSniff now properly replaces escaped double quotes when fixing a doubled quoted string
+- Improved detection of nested IF statements that use the alternate IF/ENDIF syntax
+- PSR1 CamelCapsMethodNameSniff now ignores magic methods
+    - Thanks to Eser Ozvataf@eser for the patch
+- PSR1 SideEffectsSniff now ignores methods named define()
+- PSR1 and PEAR ClassDeclarationSniffs now support traits (request #20208)
+- PSR2 ControlStructureSpacingSniff now allows newlines before/after parentheses
+    - Thanks to Maurus Cuelenaere@mcuelenaere for the patch
+- PSR2 ControlStructureSpacingSniff now checks TRY and CATCH statements
+- Squiz SuperfluousWhitespaceSniff now detects whitespace at the end of block comment lines
+    - Thanks to Klaus Purer@klausi for the patch
+- Squiz LowercasePHPFunctionsSniff no longer reports errors for namespaced functions
+    - Thanks to Max Galbusera@maxgalbu for the patch
+- Squiz SwitchDeclarationSniff now allows exit() as a breaking statement for case/default
+- Squiz ValidVariableNameSniff and Zend ValidVariableNameSniff now ignore additional PHP reserved vars
+    - Thanks to Mikuláš Dítě and Adrian Crepaz for the patch
+- Sniff code Squiz.WhiteSpace.MemberVarSpacing.After changed to Squiz.WhiteSpace.MemberVarSpacing.Incorrect (request #20241)
+
+### Fixed
+- Fixed bug #20200 : Invalid JSON produced with specific error message
+- Fixed bug #20204 : Ruleset exclude checks are case sensitive
+- Fixed bug #20213 : Invalid error, Inline IF must be declared on single line
+- Fixed bug #20225 : array_merge() that takes more than one line generates error
+- Fixed bug #20230 : Squiz ControlStructureSpacing sniff assumes specific condition formatting
+- Fixed bug #20234 : phpcbf patch command absolute paths
+- Fixed bug #20240 : Squiz block comment sniff fails when newline present
+- Fixed bug #20247 : The Squiz.WhiteSpace.ControlStructureSpacing sniff and do-while
+    - Thanks to Alexander Obuhovich@aik099 for the patch
+- Fixed bug #20248 : The Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff sniff and empty scope
+- Fixed bug #20252 : Unitialized string offset when package name starts with underscore
+
+## 1.5.3 - 2014-05-01
+### Changed
+- Improved detection of nested IF statements that use the alternate IF/ENDIF syntax
+- PHP tokenizer now supports DEFAULT statements opened with a T_SEMICOLON
+- PSR1 CamelCapsMethodNameSniff now ignores magic methods
+    - Thanks to Eser Ozvataf@eser for the patch
+- PSR1 SideEffectsSniff now ignores methods named define()
+- PSR1 and PEAR ClassDeclarationSniffs now support traits (request #20208)
+- PSR2 ControlStructureSpacingSniff now allows newlines before/after parentheses
+    - Thanks to Maurus Cuelenaere@mcuelenaere for the patch
+- Squiz LowercasePHPFunctionsSniff no longer reports errors for namespaced functions
+    - Thanks to Max Galbusera@maxgalbu for the patch
+- Squiz SwitchDeclarationSniff now allows exit() as a breaking statement for case/default
+- Squiz ValidVariableNameSniff and Zend ValidVariableNameSniff now ignore additional PHP reserved vars
+    - Thanks to Mikuláš Dítě and Adrian Crepaz for the patch
+- Sniff code Squiz.WhiteSpace.MemberVarSpacing.After changed to Squiz.WhiteSpace.MemberVarSpacing.Incorrect (request #20241)
+
+### Fixed
+- Fixed bug #20200 : Invalid JSON produced with specific error message
+- Fixed bug #20204 : Ruleset exclude checks are case sensitive
+- Fixed bug #20213 : Invalid error, Inline IF must be declared on single line
+- Fixed bug #20225 : array_merge() that takes more than one line generates error
+- Fixed bug #20230 : Squiz ControlStructureSpacing sniff assumes specific condition formatting
+- Fixed bug #20240 : Squiz block comment sniff fails when newline present
+- Fixed bug #20247 : The Squiz.WhiteSpace.ControlStructureSpacing sniff and do-while
+    - Thanks to Alexander Obuhovich@aik099 for the patch
+- Fixed bug #20248 : The Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff sniff and empty scope
+- Fixed bug #20252 : Uninitialized string offset when package name starts with underscore
+
+## 2.0.0a1 - 2014-02-05
+### Changed
+- Added the phpcbf script to automatically fix many errors found by the phpcs script
+- Added report type --report=diff to show suggested changes to fix coding standard violations
+- The --report argument now allows for custom reports to be used
+    - Use the full path to your custom report class as the report name
+- The --extensions argument is now respected when passing filenames; not just with directories
+- The --extensions argument now allows you to specify the tokenizer for each extension
+    - e.g., --extensions=module/php,es/js
+- Command line arguments can now be set in ruleset files
+    - e.g., arg name="report" value="summary" (print summary report; same as --report=summary)
+    - e.g., arg value="sp" (print source and progress information; same as -sp)
+    - The -vvv, --sniffs, --standard and -l command line arguments cannot be set in this way
+- Sniff process() methods can not optionally return a token to ignore up to
+    - If returned, the sniff will not be executed again until the passed token is reached in the file
+    - Useful if you are looking for tokens like T_OPEN_TAG but only want to process the first one
+- Removed the comment parser classes and replaced it with a simple comment tokenizer
+    - T_DOC_COMMENT tokens are now tokenized into T_DOC_COMMENT_* tokens so they can be used more easily
+    - This change requires a significant rewrite of sniffs that use the comment parser
+    - This change requires minor changes to sniffs that listen for T_DOC_COMMENT tokens directly
+- Added Generic DocCommentSniff to check generic doc block formatting
+    - Removed doc block formatting checks from PEAR ClassCommentSniff
+    - Removed doc block formatting checks from PEAR FileCommentSniff
+    - Removed doc block formatting checks from PEAR FunctionCommentSniff
+    - Removed doc block formatting checks from Squiz ClassCommentSniff
+    - Removed doc block formatting checks from Squiz FileCommentSniff
+    - Removed doc block formatting checks from Squiz FunctionCommentSniff
+    - Removed doc block formatting checks from Squiz VariableCommentSniff
+- Squiz DocCommentAlignmentSniff has had its error codes changed
+    - NoSpaceBeforeTag becomes NoSpaceAfterStar
+    - SpaceBeforeTag becomes SpaceAfterStar
+    - SpaceBeforeAsterisk becomes SpaceBeforeStar
+- Generic MultipleStatementAlignment now aligns assignments within a block so they fit within their max padding setting
+    - The sniff previously requested the padding as 1 space if max padding was exceeded
+    - It now aligns the assignment with surrounding assignments if it can
+    - Removed property ignoreMultiline as multi-line assignments are now handled correctly and should not be ignored
+- Squiz FunctionClosingBraceSpaceSniff now requires a blank line before the brace in all cases except function args
+- Added error Squiz.Commenting.ClassComment.SpacingAfter to ensure there are no blank lines after a class comment
+- Added error Squiz.WhiteSpace.MemberVarSpacing.AfterComment to ensure there are no blank lines after a member var comment
+    - Fixes have also been corrected to not strip the member var comment or indent under some circumstances
+    - Thanks to Mark Scherer@dereuromark for help with this fix
+- Added error Squiz.Commenting.FunctionCommentThrowTag.Missing to ensure a throw is documented
+- Removed error Squiz.Commenting.FunctionCommentThrowTag.WrongType
+- Content passed via STDIN can now specify the filename to use so that sniffs can run the correct filename checks
+    - Ensure the first line of the content is: phpcs_input_file: /path/to/file
+- Squiz coding standard now enforces no closing PHP tag at the end of a pure PHP file
+- Squiz coding standard now enforces a single newline character at the end of the file
+- Squiz ClassDeclarationSniff no longer checks for a PHP ending tag after a class definition
+- Squiz ControlStructureSpacingSniff now checks TRY and CATCH statements as well
+- Removed MySource ChannelExceptionSniff
+
+## 1.5.2 - 2014-02-05
+### Changed
+- Improved support for the PHP 5.5. classname::class syntax
+    - PSR2 SwitchDeclarationSniff no longer throws errors when this syntax is used in CASE conditions
+- Improved support for negative checks of instanceOf in Squiz ComparisonOperatorUsageSniff
+    - Thanks to Martin Winkel@storeman for the patch
+- Generic FunctionCallArgumentSpacingSniff now longer complains about space before comma when using here/nowdocs
+    - Thanks to Richard van Velzen@rvanvelzen for the patch
+- Generic LowerCaseConstantSniff and UpperCaseConstantSniff now ignore class constants
+    - Thanks to Kristopher Wilson@mrkrstphr for the patch
+- PEAR FunctionCallSignatureSniff now has settings to specify how many spaces should appear before/after parentheses
+    - Override the 'requiredSpacesAfterOpen' and 'requiredSpacesBeforeClose' settings in a ruleset.xml file to change
+    - Default remains at 0 for both
+    - Thanks to Astinus Eberhard@Astinus-Eberhard for the patch
+- PSR2 ControlStructureSpacingSniff now has settings to specify how many spaces should appear before/after parentheses
+    - Override the 'requiredSpacesAfterOpen' and 'requiredSpacesBeforeClose' settings in a ruleset.xml file to change
+    - Default remains at 0 for both
+    - Thanks to Astinus Eberhard@Astinus-Eberhard for the patch
+- Squiz ForEachLoopDeclarationSniff now has settings to specify how many spaces should appear before/after parentheses
+    - Override the 'requiredSpacesAfterOpen' and 'requiredSpacesBeforeClose' settings in a ruleset.xml file to change
+    - Default remains at 0 for both
+    - Thanks to Astinus Eberhard@Astinus-Eberhard for the patch
+- Squiz ForLoopDeclarationSniff now has settings to specify how many spaces should appear before/after parentheses
+    - Override the 'requiredSpacesAfterOpen' and 'requiredSpacesBeforeClose' settings in a ruleset.xml file to change
+    - Default remains at 0 for both
+    - Thanks to Astinus Eberhard@Astinus-Eberhard for the patch
+- Squiz FunctionDeclarationArgumentSpacingSniff now has settings to specify how many spaces should appear before/after parentheses
+    - Override the 'requiredSpacesAfterOpen' and 'requiredSpacesBeforeClose' settings in a ruleset.xml file to change
+    - Default remains at 0 for both
+    - Thanks to Astinus Eberhard@Astinus-Eberhard for the patch
+- Removed UnusedFunctionParameter, CyclomaticComplexity and NestingLevel from the Squiz standard
+- Generic FixmeSniff and TodoSniff now work correctly with accented characters
+
+### Fixed
+- Fixed bug #20145 : Custom ruleset preferences directory over installed standard
+- Fixed bug #20147 : phpcs-svn-pre-commit - no more default error report
+- Fixed bug #20151 : Problem handling "if(): ... else: ... endif;" syntax
+- Fixed bug #20190 : Invalid regex in Squiz_Sniffs_WhiteSpace_SuperfluousWhitespaceSniff
+
+## 1.5.1 - 2013-12-12
+### Changed
+- Config values can now be set at runtime using the command line argument --runtime-set key value
+    - Runtime values are the same as config values, but are not written to the main config file
+    - Thanks to Wim Godden@wimg for the patch
+- Config values can now be set in ruleset files
+    - e.g., config name="zend_ca_path" value="/path/to/ZendCodeAnalyzer"
+    - Can not be used to set config values that override command line values, such as show_warnings
+    - Thanks to Jonathan Marcil@jmarcil for helping with the patch
+- Added a new installed_paths config value to allow for the setting of directories that contain standards
+    - By default, standards have to be installed into the CodeSniffer/Standards directory to be considered installed
+    - New config value allows a list of paths to be set in addition to this internal path
+    - Installed standards appear when using the -i arg, and can be referenced in rulesets using only their name
+    - Set paths by running: phpcs --config-set installed_paths /path/one,/path/two,...
+- PSR2 ClassDeclarationSniff now allows a list of extended interfaces to be split across multiple lines
+- Squiz DoubleQuoteUsageSniff now allows \b in double quoted strings
+- Generic ForbiddenFunctionsSniff now ignores object creation
+    - This is a further fix for bug #20100 : incorrect Function mysql() has been deprecated report
+
+### Fixed
+- Fixed bug #20136 : Squiz_Sniffs_WhiteSpace_ScopeKeywordSpacingSniff and Traits
+- Fixed bug #20138 : Protected property underscore and camel caps issue (in trait with Zend)
+    - Thanks to Gaetan Rousseau@Naelyth for the patch
+- Fixed bug #20139 : No report file generated on success
+
+## 1.5.0 - 2013-11-28
+### Changed
+- Doc generation is now working again for installed standards
+    - Includes a fix for limiting the docs to specific sniffs
+- Generic ScopeIndentSniff now allows for ignored tokens to be set via ruleset.xml files
+    - E.g., to ignore comments, override a property using:
+    - name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"
+- PSR2 standard now ignores comments when checking indentation rules
+- Generic UpperCaseConstantNameSniff no longer reports errors where constants are used (request #20090)
+    - It still reports errors where constants are defined
+- Individual messages can now be excluded in ruleset.xml files using the exclude tag (request #20091)
+    - Setting message severity to 0 continues to be supported
+- Squiz OperatorSpacingSniff no longer throws errors for the ?: short ternary operator
+    - Thanks to Antoine Musso@hashar for the patch
+- Comment parser now supports non-English characters when splitting comment lines into words
+    - Thanks to Nik Sun@CandySunPlus for the patch
+- Exit statements are now recognised as valid closers for CASE and DEFAULT blocks
+    - Thanks to Maksim Kochkin@ksimka for the patch
+- PHP_CodeSniffer_CLI::process() can now be passed an incomplete array of CLI values
+    - Missing values will be set to the CLI defaults
+    - Thanks to Maksim Kochkin@ksimka for the patch
+
+### Fixed
+- Fixed bug #20093 : Bug with ternary operator token
+- Fixed bug #20097 : CLI.php throws error in php 5.2
+- Fixed bug #20100 : incorrect Function mysql() has been deprecated report
+- Fixed bug #20119 : PHP warning: invalid argument to str_repeat() in SVN blame report with -s
+- Fixed bug #20123 : PSR2 complains about an empty second statement in for-loop
+- Fixed bug #20131 : PHP errors in svnblame report, if there are files not under version control
+- Fixed bug #20133 : Allow "HG: hg_id" as value for @version tag
+
+## 1.4.8 - 2013-11-26
+### Changed
+- Generic ScopeIndentSniff now allows for ignored tokens to be set via ruleset.xml files
+    - E.g., to ignore comments, override a property using:
+    - name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"
+- PSR2 standard now ignores comments when checking indentation rules
+- Squiz OperatorSpacingSniff no longer throws errors for the ?: short ternary operator
+    - Thanks to Antoine Musso@hashar for the patch
+- Comment parser now supports non-English characters when splitting comment lines into words
+    - Thanks to Nik Sun@CandySunPlus for the patch
+- Exit statements are now recognised as valid closers for CASE and DEFAULT blocks
+    - Thanks to Maksim Kochkin@ksimka for the patch
+- PHP_CodeSniffer_CLI::process() can now be passed an incomplete array of CLI values
+    - Missing values will be set to the CLI defaults
+    - Thanks to Maksim Kochkin@ksimka for the patch
+
+### Fixed
+- Fixed bug #20097 : CLI.php throws error in php 5.2
+- Fixed bug #20100 : incorrect Function mysql() has been deprecated report
+- Fixed bug #20119 : PHP warning: invalid argument to str_repeat() in SVN blame report with -s
+- Fixed bug #20123 : PSR2 complains about an empty second statement in for-loop
+- Fixed bug #20131 : PHP errors in svnblame report, if there are files not under version control
+- Fixed bug #20133 : Allow "HG: hg_id" as value for @version tag
+
+## 1.5.0RC4 - 2013-09-26
+### Changed
+- You can now restrict violations to individual sniff codes using the --sniffs command line argument
+    - Previously, this only restricted violations to an entire sniff and not individual messages
+    - If you have scripts calling PHP_CodeSniffer::process() or creating PHP_CodeSniffer_File objects, you must update your code
+    - The array of restrictions passed to PHP_CodeSniffer::process() must now be an array of sniff codes instead of class names
+    - The PHP_CodeSniffer_File::__construct() method now requires an array of restrictions to be passed
+- Doc generation is now working again
+- Progress information now shows the percentage complete at the end of each line
+- Added report type --report=junit to show the error list in a JUnit compatible format
+    - Thanks to Oleg Lobach@bladeofsteel for the contribution
+- Added support for the PHP 5.4 callable type hint
+- Fixed problem where some file content could be ignored when checking STDIN
+- Version information is now printed when installed via composer or run from a Git clone (request #20050)
+- Added Squiz DisallowBooleanStatementSniff to ban boolean operators outside of control structure conditions
+- The CSS tokenizer is now more reliable when encountering 'list' and 'break' strings
+- Coding standard ignore comments can now appear instead doc blocks as well as inline comments
+    - Thanks to Stuart Langley@sjlangley for the patch
+- Generic LineLengthSniff now ignores SVN URL and Head URL comments
+    - Thanks to Karl DeBisschop@kdebisschop for the patch
+- PEAR MultiLineConditionSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- PEAR MultiLineAssignmentSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- PEAR FunctionDeclarationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- Squiz SwitchDeclarationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- Squiz CSS IndentationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Hugo Fonseca@fonsecas72 for the patch
+- Squiz and MySource File and Function comment sniffs now allow all tags and don't require a particular licence
+- Squiz standard now allows lines to be 120 characters long before warning; up from 85
+- Squiz LowercaseStyleDefinitionSniff no longer throws errors for class names in nested style definitions
+- Squiz ClassFileNameSniff no longer throws errors when checking STDIN
+- Squiz CSS sniffs no longer generate errors for IE filters
+- Squiz CSS IndentationSniff no longer sees comments as blank lines
+- Squiz LogicalOperatorSpacingSniff now ignores whitespace at the end of a line
+- Squiz.Scope.MethodScope.Missing error message now mentions 'visibility' instead of 'scope modifier'
+    - Thanks to Renat Akhmedyanov@r3nat for the patch
+- Added support for the PSR2 multi-line arguments errata
+- The PSR2 standard no longer throws errors for additional spacing after a type hint
+- PSR UseDeclarationSniff no longer throws errors for USE statements inside TRAITs
+
+### Fixed
+- Fixed cases where code was incorrectly assigned the T_GOTO_LABEL token when used in a complex CASE condition
+- Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
+    - Adds new error message for single-line arrays that end with a comma
+- Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses
+- Fixed bug #20043 : Mis-interpretation of Foo::class
+- Fixed bug #20044 : PSR1 camelCase check does not ignore leading underscores
+- Fixed bug #20045 : Errors about indentation for closures with multi-line 'use' in functions
+- Fixed bug #20051 : Undefined index: scope_opener / scope_closer
+    - Thanks to Anthon Pang@robocoder for the patch
+
+## 1.4.7 - 2013-09-26
+### Changed
+- Added report type --report=junit to show the error list in a JUnit compatible format
+    - Thanks to Oleg Lobach@bladeofsteel for the contribution
+- Added support for the PHP 5.4 callable type hint
+- Fixed problem where some file content could be ignored when checking STDIN
+- Version information is now printed when installed via composer or run from a Git clone (request #20050)
+- The CSS tokenizer is now more reliable when encountering 'list' and 'break' strings
+- Coding standard ignore comments can now appear instead doc blocks as well as inline comments
+    - Thanks to Stuart Langley@sjlangley for the patch
+- Generic LineLengthSniff now ignores SVN URL and Head URL comments
+    - Thanks to Karl DeBisschop@kdebisschop for the patch
+- PEAR MultiLineConditionSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- PEAR MultiLineAssignmentSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- PEAR FunctionDeclarationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- Squiz SwitchDeclarationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Szabolcs Sulik@blerou for the patch
+- Squiz CSS IndentationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
+    - Thanks to Hugo Fonseca@fonsecas72 for the patch
+- Squiz and MySource File and Function comment sniffs now allow all tags and don't require a particular licence
+- Squiz LowercaseStyleDefinitionSniff no longer throws errors for class names in nested style definitions
+- Squiz ClassFileNameSniff no longer throws errors when checking STDIN
+- Squiz CSS sniffs no longer generate errors for IE filters
+- Squiz CSS IndentationSniff no longer sees comments as blank lines
+- Squiz LogicalOperatorSpacingSniff now ignores whitespace at the end of a line
+- Squiz.Scope.MethodScope.Missing error message now mentions 'visibility' instead of 'scope modifier'
+    - Thanks to Renat Akhmedyanov@r3nat for the patch
+- Added support for the PSR2 multi-line arguments errata
+- The PSR2 standard no longer throws errors for additional spacing after a type hint
+- PSR UseDeclarationSniff no longer throws errors for USE statements inside TRAITs
+
+### Fixed
+- Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
+    - Adds new error message for single-line arrays that end with a comma
+- Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses
+- Fixed bug #20043 : Mis-interpretation of Foo::class
+- Fixed bug #20044 : PSR1 camelCase check does not ignore leading underscores
+- Fixed bug #20045 : Errors about indentation for closures with multi-line 'use' in functions
+
+## 1.5.0RC3 - 2013-07-25
+### Changed
+- Added report type --report=json to show the error list and total counts for all checked files
+    - Thanks to Jeffrey Fisher@jeffslofish for the contribution
+- PHP_CodeSniffer::isCamelCaps now allows for acronyms at the start of a string if the strict flag is FALSE
+    - acronyms are defined as at least 2 uppercase characters in a row
+    - e.g., the following is now valid camel caps with strict set to FALSE: XMLParser
+- The PHP tokenizer now tokenizes goto labels as T_GOTO_LABEL instead of T_STRING followed by T_COLON
+- The JS tokenizer now has support for the T_THROW token
+- Symlinked directories inside CodeSniffer/Standards and in ruleset.xml files are now supported
+    - Only available since PHP 5.2.11 and 5.3.1
+    - Thanks to Maik Penz@goatherd for the patch
+- The JS tokenizer now correctly identifies T_INLINE_ELSE tokens instead of leaving them as T_COLON
+    - Thanks to Arnout Boks@aboks for the patch
+- Explaining a standard (phpcs -e) that uses namespaces now works correctly
+- Restricting a check to specific sniffs (phpcs --sniffs=...) now works correctly with namespaced sniffs
+    - Thanks to Maik Penz@goatherd for the patch
+- Docs added for the entire Generic standard, and many sniffs from other standards are now documented as well
+    - Thanks to Spencer Rinehart@nubs for the contribution
+- Clearer error message for when the sniff class name does not match the directory structure
+- Generated HTML docs now correctly show the open PHP tag in code comparison blocks
+- Added Generic InlineHTMLSniff to ensure a file only contains PHP code
+- Added Squiz ShorthandSizeSniff to check that CSS sizes are using shorthand notation only when 1 or 2 values are used
+- Added Squiz ForbiddenStylesSniff to ban the use of some deprecated browser-specific styles
+- Added Squiz NamedColoursSniff to ban the use of colour names
+- PSR2 standard no longer enforces no whitespace between the closing parenthesis of a function call and the semicolon
+- PSR2 ClassDeclarationSniff now ignores empty classes when checking the end brace position
+- PSR2 SwitchDeclarationSniff no longer reports errors for empty lines between CASE statements
+- PEAR ObjectOperatorIndentSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the indent setting in a ruleset.xml file to change
+    - Thanks to Andrey Mindubaev@covex-nn for the patch
+- Squiz FileExtensionSniff now supports traits
+    - Thanks to Lucas Green@mythril for the patch
+- Squiz ArrayDeclarationSniff no longer reports errors for no comma at the end of a line that contains a function call
+- Squiz SwitchDeclarationSniff now supports T_CONTINUE and T_THROW as valid case/default breaking statements
+- Squiz CommentedOutCodeSniff is now better at ignoring commented out HTML, XML and regular expressions
+- Squiz DisallowComparisonAssignmentSniff no longer throws errors for the third expression in a FOR statement
+- Squiz ColourDefinitionSniff no longer throws errors for some CSS class names
+- Squiz ControlStructureSpacingSniff now supports all types of CASE/DEFAULT breaking statements
+- Generic CallTimePassByReferenceSniff now reports errors for functions called using a variable
+    - Thanks to Maik Penz@goatherd for the patch
+- Generic ConstructorNameSniff no longer throws a notice for abstract constructors inside abstract classes
+    - Thanks to Spencer Rinehart@nubs for the patch
+- Squiz ComparisonOperatorUsageSniff now checks inside elseif statements
+    - Thanks to Arnout Boks@aboks for the patch
+- Squiz OperatorSpacingSniff now reports errors for no spacing around inline then and else tokens
+    - Thanks to Arnout Boks@aboks for the patch
+
+### Fixed
+- Fixed bug #19811 : Comments not ignored in all cases in AbstractPatternSniff
+    - Thanks to Erik Wiffin@erikwiffin for the patch
+- Fixed bug #19892 : ELSE with no braces causes incorrect SWITCH break statement indentation error
+- Fixed bug #19897 : Indenting warnings in templates not consistent
+- Fixed bug #19908 : PEAR MultiLineCondition Does Not Apply elseif
+- Fixed bug #19930 : option --report-file generate an empty file
+- Fixed bug #19935 : notify-send reports do not vanish in gnome-shell
+    - Thanks to Christian Weiske@cweiske for the patch
+- Fixed bug #19944 : docblock squiz sniff "return void" trips over return in lambda function
+- Fixed bug #19953 : PSR2 - Spaces before interface name for abstract class
+- Fixed bug #19956 : phpcs warns for Type Hint missing Resource
+- Fixed bug #19957 : Does not understand trait method aliasing
+- Fixed bug #19968 : Permission denied on excluded directory
+- Fixed bug #19969 : Sniffs with namespace not recognized in reports
+- Fixed bug #19997 : Class names incorrectly detected as constants
+
+## 1.4.6 - 2013-07-25
+### Changed
+- Added report type --report=json to show the error list and total counts for all checked files
+    - Thanks to Jeffrey Fisher@jeffslofish for the contribution
+- The JS tokenizer now has support for the T_THROW token
+- Symlinked directories inside CodeSniffer/Standards and in ruleset.xml files are now supported
+    - Only available since PHP 5.2.11 and 5.3.1
+    - Thanks to Maik Penz@goatherd for the patch
+- The JS tokenizer now correctly identifies T_INLINE_ELSE tokens instead of leaving them as T_COLON
+    - Thanks to Arnout Boks@aboks for the patch
+- Explaining a standard (phpcs -e) that uses namespaces now works correctly
+- Restricting a check to specific sniffs (phpcs --sniffs=...) now works correctly with namespaced sniffs
+    - Thanks to Maik Penz@goatherd for the patch
+- Docs added for the entire Generic standard, and many sniffs from other standards are now documented as well
+    - Thanks to Spencer Rinehart@nubs for the contribution
+- Clearer error message for when the sniff class name does not match the directory structure
+- Generated HTML docs now correctly show the open PHP tag in code comparison blocks
+- Added Generic InlineHTMLSniff to ensure a file only contains PHP code
+- Added Squiz ShorthandSizeSniff to check that CSS sizes are using shorthand notation only when 1 or 2 values are used
+- Added Squiz ForbiddenStylesSniff to ban the use of some deprecated browser-specific styles
+- Added Squiz NamedColoursSniff to ban the use of colour names
+- PSR2 standard no longer enforces no whitespace between the closing parenthesis of a function call and the semicolon
+- PSR2 ClassDeclarationSniff now ignores empty classes when checking the end brace position
+- PSR2 SwitchDeclarationSniff no longer reports errors for empty lines between CASE statements
+- PEAR ObjectOperatorIndentSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the indent setting in a ruleset.xml file to change
+    - Thanks to Andrey Mindubaev@covex-nn for the patch
+- Squiz FileExtensionSniff now supports traits
+    - Thanks to Lucas Green@mythril for the patch
+- Squiz ArrayDeclarationSniff no longer reports errors for no comma at the end of a line that contains a function call
+- Squiz SwitchDeclarationSniff now supports T_CONTINUE and T_THROW as valid case/default breaking statements
+- Squiz CommentedOutCodeSniff is now better at ignoring commented out HTML, XML and regular expressions
+- Squiz DisallowComparisonAssignmentSniff no longer throws errors for the third expression in a FOR statement
+- Squiz ColourDefinitionSniff no longer throws errors for some CSS class names
+- Squiz ControlStructureSpacingSniff now supports all types of CASE/DEFAULT breaking statements
+- Generic CallTimePassByReferenceSniff now reports errors for functions called using a variable
+    - Thanks to Maik Penz@goatherd for the patch
+- Generic ConstructorNameSniff no longer throws a notice for abstract constructors inside abstract classes
+    - Thanks to Spencer Rinehart@nubs for the patch
+- Squiz ComparisonOperatorUsageSniff now checks inside elseif statements
+    - Thanks to Arnout Boks@aboks for the patch
+- Squiz OperatorSpacingSniff now reports errors for no spacing around inline then and else tokens
+    - Thanks to Arnout Boks@aboks for the patch
+
+### Fixed
+- Fixed bug #19811 : Comments not ignored in all cases in AbstractPatternSniff
+    - Thanks to Erik Wiffin@erikwiffin for the patch
+- Fixed bug #19892 : ELSE with no braces causes incorrect SWITCH break statement indentation error
+- Fixed bug #19897 : Indenting warnings in templates not consistent
+- Fixed bug #19908 : PEAR MultiLineCondition Does Not Apply elseif
+- Fixed bug #19913 : Running phpcs in interactive mode causes warnings
+    - Thanks to Harald Franndorferpear-gemineye for the patch
+- Fixed bug #19935 : notify-send reports do not vanish in gnome-shell
+    - Thanks to Christian Weiske@cweiske for the patch
+- Fixed bug #19944 : docblock squiz sniff "return void" trips over return in lambda function
+- Fixed bug #19953 : PSR2 - Spaces before interface name for abstract class
+- Fixed bug #19956 : phpcs warns for Type Hint missing Resource
+- Fixed bug #19957 : Does not understand trait method aliasing
+- Fixed bug #19968 : Permission denied on excluded directory
+- Fixed bug #19969 : Sniffs with namespace not recognized in reports
+- Fixed bug #19997 : Class names incorrectly detected as constants
+
+## 1.5.0RC2 - 2013-04-04
+### Changed
+- Ruleset processing has been rewritten to be more predictable
+    - Provides much better support for relative paths inside ruleset files
+    - May mean that sniffs that were previously ignored are now being included when importing external rulesets
+    - Ruleset processing output can be seen by using the -vv command line argument
+    - Internal sniff registering functions have all changed, so please review custom scripts
+- You can now pass multiple coding standards on the command line, comma separated (request #19144)
+    - Works with built-in or custom standards and rulesets, or a mix of both
+- You can now exclude directories or whole standards in a ruleset XML file (request #19731)
+    - e.g., exclude "Generic.Commenting" or just "Generic"
+    - You can also pass in a path to a directory instead, if you know it
+- Added Generic LowerCaseKeywordSniff to ensure all PHP keywords are defined in lowercase
+    - The PSR2 and Squiz standards now use this sniff
+- Added Generic SAPIUsageSniff to ensure the PHP_SAPI constant is used instead of php_sapi_name() (request #19863)
+- Squiz FunctionSpacingSniff now has a setting to specify how many lines there should between functions (request #19843)
+    - Default remains at 2
+    - Override the "spacing" setting in a ruleset.xml file to change
+- Squiz LowercasePHPFunctionSniff no longer throws errors for the limited set of PHP keywords it was checking
+    - Add a rule for Generic.PHP.LowerCaseKeyword to your ruleset to replicate this functionality
+- Added support for the PHP 5.4 T_CALLABLE token so it can be used in lower PHP versions
+- Generic EndFileNoNewlineSniff now supports checking of CSS and JS files
+- PSR2 SwitchDeclarationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the indent setting in a ruleset.xml file to change
+    - Thanks to Asher Snyder@asnyder for the patch
+- Generic ScopeIndentSniff now has a setting to specify a list of tokens that should be ignored
+    - The first token on the line is checked and the whole line is ignored if the token is in the array
+    - Thanks to Eloy Lafuente@stronk7 for the patch
+- Squiz LowercaseClassKeywordsSniff now checks for the TRAIT keyword
+    - Thanks to Anthon Pang@robocoder for the patch
+- If you create your own PHP_CodeSniffer object, PHPCS will no longer exit when an unknown argument is found
+    - This allows you to create wrapper scripts for PHPCS more easily
+- PSR2 MethodDeclarationSniff no longer generates a notice for methods named "_"
+    - Thanks to Bart S@zBart for the patch
+- Squiz BlockCommentSniff no longer reports that a blank line between a scope closer and block comment is invalid
+- Generic DuplicateClassNameSniff no longer reports an invalid error if multiple PHP open tags exist in a file
+- Generic DuplicateClassNameSniff no longer reports duplicate errors if multiple PHP open tags exist in a file
+
+### Fixed
+- Fixed bug #19819 : Freeze with syntax error in use statement
+- Fixed bug #19820 : Wrong message level in Generic_Sniffs_CodeAnalysis_EmptyStatementSniff
+- Fixed bug #19859 : CodeSniffer::setIgnorePatterns API changed
+- Fixed bug #19871 : findExtendedClassName doesn't return FQCN on namespaced classes
+- Fixed bug #19879 : bitwise and operator interpreted as reference by value
+
+## 1.4.5 - 2013-04-04
+### Changed
+- Added Generic LowerCaseKeywordSniff to ensure all PHP keywords are defined in lowercase
+    - The PSR2 and Squiz standards now use this sniff
+- Added Generic SAPIUsageSniff to ensure the PHP_SAPI constant is used instead of php_sapi_name() (request #19863)
+- Squiz FunctionSpacingSniff now has a setting to specify how many lines there should between functions (request #19843)
+    - Default remains at 2
+    - Override the "spacing" setting in a ruleset.xml file to change
+- Squiz LowercasePHPFunctionSniff no longer throws errors for the limited set of PHP keywords it was checking
+    - Add a rule for Generic.PHP.LowerCaseKeyword to your ruleset to replicate this functionality
+- Added support for the PHP 5.4 T_CALLABLE token so it can be used in lower PHP versions
+- Generic EndFileNoNewlineSniff now supports checking of CSS and JS files
+- PSR2 SwitchDeclarationSniff now has a setting to specify how many spaces code should be indented
+    - Default remains at 4; override the indent setting in a ruleset.xml file to change
+    - Thanks to Asher Snyder@asnyder for the patch
+- Generic ScopeIndentSniff now has a setting to specify a list of tokens that should be ignored
+    - The first token on the line is checked and the whole line is ignored if the token is in the array
+    - Thanks to Eloy Lafuente@stronk7 for the patch
+- Squiz LowercaseClassKeywordsSniff now checks for the TRAIT keyword
+    - Thanks to Anthon Pang@robocoder for the patch
+- If you create your own PHP_CodeSniffer object, PHPCS will no longer exit when an unknown argument is found
+    - This allows you to create wrapper scripts for PHPCS more easily
+- PSR2 MethodDeclarationSniff no longer generates a notice for methods named "_"
+    - Thanks to Bart S@zBart for the patch
+- Squiz BlockCommentSniff no longer reports that a blank line between a scope closer and block comment is invalid
+- Generic DuplicateClassNameSniff no longer reports an invalid error if multiple PHP open tags exist in a file
+- Generic DuplicateClassNameSniff no longer reports duplicate errors if multiple PHP open tags exist in a file
+
+### Fixed
+- Fixed bug #19819 : Freeze with syntax error in use statement
+- Fixed bug #19820 : Wrong message level in Generic_Sniffs_CodeAnalysis_EmptyStatementSniff
+- Fixed bug #19859 : CodeSniffer::setIgnorePatterns API changed
+- Fixed bug #19871 : findExtendedClassName doesn't return FQCN on namespaced classes
+- Fixed bug #19879 : bitwise and operator interpreted as reference by value
+
+## 1.5.0RC1 - 2013-02-08
+### Changed
+- Reports have been completely rewritten to consume far less memory
+    - Each report is incrementally written to the file system during a run and then printed out when the run ends
+    - There is no longer a need to keep the list of errors and warnings in memory during a run
+- Multi-file sniff support has been removed because they are too memory intensive
+    - If you have a custom multi-file sniff, you can convert it into a standard sniff quite easily
+    - See CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php for an example
+
+## 1.4.4 - 2013-02-07
+### Changed
+- Ignored lines no longer cause the summary report to show incorrect error and warning counts
+    - Thanks to Bert Van Hauwaert@becoded for the patch
+- Added Generic CSSLintSniff to run CSSLint over a CSS file and report warnings
+    - Set full command to run CSSLint using phpcs --config-set csslint_path /path/to/csslint
+    - Thanks to Roman Levishchenko@index0h for the contribution
+- Added PSR2 ControlStructureSpacingSniff to ensure there are no spaces before and after parenthesis in control structures
+    - Fixes bug #19732 : PSR2: some control structures errors not reported
+- Squiz commenting sniffs now support non-English characters when checking for capital letters
+    - Thanks to Roman Levishchenko@index0h for the patch
+- Generic EndFileNewlineSniff now supports JS and CSS files
+    - Thanks to Denis Ryabkov@dryabkov for the patch
+- PSR1 SideEffectsSniff no longer reports constant declarations as side effects
+- Notifysend report now supports notify-send versions before 0.7.3
+    - Thanks to Ken Guest@kenguest for the patch
+- PEAR and Squiz FunctionCommentSniffs no longer report errors for misaligned argument comments when they are blank
+    - Thanks to Thomas Peterson@boonkerz for the patch
+- Squiz FunctionDeclarationArgumentSpacingSniff now works correctly for equalsSpacing values greater than 0
+    - Thanks to Klaus Purer@klausi for the patch
+- Squiz SuperfluousWhitespaceSniff no longer throws errors for CSS files with no newline at the end
+- Squiz SuperfluousWhitespaceSniff now allows a single newline at the end of JS and CSS files
+
+### Fixed
+- Fixed bug #19755 : Token of T_CLASS type has no scope_opener and scope_closer keys
+- Fixed bug #19759 : Squiz.PHP.NonExecutableCode fails for return function()...
+- Fixed bug #19763 : Use statements for traits not recognised correctly for PSR2 code style
+- Fixed bug #19764 : Instead of for traits throws uppercase constant name errors
+- Fixed bug #19772 : PSR2_Sniffs_Namespaces_UseDeclarationSniff does not properly recognize last use
+- Fixed bug #19775 : False positive in NonExecutableCode sniff when not using curly braces
+- Fixed bug #19782 : Invalid found size functions in loop when using object operator
+- Fixed bug #19799 : config folder is not created automatically
+- Fixed bug #19804 : JS Tokenizer wrong /**/ parsing
+
+## 1.4.3 - 2012-12-04
+### Changed
+- Added support for the PHP 5.5 T_FINALLY token to detect try/catch/finally statements
+- Added empty CodeSniffer.conf to enable config settings for Composer installs
+- Added Generic EndFileNoNewlineSniff to ensure there is no newline at the end of a file
+- Autoloader can now load PSR-0 compliant classes
+    - Thanks to Maik Penz@goatherd for the patch
+- Squiz NonExecutableCodeSniff no longer throws error for multi-line RETURNs inside CASE statements
+    - Thanks to Marc Ypes@ceeram for the patch
+- Squiz OperatorSpacingSniff no longer reports errors for negative numbers inside inline THEN statements
+    - Thanks to Klaus Purer@klausi for the patch
+- Squiz OperatorSpacingSniff no longer reports errors for the assignment of operations involving negative numbers
+- Squiz SelfMemberReferenceSniff can no longer get into an infinite loop when checking a static call with a namespace
+    - Thanks to Andy Grunwald@andygrunwald for the patch
+
+### Fixed
+- Fixed bug #19699 : Generic.Files.LineLength giving false positives when tab-width is used
+- Fixed bug #19726 : Wrong number of spaces expected after instanceof static
+- Fixed bug #19727 : PSR2: no error reported when using } elseif {
+
+## 1.4.2 - 2012-11-09
+### Changed
+- PHP_CodeSniffer can now be installed using Composer
+    - Require squizlabs/php_codesniffer in your composer.json file
+    - Thanks to Rob Bast@alcohol, Stephen Rees-Carter@valorin, Stefano Kowalke@Konafets and Ivan Habunek@ihabunek for help with this
+- Squiz BlockCommentSniff and InlineCommentSniff no longer report errors for trait block comments
+- Squiz SelfMemberReferenceSniff now supports namespaces
+    - Thanks to Andy Grunwald@andygrunwald for the patch
+- Squiz FileCommentSniff now uses tag names inside the error codes for many messages
+    - This allows you to exclude specific missing, out of order etc., tags
+- Squiz SuperfluousWhitespaceSniff now has an option to ignore blank lines
+    - This will stop errors being reported for lines that contain only whitespace
+    - Set the ignoreBlankLines property to TRUE in your ruleset.xml file to enable this
+- PSR2 no longer reports errors for whitespace at the end of blank lines
+
+### Fixed
+- Fixed gitblame report not working on Windows
+    - Thanks to Rogerio Prado de Jesus@rogeriopradoj
+- Fixed an incorrect error in Squiz OperatorSpacingSniff for default values inside a closure definition
+- Fixed bug #19691 : SubversionPropertiesSniff fails to find missing properties
+    - Thanks to Kevin Winahradskypear-kwinahradsky for the patch
+- Fixed bug #19692 : DisallowMultipleAssignments is triggered by a closure
+- Fixed bug #19693 : exclude-patterns no longer work on specific messages
+- Fixed bug #19694 : Squiz.PHP.LowercasePHPFunctions incorrectly matches return by ref functions
+
+## 1.4.1 - 2012-11-02
+### Changed
+- All ignore patterns have been reverted to being checked against the absolute path of a file
+    - Patterns can be specified to be relative in a ruleset.xml file, but nowhere else
+    - e.g., exclude-pattern type="relative"^tests/*/exclude-pattern (with angle brackets, not square brackets)
+- Added support for PHP tokenizing of T_INLINE_ELSE colons, so this token type is now available
+    - Custom sniffs that rely on looking for T_COLON tokens inside inline if statements must be changed to use the new token
+    - Fixes bug #19666 : PSR1.Files.SideEffects throws a notice Undefined index: scope_closer
+- Messages can now be changed from errors to warnings (and vice versa) inside ruleset.xml files
+    - As you would with "message" and "severity", specify a "type" tag under a "rule" tag and set the value to "error" or "warning"
+- PHP_CodeSniffer will now generate a warning on files that it detects have mixed line endings
+    - This warning has the code Internal.LineEndings.Mixed and can be overridden in a ruleset.xml file
+    - Thanks to Vit Brunner@tasuki for help with this
+- Sniffs inside PHP 5.3 namespaces are now supported, along with the existing underscore-style emulated namespaces
+    - For example: namespace MyStandard\Sniffs\Arrays; class ArrayDeclarationSniff implements \PHP_CodeSniffer_Sniff { ...
+    - Thanks to Till Klampaeckel@till for the patch
+- Generic DuplicateClassNameSniff is no longer a multi-file sniff, so it won't max out your memory
+    - Multi-file sniff support should be considered deprecated as standard sniffs can now do the same thing
+- Added Generic DisallowSpaceIndent to check that files are indented using tabs
+- Added Generic OneClassPerFileSniff to check that only one class is defined in each file
+    - Thanks to Andy Grunwald@andygrunwald for the contribution
+- Added Generic OneInterfacePerFileSniff to check that only one interface is defined in each file
+    - Thanks to Andy Grunwald@andygrunwald for the contribution
+- Added Generic LowercasedFilenameSniff to check that filenames are lowercase
+    - Thanks to Andy Grunwald@andygrunwald for the contribution
+- Added Generic ClosingPHPTagSniff to check that each open PHP tag has a corresponding close tag
+    - Thanks to Andy Grunwald@andygrunwald for the contribution
+- Added Generic CharacterBeforePHPOpeningTagSniff to check that the open PHP tag is the first content in a file
+    - Thanks to Andy Grunwald@andygrunwald for the contribution
+- Fixed incorrect errors in Squiz OperatorBracketSniff and OperatorSpacingSniff for negative numbers in CASE statements
+    - Thanks to Arnout Boks@aboks for the patch
+- Generic CamelCapsFunctionNameSniff no longer enforces exact case matching for PHP magic methods
+- Generic CamelCapsFunctionNameSniff no longer throws errors for overridden SOAPClient methods prefixed with double underscores
+    - Thanks to Dorian Villet@gnutix for the patch
+- PEAR ValidFunctionNameSniff now supports traits
+- PSR1 ClassDeclarationSniff no longer throws an error for non-namespaced code if PHP version is less than 5.3.0
+
+### Fixed
+- Fixed bug #19616 : Nested switches cause false error in PSR2
+- Fixed bug #19629 : PSR2 error for inline comments on multi-line argument lists
+- Fixed bug #19644 : Alternative syntax, e.g. if/endif triggers Inline Control Structure error
+- Fixed bug #19655 : Closures reporting as multi-line when they are not
+- Fixed bug #19675 : Improper indent of nested anonymous function bodies in a call
+- Fixed bug #19685 : PSR2 catch-22 with empty third statement in for loop
+- Fixed bug #19687 : Anonymous functions inside arrays marked as indented incorrectly in PSR2
+
+## 1.4.0 - 2012-09-26
+### Changed
+- Added PSR1 and PSR2 coding standards that can be used to check your code against these guidelines
+- PHP 5.4 short array syntax is now detected and tokens are assigned to the open and close characters
+    - New tokens are T_OPEN_SHORT_ARRAY and T_CLOSE_SHORT_ARRAY as PHP does not define its own
+- Added the ability to explain a coding standard by listing the sniffs that it includes
+    - The sniff list includes all imported and native sniffs
+    - Explain a standard by using the -e and --standard=standard command line arguments
+    - E.g., phpcs -e --standard=Squiz
+    - Thanks to Ben Selby@benmatselby for the idea
+- Added report to show results using notify-send
+    - Use --report=notifysend to generate the report
+    - Thanks to Christian Weiske@cweiske for the contribution
+- The JS tokenizer now recognises RETURN as a valid closer for CASE and DEFAULT inside switch statements
+- AbstractPatternSniff now sets the ignoreComments option using a public var rather than through the constructor
+    - This allows the setting to be overwritten in ruleset.xml files
+    - Old method remains for backwards compatibility
+- Generic LowerCaseConstantSniff and UpperCaseConstantSniff no longer report errors on classes named True, False or Null
+- PEAR ValidFunctionNameSniff no longer enforces exact case matching for PHP magic methods
+- Squiz SwitchDeclarationSniff now allows RETURN statements to close a CASE or DEFAULT statement
+- Squiz BlockCommentSniff now correctly reports an error for blank lines before blocks at the start of a control structure
+
+### Fixed
+- Fixed a PHP notice generated when loading custom array settings from a ruleset.xml file
+- Fixed bug #17908 : CodeSniffer does not recognise optional @params
+    - Thanks to Pete Walkerpear-pete for the patch
+- Fixed bug #19538 : Function indentation code sniffer checks inside short arrays
+- Fixed bug #19565 : Non-Executable Code Sniff Broken for Case Statements with both return and break
+- Fixed bug #19612 : Invalid @package suggestion
+
+## 1.3.6 - 2012-08-08
+### Changed
+- Memory usage has been dramatically reduced when using the summary report
+    - Reduced memory is only available when displaying a single summary report to the screen
+    - PHP_CodeSniffer will not generate any messages in this case, storing only error counts instead
+    - Impact is most notable with very high error and warning counts
+- Significantly improved the performance of Squiz NonExecutableCodeSniff
+- Ignore patterns now check the relative path of a file based on the dir being checked
+    - Allows ignore patterns to become more generic as the path to the code is no longer included when checking
+    - Thanks to Kristof Coomans@kristofser for the patch
+- Sniff settings can now be changed by specifying a special comment format inside a file
+    - e.g., // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature allowMultipleArguments false
+    - If you change a setting, don't forget to change it back
+- Added Generic EndFileNewlineSniff to ensure PHP files end with a newline character
+- PEAR FunctionCallSignatureSniff now includes a setting to force one argument per line in multi-line calls
+    - Set allowMultipleArguments to false
+- Squiz standard now enforces one argument per line in multi-line function calls
+- Squiz FunctionDeclarationArgumentSpacingSniff now supports closures
+- Squiz OperatorSpacingSniff no longer throws an error for negative values inside an inline THEN statement
+    - Thanks to Klaus Purer@klausi for the patch
+- Squiz FunctionCommentSniff now throws an error for not closing a comment with */
+    - Thanks to Klaus Purer@klausi for the patch
+- Summary report no longer shows two lines of PHP_Timer output when showing sources
+
+### Fixed
+- Fixed undefined variable error in PEAR FunctionCallSignatureSniff for lines with no indent
+- Fixed bug #19502 : Generic.Files.LineEndingsSniff fails if no new-lines in file
+- Fixed bug #19508 : switch+return: Closing brace indented incorrectly
+- Fixed bug #19532 : The PSR-2 standard don't recognize Null in class names
+- Fixed bug #19546 : Error thrown for __call() method in traits
+
+## 1.3.5 - 2012-07-12
+### Changed
+- Added Generic CamelCapsFunctionNameSniff to just check if function and method names use camel caps
+    - Does not allow underscore prefixes for private/protected methods
+    - Defaults to strict checking, where two uppercase characters can not be next to each other
+    - Strict checking can be disabled in a ruleset.xml file
+- Squiz FunctionDeclarationArgumentSpacing now has a setting to specify how many spaces should surround equals signs
+    - Default remains at 0
+    - Override the equalsSpacing setting in a ruleset.xml file to change
+- Squiz ClassDeclarationSniff now throws errors for > 1 space before extends/implements class name with ns separator
+- Squiz standard now warns about deprecated functions using Generic DeprecatedFunctionsSniff
+- PEAR FunctionDeclarationSniff now reports an error for multiple spaces after the FUNCTION keyword and around USE
+- PEAR FunctionDeclarationSniff now supports closures
+- Squiz MultiLineFunctionDeclarationSniff now supports closures
+- Exclude rules written for Unix systems will now work correctly on Windows
+    - Thanks to Walter Tamboer@waltertamboer for the patch
+- The PHP tokenizer now recognises T_RETURN as a valid closer for T_CASE and T_DEFAULT inside switch statements
+
+### Fixed
+- Fixed duplicate message codes in Generic OpeningFunctionBraceKernighanRitchieSniff
+- Fixed bug #18651 : PHPunit Test cases for custom standards are not working on Windows
+- Fixed bug #19416 : Shorthand arrays cause bracket spacing errors
+- Fixed bug #19421 : phpcs doesn't recognize ${x} as equivalent to $x
+- Fixed bug #19428 : PHPCS Report "hgblame" doesn't support windows paths
+    - Thanks to Justin Rovang@rovangju for the patch
+- Fixed bug #19448 : Problem with detecting remote standards
+- Fixed bug #19463 : Anonymous functions incorrectly being flagged by NonExecutableCodeSniff
+- Fixed bug #19469 : PHP_CodeSniffer_File::getMemberProperties() sets wrong scope
+- Fixed bug #19471 : phpcs on Windows, when using Zend standard, doesn't catch problems
+    - Thanks to Ivan Habunek@ihabunek for the patch
+- Fixed bug #19478 : Incorrect indent detection in PEAR standard
+    - Thanks to Shane Auckland@shanethehat for the patch
+- Fixed bug #19483 : Blame Reports fail with space in directory name
+
+## 1.3.4 - 2012-05-17
+### Changed
+- Added missing package.xml entries for new Generic FixmeSniff
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Expected indents for PEAR ScopeClosingBraceSniff and FunctionCallSignatureSniff can now be set in ruleset files
+    - Both sniffs use a variable called "indent"
+    - Thanks to Thomas Despoixpear-tomdesp for the patch
+- Standards designed to be installed in the PHPCS Standards dir will now work outside this dir as well
+    - In particular, allows the Drupal CS to work without needing to symlink it into the PHPCS install
+    - Thanks to Peter Philipp@das-peter for the patch
+- Rule references for standards, directories and specific sniffs can now be relative in ruleset.xml files
+    - For example: ref="../MyStandard/Sniffs/Commenting/DisallowHashCommentsSniff.php"
+- Symlinked standards now work correctly, allowing aliasing of installed standards (request #19417)
+    - Thanks to Tom Klingenberg@ktomk for the patch
+- Squiz ObjectInstantiationSniff now allows objects to be returned without assigning them to a variable
+- Added Squiz.Commenting.FileComment.MissingShort error message for file comments that only contains tags
+    - Also stops undefined index errors being generated for these comments
+- Debug option -vv now shows tokenizer status for CSS files
+- Added support for new gjslint error formats
+    - Thanks to Meck@yesmeck for the patch
+- Generic ScopeIndentSniff now allows comment indents to not be exact even if the exact flag is set
+    - The start of the comment is still checked for exact indentation as normal
+- Fixed an issue in AbstractPatternSniff where comments were not being ignored in some cases
+- Fixed an issue in Zend ClosingTagSniff where the closing tag was not always being detected correctly
+    - Thanks to Jonathan Robson@jnrbsn for the patch
+- Fixed an issue in Generic FunctionCallArgumentSpacingSniff where closures could cause incorrect errors
+- Fixed an issue in Generic UpperCaseConstantNameSniff where errors were incorrectly reported on goto statements
+    - Thanks to Tom Klingenberg@ktomk for the patch
+- PEAR FileCommentSniff and ClassCommentSniff now support author emails with a single character in the local part
+    - E.g., a@me.com
+    - Thanks to Denis Shapkin for the patch
+
+### Fixed
+- Fixed bug #19290 : Generic indent sniffer fails for anonymous functions
+- Fixed bug #19324 : Setting show_warnings configuration option does not work
+- Fixed bug #19354 : Not recognizing references passed to method
+- Fixed bug #19361 : CSS tokenizer generates errors when PHP embedded in CSS file
+- Fixed bug #19374 : HEREDOC/NOWDOC Indentation problems
+- Fixed bug #19381 : traits and indentations in traits are not handled properly
+- Fixed bug #19394 : Notice in NonExecutableCodeSniff
+- Fixed bug #19402 : Syntax error when executing phpcs on Windows with parens in PHP path
+    - Thanks to Tom Klingenberg@ktomk for the patch
+- Fixed bug #19411 : magic method error on __construct()
+    - The fix required a rewrite of AbstractScopeSniff, so please test any sniffs that extend this class
+- Fixed bug #19412 : Incorrect error about assigning objects to variables when inside inline IF
+- Fixed bug #19413 : php_cs thinks I haven't used a parameter when I have
+- Fixed bug #19414 : php_cs seems to not track variables correctly in heredocs
+
+## 1.3.3 - 2012-02-07
+### Changed
+- Added new Generic FixmeSniff that shows error messages for all FIXME comments left in your code
+    - Thanks to Sam Graham@illusori for the contribution
+- The maxPercentage setting in the Squiz CommentedOutCodeSniff can now be overridden in a ruleset.xml file
+    - Thanks to Volker Dusch@edorian for the patch
+- The Checkstyle and XML reports now use XMLWriter
+    - Only change in output is that empty file tags are no longer produced for files with no violations
+    - Thanks to Sebastian Bergmann@sebastianbergmann for the patch
+- Added PHP_CodeSniffer_Tokens::$bracketTokens to give sniff writers fast access to open and close bracket tokens
+- Fixed an issue in AbstractPatternSniff where EOL tokens were not being correctly checked in some cases
+- PHP_CodeSniffer_File::getTokensAsString() now detects incorrect length value (request #19313)
+
+### Fixed
+- Fixed bug #19114 : CodeSniffer checks extension even for single file
+- Fixed bug #19171 : Show sniff codes option is ignored by some report types
+    - Thanks to Dominic Scheirlinck@dominics for the patch
+- Fixed bug #19188 : Lots of PHP Notices when analyzing the Symfony framework
+    - First issue was list-style.. lines in CSS files not properly adjusting open/close bracket positions
+    - Second issue was notices caused by bug #19137
+- Fixed bug #19208 : UpperCaseConstantName reports class members
+    - Was also a problem with LowerCaseConstantName as well
+- Fixed bug #19256 : T_DOC_COMMENT in CSS files breaks ClassDefinitionNameSpacingSniff
+    - Thanks to Klaus Purer@klausi for the patch
+- Fixed bug #19264 : Squiz.PHP.NonExecutableCode does not handle RETURN in CASE without BREAK
+- Fixed bug #19270 : DuplicateClassName does not handle namespaces correctly
+- Fixed bug #19283 : CSS @media rules cause false positives
+    - Thanks to Klaus Purer@klausi for the patch
+
+## 1.3.2 - 2011-12-01
+### Changed
+- Added Generic JSHintSniff to run jshint.js over a JS file and report warnings
+    - Set jshint path using phpcs --config-set jshint_path /path/to/jshint-rhino.js
+    - Set rhino path using phpcs --config-set rhino_path /path/to/rhino
+    - Thanks to Alexander Weiß for the contribution
+- Nowdocs are now tokenized using PHP_CodeSniffer specific T_NOWDOC tokens for easier identification
+- Generic UpperCaseConstantNameSniff no longer throws errors for namespaces
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Squiz NonExecutableCodeSniff now detects code after thrown exceptions
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Squiz OperatorSpacingSniff now ignores references
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Squiz FunctionCommentSniff now reports a missing function comment if it finds a standard code comment instead
+- Squiz FunctionCommentThrownTagSniff no longer reports errors if it can't find a function comment
+
+### Fixed
+- Fixed unit tests not running under Windows
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #18964 : "$stackPtr must be of type T_VARIABLE" on heredocs and nowdocs
+- Fixed bug #18973 : phpcs is looking for variables in a nowdoc
+- Fixed bug #18974 : Blank line causes "Multi-line function call not indented correctly"
+    - Adds new error message to ban empty lines in multi-line function calls
+- Fixed bug #18975 : "Closing parenthesis must be on a line by itself" also causes indentation error
+
+## 1.3.1 - 2011-11-03
+### Changed
+- All report file command line arguments now work with relative paths (request #17240)
+- The extensions command line argument now supports multi-part file extensions (request #17227)
+- Added report type --report=hgblame to show number of errors/warnings committed by authors in a Mercurial repository
+    - Has the same functionality as the svnblame report
+    - Thanks to Ben Selby@benmatselby for the patch
+- Added T_BACKTICK token type to make detection of backticks easier (request #18799)
+- Added pattern matching support to Generic ForbiddenFunctionsSniff
+    - If you are extending it and overriding register() or addError() you will need to review your sniff
+- Namespaces are now recognised as scope openers, although they do not require braces (request #18043)
+- Added new ByteOrderMarkSniff to Generic standard (request #18194)
+    - Throws an error if a byte order mark is found in any PHP file
+    - Thanks to Piotr Karaspear-ryba for the contribution
+- PHP_Timer output is no longer included in reports when being written to a file (request #18252)
+    - Also now shown for all report types if nothing is being printed to the screen
+- Generic DeprecatedFunctionSniff now reports functions as deprecated and not simply forbidden (request #18288)
+- PHPCS now accepts file contents from STDIN (request #18447)
+    - Example usage: cat temp.php | phpcs options  -OR-  phpcs options &lt; temp.php
+    - Not every sniff will work correctly due to the lack of a valid file path
+- PHP_CodeSniffer_Exception no longer extends PEAR_Exception (request #18483)
+    - PEAR_Exception added a requirement that PEAR had to be installed
+    - PHP_CodeSniffer is not used as a library, so unlikely to have any impact
+- PEAR FileCommentSniff now allows GIT IDs in the version tag (request #14874)
+- AbstractVariableSniff now supports heredocs
+    - Also includes some variable detection fixes
+    - Thanks to Sam Graham@illusori for the patch
+- Squiz FileCommentSniff now enforces rule that package names cannot start with the word Squiz
+- MySource AssignThisSniff now allows "this" to be assigned to the private var _self
+- PEAR ClassDeclaration sniff now supports indentation checks when using the alternate namespace syntax
+    - PEAR.Classes.ClassDeclaration.SpaceBeforeBrace message now contains 2 variables instead of 1
+    - Sniff allows overriding of the default indent level, which is set to 4
+    - Fixes bug #18933 : Alternative namespace declaration syntax confuses scope sniffs
+
+### Fixed
+- Fixed issue in Squiz FileCommentSniff where suggested package name was the same as the incorrect package name
+- Fixed some issues with Squiz ArrayDeclarationSniff when using function calls in array values
+- Fixed doc generation so it actually works again
+    - Also now works when being run from an SVN checkout as well as when installed as a PEAR package
+    - Should fix bug #18949 : Call to private method from static
+- Fixed bug #18465 : "self::" does not work in lambda functions
+    - Also corrects conversion of T_FUNCTION tokens to T_CLOSURE, which was not fixing token condition arrays
+- Fixed bug #18543 : CSS Tokenizer deletes too many #
+- Fixed bug #18624 : @throws namespace problem
+    - Thanks to Gavin Daviespear-boxgav for the patch
+- Fixed bug #18628 : Generic.Files.LineLength gives incorrect results with Windows line-endings
+- Fixed bug #18633 : CSS Tokenizer doesn't replace T_LIST tokens inside some styles
+- Fixed bug #18657 : anonymous functions wrongly indented
+- Fixed bug #18670 : UpperCaseConstantNameSniff fails on dynamic retrieval of class constant
+- Fixed bug #18709 : Code sniffer sniffs file if even if it's in --ignore
+    - Thanks to Artem Lopata@biozshock for the patch
+- Fixed bug #18762 : Incorrect handling of define and constant in UpperCaseConstantNameSniff
+    - Thanks to Thomas Bakerpear-bakert for the patch
+- Fixed bug #18769 : CSS Tokenizer doesn't replace T_BREAK tokens inside some styles
+- Fixed bug #18835 : Unreachable errors of inline returns of closure functions
+    - Thanks to Patrick Schmidtpear-woellchen for the patch
+- Fixed bug #18839 : Fix miscount of warnings in AbstractSniffUnitTest.php
+    - Thanks to Sam Graham@illusori for the patch
+- Fixed bug #18844 : Generic_Sniffs_CodeAnalysis_UnusedFunctionParameterSniff with empty body
+    - Thanks to Dmitri Medvedevpear-dvino for the patch
+- Fixed bug #18847 : Running Squiz_Sniffs_Classes_ClassDeclarationSniff results in PHP notice
+- Fixed bug #18868 : jslint+rhino: errors/warnings not detected
+    - Thanks to Christian Weiske@cweiske for the patch
+- Fixed bug #18879 : phpcs-svn-pre-commit requires escapeshellarg
+    - Thanks to Bjorn Katuinpear-bjorn for the patch
+- Fixed bug #18951 : weird behaviour with closures and multi-line use () params
+
+## 1.3.0 - 2011-03-17
+### Changed
+- Add a new token T_CLOSURE that replaces T_FUNCTION if the function keyword is anonymous
+- Many Squiz sniffs no longer report errors when checking closures; they are now ignored
+- Fixed some error messages in PEAR MultiLineConditionSniff that were not using placeholders for message data
+- AbstractVariableSniff now correctly finds variable names wrapped with curly braces inside double quoted strings
+- PEAR FunctionDeclarationSniff now ignores arrays in argument default values when checking multi-line declarations
+
+### Fixed
+- Fixed bug #18200 : Using custom named ruleset file as standard no longer works
+- Fixed bug #18196 : PEAR MultiLineCondition.SpaceBeforeOpenBrace not consistent with newline chars
+- Fixed bug #18204 : FunctionCommentThrowTag picks wrong exception type when throwing function call
+- Fixed bug #18222 : Add __invoke method to PEAR standard
+- Fixed bug #18235 : Invalid error generation in Squiz.Commenting.FunctionCommentThrowTag
+- Fixed bug #18250 : --standard with relative path skips Standards' "implicit" sniffs
+- Fixed bug #18274 : Multi-line IF and function call indent rules conflict
+- Fixed bug #18282 : Squiz doesn't handle final keyword before function comments
+    - Thanks to Dave Perrettpear-recurser for the patch
+- Fixed bug #18336 : Function isUnderscoreName gives php notices
+
+## 1.3.0RC2 - 2011-01-14
+### Changed
+- You can now print multiple reports for each run and print each to the screen or a file (request #12434)
+    - Format is --report-report=file (e.g., --report-xml=out.xml)
+    - Printing to screen is done by leaving file empty (e.g., --report-xml)
+    - Multiple reports can be specified in this way (e.g., --report-summary --report-xml=out.xml)
+    - The standard --report and --report-file command line arguments are unchanged
+- Added -d command line argument to set php.ini settings while running (request #17244)
+    - Usage is: phpcs -d memory_limit=32M -d ...
+    - Thanks to Ben Selby@benmatselby for the patch
+- Added -p command line argument to show progress during a run
+    - Dot means pass, E means errors found, W means only warnings found and S means skipped file
+    - Particularly good for runs where you are checking more than 100 files
+    - Enable by default with --config-set show_progress 1
+    - Will not print anything if you are already printing verbose output
+    - This has caused a big change in the way PHP_CodeSniffer processes files (API changes around processing)
+- You can now add exclude rules for individual sniffs or error messages (request #17903)
+    - Only available when using a ruleset.xml file to specify rules
+    - Uses the same exclude-pattern tags as normal but allows them inside rule tags
+- Using the -vvv option will now print a list of sniffs executed for each file and how long they took to process
+- Added Generic ClosureLinterSniff to run Google's gjslint over your JS files
+- The XML and CSV reports now include the severity of the error (request #18165)
+    - The Severity column in the CSV report has been renamed to Type, and a new Severity column added for this
+- Fixed issue with Squiz FunctionCommentSniff reporting incorrect type hint when default value uses namespace
+    - Thanks to Anti Veeranna for the patch
+- Generic FileLengthSniff now uses iconv_strlen to check line length if an encoding is specified (request #14237)
+- Generic UnnecessaryStringConcatSniff now allows strings to be combined to form a PHP open or close tag
+- Squiz SwitchDeclarationSniff no longer reports indentation errors for BREAK statements inside IF conditions
+- Interactive mode now always prints the full error report (ignores command line)
+- Improved regular expression detection in JavaScript files
+    - Added new T_TYPEOF token that can be used to target the typeof JS operator
+    - Fixes bug #17611 : Regular expression tokens not recognised
+- Squiz ScopeIndentSniff removed
+    - Squiz standard no longer requires additional indents between ob_* methods
+    - Also removed Squiz OutputBufferingIndentSniff that was checking the same thing
+- PHP_CodeSniffer_File::getMemberProperties() performance improved significantly
+    - Improves performance of Squiz ValidVariableNameSniff significantly
+- Squiz OperatorSpacingSniff performance improved significantly
+- Squiz NonExecutableCodeSniff performance improved significantly
+    - Will throw duplicate errors in some cases now, but these should be rare
+- MySource IncludeSystemSniff performance improved significantly
+- MySource JoinStringsSniff no longer reports an error when using join() on a named JS array
+- Warnings are now reported for each file when they cannot be opened instead of stopping the script
+    - Hide warnings with the -n command line argument
+    - Can override the warnings using the code Internal.DetectLineEndings
+
+### Fixed
+- Fixed bug #17693 : issue with pre-commit hook script with filenames that start with v
+- Fixed bug #17860 : isReference function fails with references in array
+    - Thanks to Lincoln Maskeypear-ljmaskey for the patch
+- Fixed bug #17902 : Cannot run tests when tests are symlinked into tests dir
+    - Thanks to Matt Button@BRMatt for the patch
+- Fixed bug #17928 : Improve error message for Generic_Sniffs_PHP_UpperCaseConstantSniff
+    - Thanks to Stefano Kowalke@Konafets for the patch
+- Fixed bug #18039 : JS Tokenizer crash when  is last character in file
+- Fixed bug #18047 : Incorrect handling of namespace aliases as constants
+    - Thanks to Dmitri Medvedevpear-dvino for the patch
+- Fixed bug #18072 : Impossible to exclude path from processing when symlinked
+- Fixed bug #18073 : Squiz.PHP.NonExecutableCode fault
+- Fixed bug #18117 : PEAR coding standard: Method constructor not sniffed as a function
+- Fixed bug #18135 : Generic FunctionCallArgumentSpacingSniff reports function declaration errors
+- Fixed bug #18140 : Generic scope indent in exact mode: strange expected/found values for switch
+- Fixed bug #18145 : Sniffs are not loaded for custom ruleset file
+    - Thanks to Scott McCammonpear-mccammos for the patch
+- Fixed bug #18152 : While and do-while with AbstractPatternSniff
+- Fixed bug #18191 : Squiz.PHP.LowercasePHPFunctions does not work with new Date()
+- Fixed bug #18193 : CodeSniffer doesn't reconize CR (\r) line endings
+
+## 1.3.0RC1 - 2010-09-03
+### Changed
+- Added exclude pattern support to ruleset.xml file so you can specify ignore patterns in a standard (request #17683)
+    - Use new exclude-pattern tags to include the ignore rules into your ruleset.xml file
+    - See CodeSniffer/Standards/PHPCS/ruleset.xml for an example
+- Added new --encoding command line argument to specify the encoding of the files being checked
+    - When set to utf-8, stops the XML-based reports from double-encoding
+    - When set to something else, helps the XML-based reports encode to utf-8
+    - Default value is iso-8859-1 but can be changed with --config-set encoding value
+- The report is no longer printed to screen when using the --report-file command line option (request #17467)
+    - If you want to print it to screen as well, use the -v command line argument
+- The SVN and GIT blame reports now also show percentage of reported errors per author (request #17606)
+    - Thanks to Ben Selby@benmatselby for the patch
+- Updated the SVN pre-commit hook to work with the new severity levels feature
+- Generic SubversionPropertiesSniff now allows properties to have NULL values (request #17682)
+    - A null value indicates that the property should exist but the value should not be checked
+- Generic UpperCaseConstantName Sniff now longer complains about the PHPUnit_MAIN_METHOD constant (request #17798)
+- Squiz FileComment sniff now checks JS files as well as PHP files
+- Squiz FunctionCommentSniff now supports namespaces in type hints
+
+### Fixed
+- Fixed a problem in Squiz OutputBufferingIndentSniff where block comments were reported as not indented
+- Fixed bug #17092 : Problems with utf8_encode and htmlspecialchars with non-ascii chars
+    - Use the new --encoding=utf-8 command line argument if your files are utf-8 encoded
+- Fixed bug #17629 : PHP_CodeSniffer_Tokens::$booleanOperators missing T_LOGICAL_XOR
+    - Thanks to Matthew Turland@elazar for the patch
+- Fixed bug #17699 : Fatal error generating code coverage with PHPUnit 5.3.0RC1
+- Fixed bug #17718 : Namespace 'use' statement: used global class name is recognized as constant
+- Fixed bug #17734 : Generic SubversionPropertiesSniff complains on non SVN files
+- Fixed bug #17742 : EmbeddedPhpSniff reacts negatively to file without closing php tag
+- Fixed bug #17823 : Notice: Please no longer include PHPUnit/Framework.php
+
+## 1.3.0a1 - 2010-07-15
+### Changed
+- All CodingStandard.php files have been replaced by ruleset.xml files
+    - Custom standards will need to be converted over to this new format to continue working
+- You can specify a path to your own custom ruleset.xml file by using the --standard command line arg
+    - e.g., phpcs --standard=/path/to/my/ruleset.xml
+- Added a new report type --report=gitblame to show how many errors and warnings were committed by each author
+    - Has the same functionality as the svnblame report
+    - Thanks to Ben Selby@benmatselby for the patch
+- A new token type T_DOLLAR has been added to allow you to sniff for variable variables (feature request #17095)
+    - Thanks to Ian Youngpear-youngian for the patch
+- JS tokenizer now supports T_POWER (^) and T_MOD_EQUAL (%=) tokens (feature request #17441)
+- If you have PHP_Timer installed, you'll now get a time/memory summary at the end of a script run
+    - Only happens when printing reports that are designed to be read on the command line
+- Added Generic DeprecatedFunctionsSniff to warn about the use of deprecated functions (feature request #16694)
+    - Thanks to Sebastian Bergmann@sebastianbergmann for the patch
+- Added Squiz LogicalOperatorSniff to ensure that logical operators are surrounded by single spaces
+- Added MySource ChannelExceptionSniff to ensure action files only throw ChannelException
+- Added new method getClassProperties() for sniffs to use to determine if a class is abstract and/or final
+    - Thanks to Christian Kaps@akkie for the patch
+- Generic UpperCaseConstantSniff no longer throws errors about namespaces
+    - Thanks to Christian Kaps@akkie for the patch
+- Squiz OperatorBracketSniff now correctly checks value assignments in arrays
+- Squiz LongConditionClosingCommentSniff now requires a comment for long CASE statements that use curly braces
+- Squiz LongConditionClosingCommentSniff now requires an exact comment match on the brace
+- MySource IncludeSystemSniff now ignores DOMDocument usage
+- MySource IncludeSystemSniff no longer requires inclusion of systems that are being implemented
+- Removed found and expected messages from Squiz ConcatenationSpacingSniff because they were messy and not helpful
+
+### Fixed
+- Fixed a problem where Generic CodeAnalysisSniff could show warnings if checking multi-line strings
+- Fixed error messages in Squiz ArrayDeclarationSniff reporting incorrect number of found and expected spaces
+- Fixed bug #17048 : False positive in Squiz_WhiteSpace_ScopeKeywordSpacingSniff
+- Fixed bug #17054 : phpcs more strict than PEAR CS regarding function parameter spacing
+- Fixed bug #17096 : Notice: Undefined index: scope_condition in ScopeClosingBraceSniff.php
+    - Moved PEAR.Functions.FunctionCallArgumentSpacing to Generic.Functions.FunctionCallArgumentSpacing
+- Fixed bug #17144 : Deprecated: Function eregi() is deprecated
+- Fixed bug #17236 : PHP Warning due to token_get_all() in DoubleQuoteUsageSniff
+- Fixed bug #17243 : Alternate Switch Syntax causes endless loop of Notices in SwitchDeclaration
+- Fixed bug #17313 : Bug with switch case structure
+- Fixed bug #17331 : Possible parse error: interfaces may not include member vars
+- Fixed bug #17337 : CSS tokenizer fails on quotes urls
+- Fixed bug #17420 : Uncaught exception when comment before function brace
+- Fixed bug #17503 : closures formatting is not supported
+
+## 1.2.2 - 2010-01-27
+### Changed
+- The core PHP_CodeSniffer_File methods now understand the concept of closures (feature request #16866)
+    - Thanks to Christian Kaps@akkie for the sample code
+- Sniffs can now specify violation codes for each error and warning they add
+    - Future versions will allow you to override messages and severities using these codes
+    - Specifying a code is optional, but will be required if you wish to support overriding
+- All reports have been broken into separate classes
+    - Command line usage and report output remains the same
+    - Thanks to Gabriele Santini for the patch
+- Added an interactive mode that can be enabled using the -a command line argument
+    - Scans files and stops when it finds a file with errors
+    - Waits for user input to recheck the file (hopefully you fixed the errors) or skip the file
+    - Useful for very large code bases where full rechecks take a while
+- The reports now show the correct number of errors and warnings found
+- The isCamelCaps method now allows numbers in class names
+- The JS tokenizer now correctly identifies boolean and bitwise AND and OR tokens
+- The JS tokenizer now correctly identifies regular expressions used in conditions
+- PEAR ValidFunctionNameSniff now ignores closures
+- Squiz standard now uses the PEAR setting of 85 chars for LineLengthSniff
+- Squiz ControlStructureSpacingSniff now ensure there are no spaces around parentheses
+- Squiz LongConditionClosingCommentSniff now checks for comments at the end of try/catch statements
+- Squiz LongConditionClosingCommentSniff now checks validity of comments for short structures if they exist
+- Squiz IncrementDecrementUsageSniff now has better checking to ensure it only looks at simple variable assignments
+- Squiz PostStatementCommentSniff no longer throws errors for end function comments
+- Squiz InlineCommentSniff no longer throws errors for end function comments
+- Squiz OperatorBracketSniff now allows simple arithmetic operations in SWITCH conditions
+- Squiz ValidFunctionNameSniff now ignores closures
+- Squiz MethodScopeSniff now ignores closures
+- Squiz ClosingDeclarationCommentSniff now ignores closures
+- Squiz GlobalFunctionSniff now ignores closures
+- Squiz DisallowComparisonAssignmentSniff now ignores the assigning of arrays
+- Squiz DisallowObjectStringIndexSniff now allows indexes that contain dots and reserved words
+- Squiz standard now throws nesting level and cyclomatic complexity errors at much higher levels
+- Squiz CommentedOutCodeSniff now ignores common comment framing characters
+- Squiz ClassCommentSniff now ensures the open comment tag is the only content on the first line
+- Squiz FileCommentSniff now ensures the open comment tag is the only content on the first line
+- Squiz FunctionCommentSniff now ensures the open comment tag is the only content on the first line
+- Squiz VariableCommentSniff now ensures the open comment tag is the only content on the first line
+- Squiz NonExecutableCodeSniff now warns about empty return statements that are not required
+- Removed ForbiddenStylesSniff from Squiz standard
+    - It is now in in the MySource standard as BrowserSpecificStylesSniff
+    - New BrowserSpecificStylesSniff ignores files with browser-specific suffixes
+- MySource IncludeSystemSniff no longer throws errors when extending the Exception class
+- MySource IncludeSystemSniff no longer throws errors for the abstract widget class
+- MySource IncludeSystemSniff and UnusedSystemSniff now allow includes inside IF statements
+- MySource IncludeSystemSniff no longer throws errors for included widgets inside methods
+- MySource GetRequestDataSniff now throws errors for using $_FILES
+- MySource CreateWidgetTypeCallbackSniff now allows return statements in nested functions
+- MySource DisallowSelfActionsSniff now ignores abstract classes
+
+### Fixed
+- Fixed a problem with the SVN pre-commit hook for PHP versions without vertical whitespace regex support
+- Fixed bug #16740 : False positives for heredoc strings and unused parameter sniff
+- Fixed bug #16794 : ValidLogicalOperatorsSniff doesn't report operators not in lowercase
+- Fixed bug #16804 : Report filename is shortened too much
+- Fixed bug #16821 : Bug in Squiz_Sniffs_WhiteSpace_OperatorSpacingSniff
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #16836 : Notice raised when using semicolon to open case
+- Fixed bug #16855 : Generic standard sniffs incorrectly for define() method
+- Fixed bug #16865 : Two bugs in Squiz_Sniffs_WhiteSpace_OperatorSpacingSniff
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #16902 : Inline If Declaration bug
+- Fixed bug #16960 : False positive for late static binding in Squiz/ScopeKeywordSpacingSniff
+    - Thanks to Jakub Tománekpear-thezero for the patch
+- Fixed bug #16976 : The phpcs attempts to process symbolic links that don't resolve to files
+- Fixed bug #17017 : Including one file in the files sniffed alters errors reported for another file
+
+## 1.2.1 - 2009-11-17
+### Changed
+- Added a new report type --report=svnblame to show how many errors and warnings were committed by each author
+    - Also shows the percentage of their code that are errors and warnings
+    - Requires you to have the SVN command in your path
+    - Make sure SVN is storing usernames and passwords (if required) or you will need to enter them for each file
+    - You can also use the -s command line argument to see the different types of errors authors are committing
+    - You can use the -v command line argument to see all authors, even if they have no errors or warnings
+- Added a new command line argument --report-width to allow you to set the column width of screen reports
+    - Reports wont accept values less than 70 or else they get too small
+    - Can also be set via a config var: phpcs --config-set report_width 100
+- You can now get PHP_CodeSniffer to ignore a whole file by adding @codingStandardsIgnoreFile in the content
+    - If you put it in the first two lines the file wont even be tokenized, so it will be much quicker
+- Reports now print their file lists in alphabetical order
+- PEAR FunctionDeclarationSniff now reports error for incorrect closing bracket placement in multi-line definitions
+- Added Generic CallTimePassByReferenceSniff to prohibit the passing of variables into functions by reference
+    - Thanks to Florian Grandel for the contribution
+- Added Squiz DisallowComparisonAssignmentSniff to ban the assignment of comparison values to a variable
+- Added Squiz DuplicateStyleDefinitionSniff to check for duplicate CSS styles in a single class block
+- Squiz ArrayDeclarationSniff no longer checks the case of array indexes because that is not its job
+- Squiz PostStatementCommentSniff now allows end comments for class member functions
+- Squiz InlineCommentSniff now supports the checking of JS files
+- MySource CreateWidgetTypeCallbackSniff now allows the callback to be passed to another function
+- MySource CreateWidgetTypeCallbackSniff now correctly ignores callbacks used inside conditions
+- Generic MultipleStatementAlignmentSniff now enforces a single space before equals sign if max padding is reached
+- Fixed a problem in the JS tokenizer where regular expressions containing \// were not converted correctly
+- Fixed a problem tokenizing CSS files where multiple ID targets on a line would look like comments
+- Fixed a problem tokenizing CSS files where class names containing a colon looked like style definitions
+- Fixed a problem tokenizing CSS files when style statements had empty url() calls
+- Fixed a problem tokenizing CSS colours with the letter E in first half of the code
+- Squiz ColonSpacingSniff now ensures it is only checking style definitions in CSS files and not class names
+- Squiz DisallowComparisonAssignmentSniff no longer reports errors when assigning the return value of a function
+- CSS tokenizer now correctly supports multi-line comments
+- When only the case of var names differ for function comments, the error now indicates the case is different
+
+### Fixed
+- Fixed an issue with Generic UnnecessaryStringConcatSniff where it incorrectly suggested removing a concat
+- Fixed bug #16530 : ScopeIndentSniff reports false positive
+- Fixed bug #16533 : Duplicate errors and warnings
+- Fixed bug #16563 : Check file extensions problem in phpcs-svn-pre-commit
+    - Thanks to Kaijung Chenpear-et3w503 for the patch
+- Fixed bug #16592 : Object operator indentation incorrect when first operator is on a new line
+- Fixed bug #16641 : Notice output
+- Fixed bug #16682 : Squiz_Sniffs_Strings_DoubleQuoteUsageSniff reports string "\0" as invalid
+- Fixed bug #16683 : Typing error in PHP_CodeSniffer_CommentParser_AbstractParser
+- Fixed bug #16684 : Bug in Squiz_Sniffs_PHP_NonExecutableCodeSniff
+- Fixed bug #16692 : Spaces in paths in Squiz_Sniffs_Debug_JavaScriptLintSniff
+    - Thanks to Jaroslav Hanslík@kukulich for the patch
+- Fixed bug #16696 : Spelling error in MultiLineConditionSniff
+- Fixed bug #16697 : MultiLineConditionSniff incorrect result with inline IF
+- Fixed bug #16698 : Notice in JavaScript Tokenizer
+- Fixed bug #16736 : Multi-files sniffs aren't processed when FILE is a single directory
+    - Thanks to Alexey Sheinpear-conf for the patch
+- Fixed bug #16792 : Bug in Generic_Sniffs_PHP_ForbiddenFunctionsSniff
+
+## 1.2.0 - 2009-08-17
+### Changed
+- Installed standards are now favoured over custom standards when using the cmd line arg with relative paths
+- Unit tests now use a lot less memory while running
+- Squiz standard now uses Generic EmptyStatementSniff but throws errors instead of warnings
+- Squiz standard now uses Generic UnusedFunctionParameterSniff
+- Removed unused ValidArrayIndexNameSniff from the Squiz standard
+
+### Fixed
+- Fixed bug #16424 : SubversionPropertiesSniff print PHP Warning
+- Fixed bug #16450 : Constant PHP_CODESNIFFER_VERBOSITY already defined (unit tests)
+- Fixed bug #16453 : function declaration long line splitted error
+- Fixed bug #16482 : phpcs-svn-pre-commit ignores extensions parameter
+
+## 1.2.0RC3 - 2009-07-07
+### Changed
+- You can now use @codingStandardsIgnoreStart and @...End comments to suppress messages (feature request #14002)
+- A warning is now included for files without any code when short_open_tag is set to Off (feature request #12952)
+- You can now use relative paths to your custom standards with the --standard cmd line arg (feature request #14967)
+- You can now override magic methods and functions in PEAR ValidFunctionNameSniff (feature request #15830)
+- MySource IncludeSystemSniff now recognises widget action classes
+- MySource IncludeSystemSniff now knows about unit test classes and changes rules accordingly
+
+## 1.2.0RC2 - 2009-05-25
+### Changed
+- Test suite can now be run using the full path to AllTests.php (feature request #16179)
+
+### Fixed
+- Fixed bug #15980 : PHP_CodeSniffer change php current directory
+    - Thanks to Dolly Aswin Harahappear-dollyaswin for the patch
+- Fixed bug #16001 : Notice triggered
+- Fixed bug #16054 : phpcs-svn-pre-commit not showing any errors
+- Fixed bug #16071 : Fatal error: Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #16170 : Undefined Offset -1 in MultiLineConditionSniff.php on line 68
+- Fixed bug #16175 : Bug in Squiz-IncrementDecrementUsageSniff
+
+## 1.2.0RC1 - 2009-03-09
+### Changed
+- Reports that are output to a file now include a trailing newline at the end of the file
+- Fixed sniff names not shown in -vvv token processing output
+- Added Generic SubversionPropertiesSniff to check that specific svn props are set for files
+    - Thanks to Jack Bates for the contribution
+- The PHP version check can now be overridden in classes that extend PEAR FileCommentSniff
+    - Thanks to Helgi Þormar Þorbjörnsson@helgi for the suggestion
+- Added Generic ConstructorNameSniff to check for PHP4 constructor name usage
+    - Thanks to Leif Wickland for the contribution
+- Squiz standard now supports multi-line function and condition sniffs from PEAR standard
+- Squiz standard now uses Generic ConstructorNameSniff
+- Added MySource GetRequestDataSniff to ensure REQUEST, GET and POST are not accessed directly
+- Squiz OperatorBracketSniff now allows square brackets in simple unbracketed operations
+
+### Fixed
+- Fixed the incorrect tokenizing of multi-line block comments in CSS files
+- Fixed bug #15383 : Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #15408 : An unexpected exception has been caught: Undefined offset: 2
+- Fixed bug #15519 : Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #15624 : Pre-commit hook fails with PHP errors
+- Fixed bug #15661 : Uncaught PHP_CodeSniffer_Exception
+- Fixed bug #15722 : "declare(encoding = 'utf-8');" leads to "Missing file doc comment"
+- Fixed bug #15910 : Object operator indention not calculated correctly
+
+## 1.2.0a1 - 2008-12-18
+### Changed
+- PHP_CodeSniffer now has a CSS tokenizer for checking CSS files
+- Added support for a new multi-file sniff that sniffs all processed files at once
+- Added new output format --report=emacs to output errors using the emacs standard compile output format
+    - Thanks to Len Trigg for the contribution
+- Reports can now be written to a file using the --report-file command line argument (feature request #14953)
+    - The report is also written to screen when using this argument
+- The CheckStyle, CSV and XML reports now include a source for each error and warning (feature request #13242)
+    - A new report type --report=source can be used to show you the most common errors in your files
+- Added new command line argument -s to show error sources in all reports
+- Added new command line argument --sniffs to specify a list of sniffs to restrict checking to
+    - Uses the sniff source codes that are optionally displayed in reports
+- Changed the max width of error lines from 80 to 79 chars to stop blank lines in the default windows cmd window
+- PHP_CodeSniffer now has a token for an asperand (@ symbol) so sniffs can listen for them
+    - Thanks to Andy Brockhurst for the patch
+- Added Generic DuplicateClassNameSniff that will warn if the same class name is used in multiple files
+    - Not currently used by any standard; more of a multi-file sniff sample than anything useful
+- Added Generic NoSilencedErrorsSniff that warns if PHP errors are being silenced using the @ symbol
+    - Thanks to Andy Brockhurst for the contribution
+- Added Generic UnnecessaryStringConcatSniff that checks for two strings being concatenated
+- Added PEAR FunctionDeclarationSniff to enforce the new multi-line function declaration PEAR standard
+- Added PEAR MultiLineAssignmentSniff to enforce the correct indentation of multi-line assignments
+- Added PEAR MultiLineConditionSniff to enforce the new multi-line condition PEAR standard
+- Added PEAR ObjectOperatorIndentSniff to enforce the new chained function call PEAR standard
+- Added MySource DisallowSelfActionSniff to ban the use of self::method() calls in Action classes
+- Added MySource DebugCodeSniff to ban the use of Debug::method() calls
+- Added MySource CreateWidgetTypeCallback sniff to check callback usage in widget type create methods
+- Added Squiz DisallowObjectStringIndexSniff that forces object dot notation in JavaScript files
+    - Thanks to Sertan Danis@sertand for the contribution
+- Added Squiz DiscouragedFunctionsSniff to warn when using debug functions
+- Added Squiz PropertyLabelSniff to check whitespace around colons in JS property and label declarations
+- Added Squiz DuplicatePropertySniff to check for duplicate property names in JS classes
+- Added Squiz ColonSpacingSniff to check for spacing around colons in CSS style definitions
+- Added Squiz SemicolonSpacingSniff to check for spacing around semicolons in CSS style definitions
+- Added Squiz IndentationSniff to check for correct indentation of CSS files
+- Added Squiz ColourDefinitionSniff to check that CSS colours are defined in uppercase and using shorthand
+- Added Squiz EmptyStyleDefinitionSniff to check for CSS style definitions without content
+- Added Squiz EmptyClassDefinitionSniff to check for CSS class definitions without content
+- Added Squiz ClassDefinitionOpeningBraceSpaceSniff to check for spaces around opening brace of CSS class definitions
+- Added Squiz ClassDefinitionClosingBraceSpaceSniff to check for a single blank line after CSS class definitions
+- Added Squiz ClassDefinitionNameSpacingSniff to check for a blank lines inside CSS class definition names
+- Added Squiz DisallowMultipleStyleDefinitionsSniff to check for multiple style definitions on a single line
+- Added Squiz DuplicateClassDefinitionSniff to check for duplicate CSS class blocks that can be merged
+- Added Squiz ForbiddenStylesSniff to check for usage of browser specific styles
+- Added Squiz OpacitySniff to check for incorrect opacity values in CSS
+- Added Squiz LowercaseStyleDefinitionSniff to check for styles that are not defined in lowercase
+- Added Squiz MissingColonSniff to check for style definitions where the colon has been forgotten
+- Added Squiz MultiLineFunctionDeclarationSniff to check that multi-line declarations contain one param per line
+- Added Squiz JSLintSniff to check for JS errors using the jslint.js script through Rhino
+    - Set jslint path using phpcs --config-set jslint_path /path/to/jslint.js
+    - Set rhino path using phpcs --config-set rhino_path /path/to/rhino
+- Added Generic TodoSniff that warns about comments that contain the word TODO
+- Removed MultipleStatementAlignmentSniff from the PEAR standard as alignment is now optional
+- Generic ForbiddenFunctionsSniff now has protected member var to specify if it should use errors or warnings
+- Generic MultipleStatementAlignmentSniff now has correct error message if assignment is on a new line
+- Generic MultipleStatementAlignmentSniff now has protected member var to allow it to ignore multi-line assignments
+- Generic LineEndingsSniff now supports checking of JS files
+- Generic LineEndingsSniff now supports checking of CSS files
+- Generic DisallowTabIndentSniff now supports checking of CSS files
+- Squiz DoubleQuoteUsageSniff now bans the use of variables in double quoted strings in favour of concatenation
+- Squiz SuperfluousWhitespaceSniff now supports checking of JS files
+- Squiz SuperfluousWhitespaceSniff now supports checking of CSS files
+- Squiz DisallowInlineIfSniff now supports checking of JS files
+- Squiz SemicolonSpacingSniff now supports checking of JS files
+- Squiz PostStatementCommentSniff now supports checking of JS files
+- Squiz FunctionOpeningBraceSpacingSniff now supports checking of JS files
+- Squiz FunctionClosingBraceSpacingSniff now supports checking of JS files
+    - Empty JS functions must have their opening and closing braces next to each other
+- Squiz ControlStructureSpacingSniff now supports checking of JS files
+- Squiz LongConditionClosingCommentSniff now supports checking of JS files
+- Squiz OperatorSpacingSniff now supports checking of JS files
+- Squiz SwitchDeclarationSniff now supports checking of JS files
+- Squiz CommentedOutCodeSniff now supports checking of CSS files
+- Squiz DisallowSizeFunctionsInLoopsSniff now supports checking of JS files for the use of object.length
+- Squiz DisallowSizeFunctionsInLoopsSniff no longer complains about size functions outside of the FOR condition
+- Squiz ControlStructureSpacingSniff now bans blank lines at the end of a control structure
+- Squiz ForLoopDeclarationSniff no longer throws errors for JS FOR loops without semicolons
+- Squiz MultipleStatementAlignmentSniff no longer throws errors if a statement would take more than 8 spaces to align
+- Squiz standard now uses Generic TodoSniff
+- Squiz standard now uses Generic UnnecessaryStringConcatSniff
+- Squiz standard now uses PEAR MultiLineAssignmentSniff
+- Squiz standard now uses PEAR MultiLineConditionSniff
+- Zend standard now uses OpeningFunctionBraceBsdAllmanSniff (feature request #14647)
+- MySource JoinStringsSniff now bans the use of inline array joins and suggests the + operator
+- Fixed incorrect errors that can be generated from abstract scope sniffs when moving to a new file
+- Core tokenizer now matches orphaned curly braces in the same way as square brackets
+- Whitespace tokens at the end of JS files are now added to the token stack
+- JavaScript tokenizer now identifies properties and labels as new token types
+- JavaScript tokenizer now identifies object definitions as a new token type and matches curly braces for them
+- JavaScript tokenizer now identifies DIV_EQUAL and MUL_EQUAL tokens
+- Improved regular expression detection in the JavaScript tokenizer
+- Improve AbstractPatternSniff support so it can listen for any token type, not just weighted tokens
+
+### Fixed
+- Fixed Squiz DoubleQuoteUsageSniff so it works correctly with short_open_tag=Off
+- Fixed bug #14409 : Output of warnings to log file
+- Fixed bug #14520 : Notice: Undefined offset: 1 in /usr/share/php/PHP/CodeSniffer/File.php on line
+- Fixed bug #14637 : Call to processUnknownArguments() misses second parameter $pos
+    - Thanks to Peter Buripear-burci for the patch
+- Fixed bug #14889 : Lack of clarity: licence or license
+- Fixed bug #15008 : Nested Parentheses in Control Structure Sniffs
+- Fixed bug #15091 : pre-commit hook attempts to sniff folders
+    - Thanks to Bruce Weirdanpear-weirdan for the patch
+- Fixed bug #15124 : AbstractParser.php uses deprecated split() function
+    - Thanks to Sebastian Bergmann@sebastianbergmann for the patch
+- Fixed bug #15188 : PHPCS vs HEREDOC strings
+- Fixed bug #15231 : Notice: Uninitialized string offset: 0 in FileCommentSniff.php on line 555
+- Fixed bug #15336 : Notice: Undefined offset: 2 in /usr/share/php/PHP/CodeSniffer/File.php on line
+
+## 1.1.0 - 2008-07-14
+### Changed
+- PEAR FileCommentSniff now allows tag orders to be overridden in child classes
+    - Thanks to Jeff Hodsdon for the patch
+- Added Generic DisallowMultipleStatementsSniff to ensure there is only one statement per line
+- Squiz standard now uses DisallowMultipleStatementsSniff
+
+### Fixed
+- Fixed error in Zend ValidVariableNameSniff when checking vars in form: $class->{$var}
+- Fixed bug #14077 : Fatal error: Uncaught PHP_CodeSniffer_Exception: $stackPtr is not a class member
+- Fixed bug #14168 : Global Function -> Static Method and __autoload()
+- Fixed bug #14238 : Line length not checked at last line of a file
+- Fixed bug #14249 : wrong detection of scope_opener
+- Fixed bug #14250 : ArrayDeclarationSniff emit warnings at malformed array
+- Fixed bug #14251 : --extensions option doesn't work
+
+## 1.1.0RC3 - 2008-07-03
+### Changed
+- PEAR FileCommentSniff now allows tag orders to be overridden in child classes
+    - Thanks to Jeff Hodsdon for the patch
+- Added Generic DisallowMultipleStatementsSniff to ensure there is only one statement per line
+- Squiz standard now uses DisallowMultipleStatementsSniff
+
+### Fixed
+- Fixed error in Zend ValidVariableNameSniff when checking vars in form: $class->{$var}
+- Fixed bug #14077 : Fatal error: Uncaught PHP_CodeSniffer_Exception: $stackPtr is not a class member
+- Fixed bug #14168 : Global Function -> Static Method and __autoload()
+- Fixed bug #14238 : Line length not checked at last line of a file
+- Fixed bug #14249 : wrong detection of scope_opener
+- Fixed bug #14250 : ArrayDeclarationSniff emit warnings at malformed array
+- Fixed bug #14251 : --extensions option doesn't work
+
+## 1.1.0RC2 - 2008-06-13
+### Changed
+- Permission denied errors now stop script execution but still display current errors (feature request #14076)
+- Added Squiz ValidArrayIndexNameSniff to ensure array indexes do not use camel case
+- Squiz ArrayDeclarationSniff now ensures arrays are not declared with camel case index values
+- PEAR ValidVariableNameSniff now alerts about a possible parse error for member vars inside an interface
+
+### Fixed
+- Fixed bug #13921 : js parsing fails for comments on last line of file
+- Fixed bug #13922 : crash in case of malformed (but tokenized) php file
+    - PEAR and Squiz ClassDeclarationSniff now throw warnings for possible parse errors
+    - Squiz ValidClassNameSniff now throws warning for possible parse errors
+    - Squiz ClosingDeclarationCommentSniff now throws additional warnings for parse errors
+
+## 1.1.0RC1 - 2008-05-13
+### Changed
+- Added support for multiple tokenizers so PHP_CodeSniffer can check more than just PHP files
+    - PHP_CodeSniffer now has a JS tokenizer for checking JavaScript files
+    - Sniffs need to be updated to work with additional tokenizers, or new sniffs written for them
+- phpcs now exits with status 2 if the tokenizer extension has been disabled (feature request #13269)
+- Added scripts/phpcs-svn-pre-commit that can be used as an SVN pre-commit hook
+    - Also reworked the way the phpcs script works to make it easier to wrap it with other functionality
+    - Thanks to Jack Bates for the contribution
+- Fixed error in phpcs error message when a supplied file does not exist
+- Fixed a cosmetic error in AbstractPatternSniff where the "found" string was missing some content
+- Added sniffs that implement part of the PMD rule catalog to the Generic standard
+    - Thanks to Manuel Pichler@manuelpichler for the contribution of all these sniffs.
+- Squiz FunctionCommentThrowTagSniff no longer throws errors for function that only throw variables
+- Generic ScopeIndentSniff now has private member to enforce exact indent matching
+- Replaced Squiz DisallowCountInLoopsSniff with Squiz DisallowSizeFunctionsInLoopsSniff
+    - Thanks to Jan Miczaika for the sniff
+- Squiz BlockCommentSniff now checks inline doc block comments
+- Squiz InlineCommentSniff now checks inline doc block comments
+- Squiz BlockCommentSniff now checks for no blank line before first comment in a function
+- Squiz DocCommentAlignmentSniff now ignores inline doc block comments
+- Squiz ControlStructureSpacingSniff now ensures no blank lines at the start of control structures
+- Squiz ControlStructureSpacingSniff now ensures no blank lines between control structure closing braces
+- Squiz IncrementDecrementUsageSniff now ensures inc/dec ops are bracketed in string concats
+- Squiz IncrementDecrementUsageSniff now ensures inc/dec ops are not used in arithmetic operations
+- Squiz FunctionCommentSniff no longer throws errors if return value is mixed but function returns void somewhere
+- Squiz OperatorBracketSniff no allows function call brackets to count as operator brackets
+- Squiz DoubleQuoteUsageSniff now supports \x \f and \v (feature request #13365)
+- Squiz ComparisonOperatorUsageSniff now supports JS files
+- Squiz ControlSignatureSniff now supports JS files
+- Squiz ForLoopDeclarationSniff now supports JS files
+- Squiz OperatorBracketSniff now supports JS files
+- Squiz InlineControlStructureSniff now supports JS files
+- Generic LowerCaseConstantSniff now supports JS files
+- Generic DisallowTabIndentSniff now supports JS files
+- Generic MultipleStatementAlignmentSniff now supports JS files
+- Added Squiz ObjectMemberCommaSniff to ensure the last member of a JS object is not followed by a comma
+- Added Squiz ConstantCaseSniff to ensure the PHP constants are uppercase and JS lowercase
+- Added Squiz JavaScriptLintSniff to check JS files with JSL
+    - Set path using phpcs --config-set jsl_path /path/to/jsl
+- Added MySource FirebugConsoleSniff to ban the use of "console" for JS variable and function names
+- Added MySource JoinStringsSniff to enforce the use of join() to concatenate JS strings
+- Added MySource AssignThisSniff to ensure this is only assigned to a var called self
+- Added MySource DisallowNewWidgetSniff to ban manual creation of widget objects
+- Removed warning shown in Zend CodeAnalyzerSniff when the ZCA path is not set
+
+### Fixed
+- Fixed error in Squiz ValidVariableNameSniff when checking vars in the form $obj->$var
+- Fixed error in Squiz DisallowMultipleAssignmentsSniff when checking vars in the form $obj->$var
+- Fixed error in Squiz InlineCommentSniff where comments for class constants were seen as inline
+- Fixed error in Squiz BlockCommentSniff where comments for class constants were not ignored
+- Fixed error in Squiz OperatorBracketSniff where negative numbers were ignored during comparisons
+- Fixed error in Squiz FunctionSpacingSniff where functions after member vars reported incorrect spacing
+- Fixed bug #13062 : Interface comments aren't handled in PEAR standard
+    - Thanks to Manuel Pichler@manuelpichler for the path
+- Fixed bug #13119 : php minimum requirement need to be fix
+- Fixed bug #13156 : Bug in Squiz_Sniffs_PHP_NonExecutableCodeSniff
+- Fixed bug #13158 : Strange behaviour in AbstractPatternSniff
+- Fixed bug #13169 : Undefined variables
+- Fixed bug #13178 : Catch exception in File.php
+- Fixed bug #13254 : Notices output in checkstyle report causes XML issues
+- Fixed bug #13446 : crash with src of phpMyAdmin
+    - Thanks to Manuel Pichler@manuelpichler for the path
+
+## 1.0.1a1 - 2008-04-21
+### Changed
+- Fixed error in PEAR ValidClassNameSniff when checking class names with double underscores
+- Moved Squiz InlineControlStructureSniff into Generic standard
+- PEAR standard now throws warnings for inline control structures
+- Squiz OutputBufferingIndentSniff now ignores the indentation of inline HTML
+- MySource IncludeSystemSniff now ignores usage of ZipArchive
+- Removed "function" from error messages for Generic function brace sniffs (feature request #13820)
+- Generic UpperCaseConstantSniff no longer throws errors for declare(ticks = ...)
+    - Thanks to Josh Snyder for the patch
+- Squiz ClosingDeclarationCommentSniff and AbstractVariableSniff now throw warnings for possible parse errors
+
+### Fixed
+- Fixed bug #13827 : AbstractVariableSniff throws "undefined index"
+- Fixed bug #13846 : Bug in Squiz.NonExecutableCodeSniff
+- Fixed bug #13849 : infinite loop in PHP_CodeSniffer_File::findNext()
+
+## 1.0.1 - 2008-02-04
+### Changed
+- Squiz ArrayDeclarationSniff now throws error if the array keyword is followed by a space
+- Squiz ArrayDeclarationSniff now throws error for empty multi-line arrays
+- Squiz ArrayDeclarationSniff now throws error for multi-line arrays with a single value
+- Squiz DocCommentAlignmentSniff now checks for a single space before tags inside docblocks
+- Squiz ForbiddenFunctionsSniff now disallows is_null() to force use of (=== NULL) instead
+- Squiz VariableCommentSniff now continues throwing errors after the first one is found
+- Squiz SuperfluousWhitespaceSniff now throws errors for multiple blank lines inside functions
+- MySource IncludedSystemSniff now checks extended class names
+- MySource UnusedSystemSniff now checks extended and implemented class names
+- MySource IncludedSystemSniff now supports includeWidget()
+- MySource UnusedSystemSniff now supports includeWidget()
+- Added PEAR ValidVariableNameSniff to check that only private member vars are prefixed with an underscore
+- Added Squiz DisallowCountInLoopsSniff to check for the use of count() in FOR and WHILE loop conditions
+- Added MySource UnusedSystemSniff to check for included classes that are never used
+
+### Fixed
+- Fixed a problem that caused the parentheses map to sometimes contain incorrect values
+- Fixed bug #12767 : Cant run phpcs from dir with PEAR subdir
+- Fixed bug #12773 : Reserved variables are not detected in strings
+    - Thanks to Wilfried Lochepear-wloche for the patch
+- Fixed bug #12832 : Tab to space conversion does not work
+- Fixed bug #12888 : extra space indentation = Notice: Uninitialized string offset...
+- Fixed bug #12909 : Default generateDocs function does not work under linux
+    - Thanks to Paul Smithpear-thing2b for the patch
+- Fixed bug #12957 : PHP 5.3 magic method __callStatic
+    - Thanks to Manuel Pichler@manuelpichler for the patch
+
+## 1.0.0 - 2007-12-21
+### Changed
+- You can now specify the full path to a coding standard on the command line (feature request #11886)
+    - This allows you to use standards that are stored outside of PHP_CodeSniffer's own Standard dir
+    - You can also specify full paths in the CodingStandard.php include and exclude methods
+    - Classes, dirs and files need to be names as if the standard was part of PHP_CodeSniffer
+    - Thanks to Dirk Thomas for the doc generator patch and testing
+- Modified the scope map to keep checking after 3 lines for some tokens (feature request #12561)
+    - Those tokens that must have an opener (like T_CLASS) now keep looking until EOF
+    - Other tokens (like T_FUNCTION) still stop after 3 lines for performance
+- You can now escape commas in ignore patterns so they can be matched in file names
+    - Thanks to Carsten Wiedmannpear-cwiedmann for the patch
+- Config data is now cached in a global var so the file system is not hit so often
+    - You can also set config data temporarily for the script if you are using your own external script
+    - Pass TRUE as the third argument to PHP_CodeSniffer::setConfigData()
+- PEAR ClassDeclarationSniff no longer throws errors for multi-line class declarations
+- Squiz ClassDeclarationSniff now ensures there is one blank line after a class closing brace
+- Squiz ClassDeclarationSniff now throws errors for a missing end PHP tag after the end class tag
+- Squiz IncrementDecrementUsageSniff no longer throws errors when -= and += are being used with vars
+- Squiz SwitchDeclarationSniff now throws errors for switch statements that do not contain a case statement
+    - Thanks to Sertan Danis@sertand for the patch
+- MySource IncludeSystemSniff no longer throws errors for the Util package
+
+### Fixed
+- Fixed bug #12621 : "space after AS" check is wrong
+    - Thanks to Satoshi Oikawapear-renoiv for the patch
+- Fixed bug #12645 : error message is wrong
+    - Thanks to Satoshi Oikawapear-renoiv for the patch
+- Fixed bug #12651 : Increment/Decrement Operators Usage at -1
+
+## 1.0.0RC3 - 2007-11-30
+### Changed
+- Added new command line argument --tab-width that will convert tabs to spaces before testing
+    - This allows you to use the existing sniffs that check for spaces even when you use tabs
+    - Can also be set via a config var: phpcs --config-set tab_width 4
+    - A value of zero (the default) tells PHP_CodeSniffer not to replace tabs with spaces
+- You can now change the default report format from "full" to something else
+    - Run: phpcs --config-set report_format format
+- Improved performance by optimising the way the scope map is created during tokenising
+- Added new Squiz DisallowInlineIfSniff to disallow the usage of inline IF statements
+- Fixed incorrect errors being thrown for nested switches in Squiz SwitchDeclarationSniff
+- PEAR FunctionCommentSniff no longer complains about missing comments for @throws tags
+- PEAR FunctionCommentSniff now throws error for missing exception class name for @throws tags
+- PHP_CodeSniffer_File::isReference() now correctly returns for functions that return references
+- Generic LineLengthSniff no longer warns about @version lines with CVS or SVN id tags
+- Generic LineLengthSniff no longer warns about @license lines with long URLs
+- Squiz FunctionCommentThrowTagSniff no longer complains about throwing variables
+- Squiz ComparisonOperatorUsageSniff no longer throws incorrect errors for inline IF statements
+- Squiz DisallowMultipleAssignmentsSniff no longer throws errors for assignments in inline IF statements
+
+### Fixed
+- Fixed bug #12455 : CodeSniffer treats content inside heredoc as PHP code
+- Fixed bug #12471 : Checkstyle report is broken
+- Fixed bug #12476 : PHP4 destructors are reported as error
+- Fixed bug #12513 : Checkstyle XML messages need to be utf8_encode()d
+    - Thanks to Sebastian Bergmann@sebastianbergmann for the patch.
+- Fixed bug #12517 : getNewlineAfter() and dos files
+
+## 1.0.0RC2 - 2007-11-14
+### Changed
+- Added a new Checkstyle report format
+    - Like the current XML format but modified to look like Checkstyle output
+    - Thanks to Manuel Pichler@manuelpichler for helping get the format correct
+- You can now hide warnings by default
+    - Run: phpcs --config-set show_warnings 0
+    - If warnings are hidden by default, use the new -w command line argument to override
+- Added new command line argument --config-delete to delete a config value and revert to the default
+- Improved overall performance by optimising tokenising and next/prev methods (feature request #12421)
+    - Thanks to Christian Weiske@cweiske for the patch
+- Added FunctionCallSignatureSniff to Squiz standard
+- Added @subpackage support to file and class comment sniffs in PEAR standard (feature request #12382)
+    - Thanks to Carsten Wiedmannpear-cwiedmann for the patch
+- An error is now displayed if you use a PHP version less than 5.1.0 (feature request #12380)
+    - Thanks to Carsten Wiedmannpear-cwiedmann for the patch
+- phpcs now exits with status 2 if it receives invalid input (feature request #12380)
+    - This is distinct from status 1, which indicates errors or warnings were found
+- Added new Squiz LanguageConstructSpacingSniff to throw errors for additional whitespace after echo etc.
+- Removed Squiz ValidInterfaceNameSniff
+- PEAR FunctionCommentSniff no longer complains about unknown tags
+
+### Fixed
+- Fixed incorrect errors about missing function comments in PEAR FunctionCommentSniff
+- Fixed incorrect function docblock detection in Squiz FunctionCommentSniff
+- Fixed incorrect errors for list() in Squiz DisallowMultipleAssignmentsSniff
+- Errors no longer thrown if control structure is followed by a CASE's BREAK in Squiz ControlStructureSpacingSniff
+- Fixed bug #12368 : Autoloader cannot be found due to include_path override
+    - Thanks to Richard Quadlingpear-rquadling for the patch
+- Fixed bug #12378 : equal sign alignments problem with while()
+
+## 1.0.0RC1 - 2007-11-01
+### Changed
+- Main phpcs script can now be run from a CVS checkout without installing the package
+- Added a new CSV report format
+    - Header row indicates what position each element is in
+    - Always use the header row to determine positions rather than assuming the format, as it may change
+- XML and CSV report formats now contain information about which column the error occurred at
+    - Useful if you want to highlight the token that caused the error in a custom application
+- Square bracket tokens now have bracket_opener and bracket_closer set
+- Added new Squiz SemicolonSpacingSniff to throw errors if whitespace is found before a semicolon
+- Added new Squiz ArrayBracketSpacingSniff to throw errors if whitespace is found around square brackets
+- Added new Squiz ObjectOperatorSpacingSniff to throw errors if whitespace is found around object operators
+- Added new Squiz DisallowMultipleAssignmentsSniff to throw errors if multiple assignments are on the same line
+- Added new Squiz ScopeKeywordSpacingSniff to throw errors if there is not a single space after a scope modifier
+- Added new Squiz ObjectInstantiationSniff to throw errors if new objects are not assigned to a variable
+- Added new Squiz FunctionDuplicateArgumentSniff to throw errors if argument is declared multiple times in a function
+- Added new Squiz FunctionOpeningBraceSpaceSniff to ensure there are no blank lines after a function open brace
+- Added new Squiz CommentedOutCodeSniff to warn about comments that looks like they are commented out code blocks
+- Added CyclomaticComplexitySniff to Squiz standard
+- Added NestingLevelSniff to Squiz standard
+- Squiz ForbiddenFunctionsSniff now recommends echo() instead of print()
+- Squiz ValidLogicalOperatorsSniff now recommends ^ instead of xor
+- Squiz SwitchDeclarationSniff now contains more checks
+    - A single space is required after the case keyword
+    - No space is allowed before the colon in a case or default statement
+    - All switch statements now require a default case
+    - Default case must contain a break statement
+    - Empty default case must contain a comment describing why the default is ignored
+    - Empty case statements are not allowed
+    - Case and default statements must not be followed by a blank line
+    - Break statements must be followed by a blank line or the closing brace
+    - There must be no blank line before a break statement
+- Squiz standard is now using the PEAR IncludingFileSniff
+- PEAR ClassCommentSniff no longer complains about unknown tags
+- PEAR FileCommentSniff no longer complains about unknown tags
+- PEAR FileCommentSniff now accepts multiple @copyright tags
+- Squiz BlockCommentSniff now checks that comment starts with a capital letter
+- Squiz InlineCommentSniff now has better checking to ensure comment starts with a capital letter
+- Squiz ClassCommentSniff now checks that short and long comments start with a capital letter
+- Squiz FunctionCommentSniff now checks that short, long and param comments start with a capital letter
+- Squiz VariableCommentSniff now checks that short and long comments start with a capital letter
+
+### Fixed
+- Fixed error with multi-token array indexes in Squiz ArrayDeclarationSniff
+- Fixed error with checking shorthand IF statements without a semicolon in Squiz InlineIfDeclarationSniff
+- Fixed error where constants used as default values in function declarations were seen as type hints
+- Fixed bug #12316 : PEAR is no longer the default standard
+- Fixed bug #12321 : wrong detection of missing function docblock
+
+## 0.9.0 - 2007-09-24
+### Changed
+- Added a config system for setting config data across phpcs runs
+- You can now change the default coding standard from PEAR to something else
+    - Run: phpcs --config-set default_standard standard
+- Added new Zend coding standard to check code against the Zend Framework standards
+    - The complete standard is not yet implemented
+    - Specify --standard=Zend to use
+    - Thanks to Johann-Peter Hartmann for the contribution of some sniffs
+    - Thanks to Holger Kral for the Code Analyzer sniff
+
+## 0.8.0 - 2007-08-08
+### Changed
+- Added new XML report format; --report=xml (feature request #11535)
+    - Thanks to Brett Bieber@saltybeagle for the patch
+- Added new command line argument --ignore to specify a list of files to skip (feature request #11556)
+- Added PHPCS and MySource coding standards into the core install
+- Scope map no longer gets confused by curly braces that act as string offsets
+- Removed CodeSniffer/SniffException.php as it is no longer used
+- Unit tests can now be run directly from a CVS checkout
+- Made private vars and functions protected in PHP_CodeSniffer class so this package can be overridden
+- Added new Metrics category to Generic coding standard
+    - Contains Cyclomatic Complexity and Nesting Level sniffs
+    - Thanks to Johann-Peter Hartmann for the contribution
+- Added new Generic DisallowTabIndentSniff to throw errors if tabs are used for indentation (feature request #11738)
+    - PEAR and Squiz standards use this new sniff to throw more specific indentation errors
+- Generic MultipleStatementAlignmentSniff has new private var to set a padding size limit (feature request #11555)
+- Generic MultipleStatementAlignmentSniff can now handle assignments that span multiple lines (feature request #11561)
+- Generic LineLengthSniff now has a max line length after which errors are thrown instead of warnings
+    - BC BREAK: Override the protected member var absoluteLineLimit and set it to zero in custom LineLength sniffs
+    - Thanks to Johann-Peter Hartmann for the contribution
+- Comment sniff errors about incorrect tag orders are now more descriptive (feature request #11693)
+
+### Fixed
+- Fixed bug #11473 : Invalid CamelCaps name when numbers used in names
+
+## 0.7.0 - 2007-07-02
+### Changed
+- BC BREAK: EOL character is now auto-detected and used instead of hard-coded \n
+    - Pattern sniffs must now specify "EOL" instead of "\n" or "\r\n" to use auto-detection
+    - Please use $phpcsFile->eolChar to check for newlines instead of hard-coding "\n" or "\r\n"
+    - Comment parser classes now require you to pass $phpcsFile as an additional argument
+- BC BREAK: Included and excluded sniffs now require .php extension
+    - Please update your coding standard classes and add ".php" to all sniff entries
+    - See CodeSniffer/Standards/PEAR/PEARCodingStandard.php for an example
+
+- Fixed error where including a directory of sniffs in a coding standard class did not work
+- Coding standard classes can now specify a list of sniffs to exclude as well as include (feature request #11056)
+- Two uppercase characters can now be placed side-by-side in class names in Squiz ValidClassNameSniff
+- SVN tags now allowed in PEAR file doc blocks (feature request #11038)
+    - Thanks to Torsten Roehrpear-troehr for the patch
+- Private methods in commenting sniffs and comment parser are now protected (feature request #11087)
+- Added Generic LineEndingsSniff to check the EOL character of a file
+- PEAR standard now only throws one error per file for incorrect line endings (eg. /r/n)
+- Command line arg -v now shows number of registered sniffs
+- Command line arg -vvv now shows list of registered sniffs
+- Squiz ControlStructureSpacingSniff no longer throws errors if the control structure is at the end of the script
+- Squiz FunctionCommentSniff now throws error for "return void" if function has return statement
+- Squiz FunctionCommentSniff now throws error for functions that return void but specify something else
+- Squiz ValidVariableNameSniff now allows multiple uppercase letters in a row
+- Squiz ForEachLoopDeclarationSniff now throws error for AS keyword not being lowercase
+- Squiz SwitchDeclarationSniff now throws errors for CASE/DEFAULT/BREAK keywords not being lowercase
+- Squiz ArrayDeclarationSniff now handles multi-token array values when checking alignment
+- Squiz standard now enforces a space after cast tokens
+- Generic MultipleStatementAlignmentSniff no longer gets confused by assignments inside FOR conditions
+- Generic MultipleStatementAlignmentSniff no longer gets confused by the use of list()
+- Added Generic SpaceAfterCastSniff to ensure there is a single space after a cast token
+- Added Generic NoSpaceAfterCastSniff to ensure there is no whitespace after a cast token
+- Added PEAR ClassDeclarationSniff to ensure the opening brace of a class is on the line after the keyword
+- Added Squiz ScopeClosingBraceSniff to ensure closing braces are aligned correctly
+- Added Squiz EvalSniff to discourage the use of eval()
+- Added Squiz LowercaseDeclarationSniff to ensure all declaration keywords are lowercase
+- Added Squiz LowercaseClassKeywordsSniff to ensure all class declaration keywords are lowercase
+- Added Squiz LowercaseFunctionKeywordsSniff to ensure all function declaration keywords are lowercase
+- Added Squiz LowercasePHPFunctionsSniff to ensure all calls to inbuilt PHP functions are lowercase
+- Added Squiz CastSpacingSniff to ensure cast statements dont contain whitespace
+- Errors no longer thrown when checking 0 length files with verbosity on
+
+### Fixed
+- Fixed bug #11105 : getIncludedSniffs() not working anymore
+    - Thanks to Blair Robertsonpear-adviva for the patch
+- Fixed bug #11120 : Uninitialized string offset in AbstractParser.php on line 200
+
+## 0.6.0 - 2007-05-15
+### Changed
+- The number of errors and warnings found is now shown for each file while checking the file if verbosity is enabled
+- Now using PHP_EOL instead of hard-coded \n so output looks good on Windows (feature request #10761)
+    - Thanks to Carsten Wiedmannpear-cwiedmann for the patch.
+- phpcs now exits with status 0 (no errors) or 1 (errors found) (feature request #10348)
+- Added new -l command line argument to stop recursion into directories (feature request #10979)
+
+### Fixed
+- Fixed variable name error causing incorrect error message in Squiz ValidVariableNameSniff
+- Fixed bug #10757 : Error in ControlSignatureSniff
+- Fixed bugs #10751, #10777 : Sniffer class paths handled incorrectly in Windows
+    - Thanks to Carsten Wiedmannpear-cwiedmann for the patch.
+- Fixed bug #10961 : Error "Last parameter comment requires a blank newline after it" thrown
+- Fixed bug #10983 : phpcs outputs notices when checking invalid PHP
+- Fixed bug #10980 : Incorrect warnings for equals sign
+
+## 0.5.0 - 2007-04-17
+### Changed
+- BC BREAK: Coding standards now require a class to be added so PHP_CodeSniffer can get information from them
+    - Please read the end user docs for info about the new class required for all coding standards
+
+- Coding standards can now include sniffs from other standards, or whole standards, without writing new sniff files
+- PHP_CodeSniffer_File::isReference() now correctly returns for references in function declarations
+- PHP_CodeSniffer_File::isReference() now returns false if you don't pass it a T_BITWISE_AND token
+- PHP_CodeSniffer_File now stores the absolute path to the file so sniffs can check file locations correctly
+- Fixed undefined index error in AbstractVariableSniff for variables inside an interface function definition
+- Added MemberVarSpacingSniff to Squiz standard to enforce one-line spacing between member vars
+- Add FunctionCommentThrowTagSniff to Squiz standard to check that @throws tags are correct
+
+### Fixed
+- Fixed problems caused by references and type hints in Squiz FunctionDeclarationArgumentSpacingSniff
+- Fixed problems with errors not being thrown for some misaligned @param comments in Squiz FunctionCommentSniff
+- Fixed badly spaced comma error being thrown for "extends" class in Squiz ClassDeclarationSniff
+- Errors no longer thrown for class method names in Generic ForbiddenFunctionsSniff
+- Errors no longer thrown for type hints in front of references in Generic UpperCaseConstantNameSniff
+- Errors no longer thrown for correctly indented buffered lines in Squiz ScopeIndexSniff
+- Errors no longer thrown for user-defined functions named as forbidden functions in Generic ForbiddenFunctionsSniff
+- Errors no longer thrown on __autoload functions in PEAR ValidFunctionNameSniff
+- Errors now thrown for __autoload methods in PEAR ValidFunctionNameSniff
+- Errors now thrown if constructors or destructors have @return tags in Squiz FunctionCommentSniff
+- Errors now thrown if @throws tags dont start with a capital and end with a full stop in Squiz FunctionCommentSniff
+- Errors now thrown for invalid @var tag values in Squiz VariableCommentSniff
+- Errors now thrown for missing doc comment in Squiz VariableCommentSniff
+- Errors now thrown for unspaced operators in FOR loop declarations in Squiz OperatorSpacingSniff
+- Errors now thrown for using ob_get_clean/flush functions to end buffers in Squiz OutputBufferingIndentSniff
+- Errors now thrown for all missing member variable comments in Squiz VariableCommentSniff
+
+## 0.4.0 - 2007-02-19
+### Changed
+- Standard name specified with --standard command line argument is no longer case sensitive
+- Long error and warning messages are now wrapped to 80 characters in the full error report (thanks Endre Czirbesz)
+- Shortened a lot of error and warning messages so they don't take up so much room
+- Squiz FunctionCommentSniff now checks that param comments start with a capital letter and end with a full stop
+- Squiz FunctionSpacingSniff now reports incorrect lines below function on closing brace, not function keyword
+- Squiz FileCommentSniff now checks that there are no blank lines between the open PHP tag and the comment
+- PHP_CodeSniffer_File::isReference() now returns correctly when checking refs on right side of =>
+
+### Fixed
+- Fixed incorrect error with switch closing brace in Squiz SwitchDeclarationSniff
+- Fixed missing error when multiple statements are not aligned correctly with object operators
+- Fixed incorrect errors for some PHP special variables in Squiz ValidVariableNameSniff
+- Fixed incorrect errors for arrays that only contain other arrays in Squiz ArrayDeclarationSniff
+- Fixed bug #9844 : throw new Exception(\n accidentally reported as error but it ain't
+
+## 0.3.0 - 2007-01-11
+### Changed
+- Updated package.xml to version 2
+- Specifying coding standard on command line is now optional, even if you have multiple standards installed
+    - PHP_CodeSniffer uses the PEAR coding standard by default if no standard is specified
+- New command line option, --extensions, to specify a comma separated list of file extensions to check
+- Converted all unit tests to PHPUnit 3 format
+- Added new coding standard, Squiz, that can be used as an alternative to PEAR
+    - also contains more examples of sniffs
+    - some may be moved into the Generic coding standard if required
+- Added MultipleStatementAlignmentSniff to Generic standard
+- Added ScopeIndentSniff to Generic standard
+- Added ForbiddenFunctionsSniff to Generic standard
+- Added FileCommentSniff to PEAR standard
+- Added ClassCommentSniff to PEAR standard
+- Added FunctionCommentSniff to PEAR standard
+- Change MultipleStatementSniff to MultipleStatementAlignmentSniff in PEAR standard
+- Replaced Methods directory with Functions directory in Generic and PEAR standards
+    - also renamed some of the sniffs in those directories
+- Updated file, class and method comments for all files
+
+### Fixed
+- Fixed bug #9274 : nested_parenthesis element not set for open and close parenthesis tokens
+- Fixed bug #9411 : too few pattern characters cause incorrect error report
+
+## 0.2.1 - 2006-11-09
+### Fixed
+- Fixed bug #9274 : nested_parenthesis element not set for open and close parenthesis tokens
+
+## 0.2.0 - 2006-10-13
+### Changed
+- Added a generic standards package that will contain generic sniffs to be used in specific coding standards
+    - thanks to Frederic Poeydomenge for the idea
+- Changed PEAR standard to use generic sniffs where available
+- Added LowerCaseConstantSniff to Generic standard
+- Added UpperCaseConstantSniff to Generic standard
+- Added DisallowShortOpenTagSniff to Generic standard
+- Added LineLengthSniff to Generic standard
+- Added UpperCaseConstantNameSniff to Generic standard
+- Added OpeningMethodBraceBsdAllmanSniff to Generic standard (contrib by Frederic Poeydomenge)
+- Added OpeningMethodBraceKernighanRitchieSniff to Generic standard (contrib by Frederic Poeydomenge)
+- Added framework for core PHP_CodeSniffer unit tests
+- Added unit test for PHP_CodeSniffer:isCamelCaps method
+- ScopeClosingBraceSniff now checks indentation of BREAK statements
+- Added new command line arg (-vv) to show developer debug output
+
+### Fixed
+- Fixed some coding standard errors
+- Fixed bug #8834 : Massive memory consumption
+- Fixed bug #8836 : path case issues in package.xml
+- Fixed bug #8843 : confusion on nested switch()
+- Fixed bug #8841 : comments taken as whitespace
+- Fixed bug #8884 : another problem with nested switch() statements
+
+## 0.1.1 - 2006-09-25
+### Changed
+- Added unit tests for all PEAR sniffs
+- Exception class now extends from PEAR_Exception
+
+### Fixed
+- Fixed summary report so files without errors but with warnings are not shown when warnings are hidden
+
+## 0.1.0 - 2006-09-19
+### Changed
+- Reorganised package contents to conform to PEAR standards
+- Changed version numbering to conform to PEAR standards
+- Removed duplicate require_once() of Exception.php from CodeSniffer.php
+
+## 0.0.5 - 2006-09-18
+### Fixed
+- Fixed .bat file for situation where php.ini cannot be found so include_path is not set
+
+## 0.0.4 - 2006-08-28
+### Changed
+- Added .bat file for easier running of PHP_CodeSniffer on Windows
+- Sniff that checks method names now works for PHP4 style code where there is no scope keyword
+- Sniff that checks method names now works for PHP4 style constructors
+- Sniff that checks method names no longer incorrectly reports error with magic methods
+- Sniff that checks method names now reports errors with non-magic methods prefixed with __
+- Sniff that checks for constant names no longer incorrectly reports errors with heredoc strings
+- Sniff that checks for constant names no longer incorrectly reports errors with created objects
+- Sniff that checks indentation no longer incorrectly reports errors with heredoc strings
+- Sniff that checks indentation now correctly reports errors with improperly indented multi-line strings
+- Sniff that checks function declarations now checks for spaces before and after an equals sign for default values
+- Sniff that checks function declarations no longer incorrectly reports errors with multi-line declarations
+- Sniff that checks included code no longer incorrectly reports errors when return value is used conditionally
+- Sniff that checks opening brace of function no longer incorrectly reports errors with multi-line declarations
+- Sniff that checks spacing after commas in function calls no longer reports too many errors for some code
+- Sniff that checks control structure declarations now gives more descriptive error message
+
+## 0.0.3 - 2006-08-22
+### Changed
+- Added sniff to check for invalid class and interface names
+- Added sniff to check for invalid function and method names
+- Added sniff to warn if line is greater than 85 characters
+- Added sniff to check that function calls are in the correct format
+- Added command line arg to print current version (--version)
+
+### Fixed
+- Fixed error where comments were not allowed on the same line as a control structure declaration
+
+## 0.0.2 - 2006-07-25
+### Changed
+- Removed the including of checked files to stop errors caused by parsing them
+- Removed the use of reflection so checked files do not have to be included
+- Memory usage has been greatly reduced
+- Much faster tokenising and checking times
+- Reworked the PEAR coding standard sniffs (much faster now)
+- Fix some bugs with the PEAR scope indentation standard
+- Better checking for installed coding standards
+- Can now accept multiple files and dirs on the command line
+- Added an option to list installed coding standards
+- Added an option to print a summary report (number of errors and warnings shown for each file)
+- Added an option to hide warnings from reports
+- Added an option to print verbose output (so you know what is going on)
+- Reordered command line args to put switches first (although order is not enforced)
+- Switches can now be specified together (eg. php -nv) as well as separately (phpcs -n -v)
+
+## 0.0.1 - 2006-07-19
+### Added
+- Initial preview release
+
+
+
+Unreleased: https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/master...HEAD
+3.8.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.8.0...3.8.1
+3.8.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.7.2...3.8.0
+3.7.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.7.1...3.7.2
+3.7.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.7.0...3.7.1
+3.7.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.6.2...3.7.0
+3.6.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.6.1...3.6.2
+3.6.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.6.0...3.6.1
+3.6.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.8...3.6.0
+3.5.8:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.7...3.5.8
+3.5.7:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.6...3.5.7
+3.5.6:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.5...3.5.6
+3.5.5:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.4...3.5.5
+3.5.4:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.3...3.5.4
+3.5.3:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.2...3.5.3
+3.5.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.1...3.5.2
+3.5.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.5.0...3.5.1
+3.5.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.4.2...3.5.0
+3.4.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.4.1...3.4.2
+3.4.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.4.0...3.4.1
+3.4.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.3.2...3.4.0
+3.3.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.3.1...3.3.2
+3.3.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.3.0...3.3.1
+3.3.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.2.3...3.3.0
+3.2.3:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.2.2...3.2.3
+3.2.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.2.1...3.2.2
+3.2.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.2.0...3.2.1
+3.2.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.1.1...3.2.0
+3.1.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.1.0...3.1.1
+3.1.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.2...3.1.0
+3.0.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.1...3.0.2
+3.0.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.0...3.0.1
+3.0.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.0RC4...3.0.0
+3.0.0RC4:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.0RC3...3.0.0RC4
+3.0.0RC3:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.0RC2...3.0.0RC3
+3.0.0RC2:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.0RC1...3.0.0RC2
+3.0.0RC1:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/3.0.0a1...3.0.0RC1
+3.0.0a1:    https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.9.2...3.0.0a1
+2.9.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.9.1...2.9.2
+2.9.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.9.0...2.9.1
+2.9.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.8.1...2.9.0
+2.8.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.8.0...2.8.1
+2.8.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.7.1...2.8.0
+2.7.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.7.0...2.7.1
+2.7.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.6.2...2.7.0
+2.6.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.6.1...2.6.2
+2.6.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.6.0...2.6.1
+2.6.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.5.1...2.6.0
+2.5.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.5.0...2.5.1
+2.5.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.4.0...2.5.0
+2.4.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.3.4...2.4.0
+2.3.4:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.3.3...2.3.4
+2.3.3:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.3.2...2.3.3
+2.3.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.3.1...2.3.2
+2.3.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.3.0...2.3.1
+2.3.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.2.0...2.3.0
+2.2.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.1.0...2.2.0
+2.1.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.0.0...2.1.0
+2.0.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.0.0RC4...2.0.0
+2.0.0RC4:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.0.0RC3...2.0.0RC4
+2.0.0RC3:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.0.0RC2...2.0.0RC3
+2.0.0RC2:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.0.0RC1...2.0.0RC2
+2.0.0RC1:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.0.0a2...2.0.0RC1
+2.0.0a2:    https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/2.0.0a1...2.0.0a2
+2.0.0a1:    https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.6...2.0.0a1
+1.5.6:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.5...1.5.6
+1.5.5:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.4...1.5.5
+1.5.4:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.3...1.5.4
+1.5.3:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.2...1.5.3
+1.5.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.1...1.5.2
+1.5.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.0...1.5.1
+1.5.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.0RC4...1.5.0
+1.5.0RC4:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.0RC3...1.5.0RC4
+1.5.0RC3:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.0RC2...1.5.0RC3
+1.5.0RC2:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.5.0RC1...1.5.0RC2
+1.5.0RC1:   https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.8...1.5.0RC1
+1.4.8:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.7...1.4.8
+1.4.7:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.6...1.4.7
+1.4.6:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.5...1.4.6
+1.4.5:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.4...1.4.5
+1.4.4:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.3...1.4.4
+1.4.3:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.2...1.4.3
+1.4.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.1...1.4.2
+1.4.1:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.4.0...1.4.1
+1.4.0:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.3.6...1.4.0
+1.3.6:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.3.5...1.3.6
+1.3.5:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.3.4...1.3.5
+1.3.4:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.3.3...1.3.4
+1.3.3:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.3.2...1.3.3
+1.3.2:      https://github.com/PHPCSStandards/PHP_CodeSniffer/compare/1.3.1...1.3.2
+
+
+
+@2shediac:            https://github.com/2shediac
+@ablyler:             https://github.com/ablyler
+@aboks:               https://github.com/aboks
+@abulford:            https://github.com/abulford
+@afilina:             https://github.com/afilina
+@aik099:              https://github.com/aik099
+@akarmazyn:           https://github.com/akarmazyn
+@akkie:               https://github.com/akkie
+@alcohol:             https://github.com/alcohol
+@alekitto:            https://github.com/alekitto
+@AlexHowansky:        https://github.com/AlexHowansky
+@anbuc:               https://github.com/anbuc
+@andrei-propertyguru: https://github.com/andrei-propertyguru
+@AndrewDawes:         https://github.com/AndrewDawes
+@andygrunwald:        https://github.com/andygrunwald
+@annechko:            https://github.com/annechko
+@anomiex:             https://github.com/anomiex
+@arnested:            https://github.com/arnested
+@asnyder:             https://github.com/asnyder
+@Astinus-Eberhard:    https://github.com/Astinus-Eberhard
+@axlon:               https://github.com/axlon
+@bayleedev:           https://github.com/bayleedev
+@becoded:             https://github.com/becoded
+@Benjamin-Loison:     https://github.com/Benjamin-Loison
+@benmatselby:         https://github.com/benmatselby
+@Billz95:             https://github.com/Billz95
+@biozshock:           https://github.com/biozshock
+@bkdotcom:            https://github.com/bkdotcom
+@bladeofsteel:        https://github.com/bladeofsteel
+@blerou:              https://github.com/blerou
+@blue32a:             https://github.com/blue32a
+@bondas83:            https://github.com/bondas83
+@boonkerz:            https://github.com/boonkerz
+@BRMatt:              https://github.com/BRMatt
+@CandySunPlus:        https://github.com/CandySunPlus
+@ceeram:              https://github.com/ceeram
+@cixtor:              https://github.com/cixtor
+@claylo:              https://github.com/claylo
+@codebymikey:         https://github.com/codebymikey
+@covex-nn:            https://github.com/covex-nn
+@cweiske:             https://github.com/cweiske
+@Daimona:             https://github.com/Daimona
+@danez:               https://github.com/danez
+@DannyvdSluijs:       https://github.com/DannyvdSluijs
+@das-peter:           https://github.com/das-peter
+@datengraben:         https://github.com/datengraben
+@david-binda:         https://github.com/david-binda
+@Decave:              https://github.com/Decave
+@dereuromark:         https://github.com/dereuromark
+@derrabus:            https://github.com/derrabus
+@deviantintegral:     https://github.com/deviantintegral
+@dhensby:             https://github.com/dhensby
+@dingo-d:             https://github.com/dingo-d
+@dominics:            https://github.com/dominics
+@donatj:              https://github.com/donatj
+@dryabkov:            https://github.com/dryabkov
+@dschniepp:           https://github.com/dschniepp
+@duncan3dc:           https://github.com/duncan3dc
+@edorian:             https://github.com/edorian
+@elazar:              https://github.com/elazar
+@ElvenSpellmaker:     https://github.com/ElvenSpellmaker
+@emil-nasso:          https://github.com/emil-nasso
+@enl:                 https://github.com/enl
+@erikwiffin:          https://github.com/erikwiffin
+@eser:                https://github.com/eser
+@exussum12:           https://github.com/exussum12
+@fabacino:            https://github.com/fabacino
+@fabre-thibaud:       https://github.com/fabre-thibaud
+@fcool:               https://github.com/fcool
+@filips123:           https://github.com/filips123
+@Fischer-Bjoern:      https://github.com/Fischer-Bjoern
+@fonsecas72:          https://github.com/fonsecas72
+@fredden:             https://github.com/fredden
+@GaryJones:           https://github.com/GaryJones
+@ghostal:             https://github.com/ghostal
+@ghunti:              https://github.com/ghunti
+@gmponos:             https://github.com/gmponos
+@gnutix:              https://github.com/gnutix
+@goatherd:            https://github.com/goatherd
+@grongor:             https://github.com/grongor
+@grzr:                https://github.com/grzr
+@gwharton:            https://github.com/gwharton
+@hashar:              https://github.com/hashar
+@helgi:               https://github.com/helgi
+@hernst42:            https://github.com/hernst42
+@iammattcoleman:      https://github.com/iammattcoleman
+@ihabunek:            https://github.com/ihabunek
+@illusori:            https://github.com/illusori
+@index0h:             https://github.com/index0h
+@ivuorinen:           https://github.com/ivuorinen
+@jasonmccreary:       https://github.com/jasonmccreary
+@javer:               https://github.com/javer
+@JDGrimes:            https://github.com/JDGrimes
+@jedgell:             https://github.com/jedgell
+@jeffslofish:         https://github.com/jeffslofish
+@jmarcil:             https://github.com/jmarcil
+@jnrbsn:              https://github.com/jnrbsn
+@joelposti:           https://github.com/joelposti
+@johanderuijter:      https://github.com/johanderuijter
+@johnmaguire:         https://github.com/johnmaguire
+@johnpbloch:          https://github.com/johnpbloch
+@JorisDebonnet:       https://github.com/JorisDebonnet
+@josephzidell:        https://github.com/josephzidell
+@joshdavis11:         https://github.com/joshdavis11
+@jpuck:               https://github.com/jpuck
+@jrfnl:               https://github.com/jrfnl
+@kdebisschop:         https://github.com/kdebisschop
+@kenguest:            https://github.com/kenguest
+@klausi:              https://github.com/klausi
+@Konafets:            https://github.com/Konafets
+@kristofser:          https://github.com/kristofser
+@ksimka:              https://github.com/ksimka
+@ktomk:               https://github.com/ktomk
+@kukulich:            https://github.com/kukulich
+@legoktm:             https://github.com/legoktm
+@lmanzke:             https://github.com/lmanzke
+@localheinz:          https://github.com/localheinz
+@lucc:                https://github.com/lucc
+@MacDada:             https://github.com/MacDada
+@Majkl578:            https://github.com/Majkl578
+@manuelpichler:       https://github.com/manuelpichler
+@marcospassos:        https://github.com/marcospassos
+@MarkBaker:           https://github.com/MarkBaker
+@MarkMaldaba:         https://github.com/MarkMaldaba
+@martinssipenko:      https://github.com/martinssipenko
+@marvasDE:            https://github.com/marvasDE
+@MasterOdin:          https://github.com/MasterOdin
+@mathroc:             https://github.com/mathroc
+@maxgalbu:            https://github.com/maxgalbu
+@mcuelenaere:         https://github.com/mcuelenaere
+@mhujer:              https://github.com/mhujer
+@michaelbutler:       https://github.com/michaelbutler
+@michalbundyra:       https://github.com/michalbundyra
+@Morerice:            https://github.com/Morerice
+@morozov:             https://github.com/morozov
+@mrkrstphr:           https://github.com/mrkrstphr
+@mythril:             https://github.com/mythril
+@Naelyth:             https://github.com/Naelyth
+@ndm2:                https://github.com/ndm2
+@nicholascus:         https://github.com/nicholascus
+@NickDickinsonWilde:  https://github.com/NickDickinsonWilde
+@nkovacs:             https://github.com/nkovacs
+@nubs:                https://github.com/nubs
+@o5:                  https://github.com/o5
+@ofbeaton:            https://github.com/ofbeaton
+@olemartinorg:        https://github.com/olemartinorg
+@ondrejmirtes:        https://github.com/ondrejmirtes
+@orx0r:               https://github.com/orx0r
+@ostrolucky:          https://github.com/ostrolucky
+@pfrenssen:           https://github.com/pfrenssen
+@phil-davis:          https://github.com/phil-davis
+@photodude:           https://github.com/photodude
+@r3nat:               https://github.com/r3nat
+@raul338:             https://github.com/raul338
+@realmfoo:            https://github.com/realmfoo
+@renaatdemuynck:      https://github.com/renaatdemuynck
+@renan:               https://github.com/renan
+@rhorber:             https://github.com/rhorber
+@rmccue:              https://github.com/rmccue
+@robocoder:           https://github.com/robocoder
+@rodrigoprimo:        https://github.com/rodrigoprimo
+@rogeriopradoj:       https://github.com/rogeriopradoj
+@rovangju:            https://github.com/rovangju
+@rvanvelzen:          https://github.com/rvanvelzen
+@saltybeagle:         https://github.com/saltybeagle
+@samlev:              https://github.com/samlev
+@scato:               https://github.com/scato
+@schlessera:          https://github.com/schlessera
+@schnittstabil:       https://github.com/schnittstabil
+@sebastianbergmann:   https://github.com/sebastianbergmann
+@sertand:             https://github.com/sertand
+@shanethehat:         https://github.com/shanethehat
+@shivammathur:        https://github.com/shivammathur
+@simonsan:            https://github.com/simonsan
+@sjlangley:           https://github.com/sjlangley
+@sserbin:             https://github.com/sserbin
+@stefanlenselink:     https://github.com/stefanlenselink
+@SteveTalbot:         https://github.com/SteveTalbot
+@storeman:            https://github.com/storeman
+@stronk7:             https://github.com/stronk7
+@svycka:              https://github.com/svycka
+@syranez:             https://github.com/syranez
+@tasuki:              https://github.com/tasuki
+@tim-bezhashvyly:     https://github.com/tim-bezhashvyly
+@TomHAnderson:        https://github.com/TomHAnderson
+@thewilkybarkid:      https://github.com/thewilkybarkid
+@thiemowmde:          https://github.com/thiemowmde
+@thomasjfox:          https://github.com/thomasjfox
+@till:                https://github.com/till
+@timoschinkel:        https://github.com/timoschinkel
+@uniquexor:           https://github.com/uniquexor
+@valorin:             https://github.com/valorin
+@VasekPurchart:       https://github.com/VasekPurchart
+@VincentLanglet:      https://github.com/VincentLanglet
+@waltertamboer:       https://github.com/waltertamboer
+@westonruter:         https://github.com/westonruter
+@willemstuursma:      https://github.com/willemstuursma
+@wimg:                https://github.com/wimg
+@wvega:               https://github.com/wvega
+@xalopp:              https://github.com/xalopp
+@xjm:                 https://github.com/xjm
+@xt99:                https://github.com/xt99
+@yesmeck:             https://github.com/yesmeck
+@zBart:               https://github.com/zBart
+pear-adviva:          https://pear.php.net/user/adviva
+pear-bakert:          https://pear.php.net/user/bakert
+pear-bjorn:           https://pear.php.net/user/bjorn
+pear-boxgav:          https://pear.php.net/user/boxgav
+pear-burci:           https://pear.php.net/user/burci
+pear-conf:            https://pear.php.net/user/conf
+pear-cwiedmann:       https://pear.php.net/user/cwiedmann
+pear-dollyaswin:      https://pear.php.net/user/dollyaswin
+pear-dvino:           https://pear.php.net/user/dvino
+pear-et3w503:         https://pear.php.net/user/et3w503
+pear-gemineye:        https://pear.php.net/user/gemineye
+pear-kwinahradsky:    https://pear.php.net/user/kwinahradsky
+pear-ljmaskey:        https://pear.php.net/user/ljmaskey
+pear-mccammos:        https://pear.php.net/user/mccammos
+pear-pete:            https://pear.php.net/user/pete
+pear-recurser:        https://pear.php.net/user/recurser
+pear-renoiv:          https://pear.php.net/user/renoiv
+pear-rquadling:       https://pear.php.net/user/rquadling
+pear-ryba:            https://pear.php.net/user/ryba
+pear-thezero:         https://pear.php.net/user/thezero
+pear-thing2b:         https://pear.php.net/user/thing2b
+pear-tomdesp:         https://pear.php.net/user/tomdesp
+pear-troehr:          https://pear.php.net/user/troehr
+pear-weirdan:         https://pear.php.net/user/weirdan
+pear-wloche:          https://pear.php.net/user/wloche
+pear-woellchen:       https://pear.php.net/user/woellchen
+pear-youngian:        https://pear.php.net/user/youngian
+

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/CONTRIBUTING.md Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/README.md Changed

@@ -1,36 +1,54 @@
+PHP_CodeSniffer
+=====================================================
+
+<div aria-hidden="true">
+
+!Latest Stable Version(http://poser.pugx.org/phpcsstandards/php_codesniffer/v)(https://github.com/PHPCSStandards/PHP_CodeSniffer/releases)
+!Validate(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/validate.yml/badge.svg?branch=master)(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/validate.yml)
+!Test(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml/badge.svg?branch=master)(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml)
+!Coverage Status(https://coveralls.io/repos/github/PHPCSStandards/PHP_CodeSniffer/badge.svg?branch=master)(https://coveralls.io/github/PHPCSStandards/PHP_CodeSniffer?branch=master)
+!License(http://poser.pugx.org/phpcsstandards/php_codesniffer/license)(https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt)
+
+!Minimum PHP Version(https://img.shields.io/packagist/php-v/squizlabs/php_codesniffer.svg?maxAge=3600)
+!Tested on PHP 5.4 to 8.3(https://img.shields.io/badge/tested%20on-PHP%205.4%20|%205.5%20|%205.6%20|%207.0%20|%207.1%20|%207.2%20|%207.3%20|%207.4%20|%208.0%20|%208.1%20|%208.2%20|%208.3-brightgreen.svg?maxAge=2419200)(https://github.com/PHPCSStandards/PHP_CodeSniffer/actions/workflows/test.yml)
+
+</div>
+
+> !NOTE
+> This package is the continuation of the now abandoned PHP_CodeSniffer package which was created by Squizlabs(https://github.com/squizlabs/PHP_CodeSniffer).
+
 ## About
 
 PHP_CodeSniffer is a set of two PHP scripts; the main `phpcs` script that tokenizes PHP, JavaScript and CSS files to detect violations of a defined coding standard, and a second `phpcbf` script to automatically correct coding standard violations. PHP_CodeSniffer is an essential development tool that ensures your code remains clean and consistent.
 
-!Build Status(https://github.com/squizlabs/PHP_CodeSniffer/workflows/Validate/badge.svg?branch=master)(https://github.com/squizlabs/PHP_CodeSniffer/actions)
-!Build Status(https://github.com/squizlabs/PHP_CodeSniffer/workflows/Test/badge.svg?branch=master)(https://github.com/squizlabs/PHP_CodeSniffer/actions)
-!Code consistency(http://squizlabs.github.io/PHP_CodeSniffer/analysis/squizlabs/PHP_CodeSniffer/grade.svg)(http://squizlabs.github.io/PHP_CodeSniffer/analysis/squizlabs/PHP_CodeSniffer)
-!Join the chat at https://gitter.im/squizlabs/PHP_CodeSniffer(https://badges.gitter.im/Join%20Chat.svg)(https://gitter.im/squizlabs/PHP_CodeSniffer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Requirements
 
-PHP_CodeSniffer requires PHP version 5.4.0 or greater, although individual sniffs may have additional requirements such as external applications and scripts. See the Configuration Options manual page(https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options) for a list of these requirements.
+PHP_CodeSniffer requires PHP version 5.4.0 or greater, although individual sniffs may have additional requirements such as external applications and scripts. See the Configuration Options manual page(https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Configuration-Options) for a list of these requirements.
 
-If you're using PHP_CodeSniffer as part of a team, or you're running it on a CI(https://en.wikipedia.org/wiki/Continuous_integration) server, you may want to configure your project's settings using a configuration file(https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file).
+If you're using PHP_CodeSniffer as part of a team, or you're running it on a CI(https://en.wikipedia.org/wiki/Continuous_integration) server, you may want to configure your project's settings using a configuration file(https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file).
 
 
 ## Installation
 
 The easiest way to get started with PHP_CodeSniffer is to download the Phar files for each of the commands:
-```
+```bash
 # Download using curl
-curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
-curl -OL https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar
+curl -OL https://phars.phpcodesniffer.com/phpcs.phar
+curl -OL https://phars.phpcodesniffer.com/phpcbf.phar
 
 # Or download using wget
-wget https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
-wget https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar
+wget https://phars.phpcodesniffer.com/phpcs.phar
+wget https://phars.phpcodesniffer.com/phpcbf.phar
 
 # Then test the downloaded PHARs
 php phpcs.phar -h
 php phpcbf.phar -h
 ```
 
+These Phars are signed with the official Release key for PHPCS with the
+fingerprint `95DE 904A B800 754A 11D8 0B60 5E6D DE99 8AB7 3B8E`.
+
 ### Composer
 If you use Composer, you can install PHP_CodeSniffer system-wide with the following command:
 ```bash
@@ -43,7 +61,7 @@
 ```json
 {
     "require-dev": {
-        "squizlabs/php_codesniffer": "3.*"
+        "squizlabs/php_codesniffer": "^3.0"
     }
 }
 ```
@@ -56,23 +74,18 @@
 ### Phive
 If you use Phive, you can install PHP_CodeSniffer as a project tool using the following commands:
 ```bash
-phive install phpcs
-phive install phpcbf
+phive install --trust-gpg-keys 95DE904AB800754A11D80B605E6DDE998AB73B8E phpcs
+phive install --trust-gpg-keys 95DE904AB800754A11D80B605E6DDE998AB73B8E phpcbf
 ```
-You will then be able to run PHP_CodeSniffer from the tools directory:
+You will then be able to run PHP_CodeSniffer from the `tools` directory:
 ```bash
 ./tools/phpcs -h
 ./tools/phpcbf -h
 ```
-### PEAR
-If you use PEAR, you can install PHP_CodeSniffer using the PEAR installer. This will make the `phpcs` and `phpcbf` commands immediately available for use. To install PHP_CodeSniffer using the PEAR installer, first ensure you have installed PEAR(http://pear.php.net/manual/en/installation.getting.php) and then run the following command:
-```bash
-pear install PHP_CodeSniffer
-```
 ### Git Clone
 You can also download the PHP_CodeSniffer source and run the `phpcs` and `phpcbf` commands directly from the Git clone:
 ```bash
-git clone https://github.com/squizlabs/PHP_CodeSniffer.git
+git clone https://github.com/PHPCSStandards/PHP_CodeSniffer.git
 cd PHP_CodeSniffer
 php bin/phpcs -h
 php bin/phpcbf -h
@@ -94,19 +107,19 @@
 
 If PHP_CodeSniffer finds any coding standard errors, a report will be shown after running the command.
 
-Full usage information and example reports are available on the usage page(https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage).
+Full usage information and example reports are available on the usage page(https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Usage).
 
 ## Documentation
 
-The documentation for PHP_CodeSniffer is available on the Github wiki(https://github.com/squizlabs/PHP_CodeSniffer/wiki).
+The documentation for PHP_CodeSniffer is available on the GitHub wiki(https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki).
 
 ## Issues
 
-Bug reports and feature requests can be submitted on the Github Issue Tracker(https://github.com/squizlabs/PHP_CodeSniffer/issues).
+Bug reports and feature requests can be submitted on the GitHub Issue Tracker(https://github.com/PHPCSStandards/PHP_CodeSniffer/issues).
 
 ## Contributing
 
-See CONTRIBUTING.md(CONTRIBUTING.md) for information.
+See CONTRIBUTING.md(.github/CONTRIBUTING.md) for information.
 
 ## Versioning

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/autoload.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/bin/phpcbf Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/bin/phpcbf.bat Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/bin/phpcs Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/bin/phpcs.bat Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/composer.json Changed

@@ -1,41 +1,87 @@
 {
     "name": "squizlabs/php_codesniffer",
     "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+    "license": "BSD-3-Clause",
     "type": "library",
     "keywords": 
         "phpcs",
         "standards",
         "static analysis"
     ,
-    "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
-    "license": "BSD-3-Clause",
     "authors": 
         {
             "name": "Greg Sherwood",
-            "role": "lead"
+            "role": "Former lead"
+        },
+        {
+            "name": "Juliette Reinders Folmer",
+            "role": "Current lead"
+        },
+        {
+            "name": "Contributors",
+            "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
         }
     ,
+    "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
     "support": {
-        "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-        "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki",
-        "source": "https://github.com/squizlabs/PHP_CodeSniffer"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
+        "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+        "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki",
+        "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+        "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy"
     },
     "require": {
         "php": ">=5.4.0",
+        "ext-simplexml": "*",
         "ext-tokenizer": "*",
-        "ext-xmlwriter": "*",
-        "ext-simplexml": "*"
+        "ext-xmlwriter": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
     },
     "bin": 
-        "bin/phpcs",
-        "bin/phpcbf"
-    
+        "bin/phpcbf",
+        "bin/phpcs"
+    ,
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.x-dev"
+        }
+    },
+    "scripts": {
+        "cs": 
+            "@php ./bin/phpcs"
+        ,
+        "cbf": 
+            "@php ./bin/phpcbf"
+        ,
+        "test": 
+            "Composer\\Config::disableProcessTimeout",
+            "@php ./vendor/phpunit/phpunit/phpunit tests/AllTests.php --no-coverage"
+        ,
+        "coverage": 
+            "Composer\\Config::disableProcessTimeout",
+            "@php ./vendor/phpunit/phpunit/phpunit tests/AllTests.php -d max_execution_time=0"
+        ,
+        "coverage-local": 
+            "Composer\\Config::disableProcessTimeout",
+            "@php ./vendor/phpunit/phpunit/phpunit tests/AllTests.php --coverage-html ./build/coverage-html -d max_execution_time=0"
+        ,
+        "build": 
+            "Composer\\Config::disableProcessTimeout",
+            "@php -d phar.readonly=0 -f ./scripts/build-phar.php"
+        ,
+        "check-all": 
+            "@cs",
+            "@test"
+        
+    },
+    "scripts-descriptions": {
+        "cs": "Check for code style violations.",
+        "cbf": "Fix code style violations.",
+        "test": "Run the unit tests without code coverage.",
+        "coverage": "Run the unit tests with code coverage.",
+        "coverage-local": "Run the unit tests with code coverage and generate an HTML report in a 'build' directory.",
+        "build": "Create PHAR files for PHPCS and PHPCBF.",
+        "check-all": "Run all checks (phpcs, tests)."
+    }
 }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Config.php Changed

@@ -7,7 +7,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer;
@@ -19,45 +19,46 @@
 /**
  * Stores the configuration used to run PHPCS and PHPCBF.
  *
- * @property string $files           The files and directories to check.
- * @property string $standards       The standards being used for checking.
- * @property int      $verbosity       How verbose the output should be.
- *                                     0: no unnecessary output
- *                                     1: basic output for files being checked
- *                                     2: ruleset and file parsing output
- *                                     3: sniff execution output
- * @property bool     $interactive     Enable interactive checking mode.
- * @property bool     $parallel        Check files in parallel.
- * @property bool     $cache           Enable the use of the file cache.
- * @property bool     $cacheFile       A file where the cache data should be written
- * @property bool     $colors          Display colours in output.
- * @property bool     $explain         Explain the coding standards.
- * @property bool     $local           Process local files in directories only (no recursion).
- * @property bool     $showSources     Show sniff source codes in report output.
- * @property bool     $showProgress    Show basic progress information while running.
- * @property bool     $quiet           Quiet mode; disables progress and verbose output.
- * @property bool     $annotations     Process phpcs: annotations.
- * @property int      $tabWidth        How many spaces each tab is worth.
- * @property string   $encoding        The encoding of the files being checked.
- * @property string $sniffs          The sniffs that should be used for checking.
- *                                     If empty, all sniffs in the supplied standards will be used.
- * @property string $exclude         The sniffs that should be excluded from checking.
- *                                     If empty, all sniffs in the supplied standards will be used.
- * @property string $ignored         Regular expressions used to ignore files and folders during checking.
- * @property string   $reportFile      A file where the report output should be written.
- * @property string   $generator       The documentation generator to use.
- * @property string   $filter          The filter to use for the run.
- * @property string $bootstrap       One of more files to include before the run begins.
- * @property int      $reportWidth     The maximum number of columns that reports should use for output.
- *                                     Set to "auto" for have this value changed to the width of the terminal.
- * @property int      $errorSeverity   The minimum severity an error must have to be displayed.
- * @property int      $warningSeverity The minimum severity a warning must have to be displayed.
- * @property bool     $recordErrors    Record the content of error messages as well as error counts.
- * @property string   $suffix          A suffix to add to fixed files.
- * @property string   $basepath        A file system location to strip from the paths of files shown in reports.
- * @property bool     $stdin           Read content from STDIN instead of supplied files.
- * @property string   $stdinContent    Content passed directly to PHPCS on STDIN.
- * @property string   $stdinPath       The path to use for content passed on STDIN.
+ * @property string   $files           The files and directories to check.
+ * @property string   $standards       The standards being used for checking.
+ * @property int        $verbosity       How verbose the output should be.
+ *                                       0: no unnecessary output
+ *                                       1: basic output for files being checked
+ *                                       2: ruleset and file parsing output
+ *                                       3: sniff execution output
+ * @property bool       $interactive     Enable interactive checking mode.
+ * @property int        $parallel        Check files in parallel.
+ * @property bool       $cache           Enable the use of the file cache.
+ * @property string     $cacheFile       Path to the file where the cache data should be written
+ * @property bool       $colors          Display colours in output.
+ * @property bool       $explain         Explain the coding standards.
+ * @property bool       $local           Process local files in directories only (no recursion).
+ * @property bool       $showSources     Show sniff source codes in report output.
+ * @property bool       $showProgress    Show basic progress information while running.
+ * @property bool       $quiet           Quiet mode; disables progress and verbose output.
+ * @property bool       $annotations     Process phpcs: annotations.
+ * @property int        $tabWidth        How many spaces each tab is worth.
+ * @property string     $encoding        The encoding of the files being checked.
+ * @property string   $sniffs          The sniffs that should be used for checking.
+ *                                       If empty, all sniffs in the supplied standards will be used.
+ * @property string   $exclude         The sniffs that should be excluded from checking.
+ *                                       If empty, all sniffs in the supplied standards will be used.
+ * @property string   $ignored         Regular expressions used to ignore files and folders during checking.
+ * @property string     $reportFile      A file where the report output should be written.
+ * @property string     $generator       The documentation generator to use.
+ * @property string     $filter          The filter to use for the run.
+ * @property string   $bootstrap       One of more files to include before the run begins.
+ * @property int|string $reportWidth     The maximum number of columns that reports should use for output.
+ *                                       Set to "auto" for have this value changed to the width of the terminal.
+ * @property int        $errorSeverity   The minimum severity an error must have to be displayed.
+ * @property int        $warningSeverity The minimum severity a warning must have to be displayed.
+ * @property bool       $recordErrors    Record the content of error messages as well as error counts.
+ * @property string     $suffix          A suffix to add to fixed files.
+ * @property string     $basepath        A file system location to strip from the paths of files shown in reports.
+ * @property bool       $stdin           Read content from STDIN instead of supplied files.
+ * @property string     $stdinContent    Content passed directly to PHPCS on STDIN.
+ * @property string     $stdinPath       The path to use for content passed on STDIN.
+ * @property bool       $trackTime       Whether or not to track sniff run time.
  *
  * @property array<string, string>      $extensions File extensions that should be checked, and what tokenizer to use.
  *                                                  E.g., array('inc' => 'PHP');
@@ -80,7 +81,7 @@
      *
      * @var string
      */
-    const VERSION = '3.7.2';
+    const VERSION = '3.8.1';
 
     /**
      * Package stability; either stable, beta or alpha.
@@ -90,6 +91,13 @@
     const STABILITY = 'stable';
 
     /**
+     * Default report width when no report width is provided and 'auto' does not yield a valid width.
+     *
+     * @var int
+     */
+    const DEFAULT_REPORT_WIDTH = 80;
+
+    /**
      * An array of settings that PHPCS and PHPCBF accept.
      *
      * This array is not meant to be accessed directly. Instead, use the settings
@@ -136,6 +144,7 @@
         'stdin'           => null,
         'stdinContent'    => null,
         'stdinPath'       => null,
+        'trackTime'       => null,
         'unknown'         => null,
     ;
 
@@ -160,7 +169,7 @@
     /**
      * Command line values that the user has supplied directly.
      *
-     * @var array<string, TRUE>
+     * @var array<string, true|array<string, true>>
      */
     private static $overriddenDefaults = ;
 
@@ -200,6 +209,22 @@
             throw new RuntimeException("ERROR: unable to get value of property \"$name\"");
         }
 
+        // Figure out what the terminal width needs to be for "auto".
+        if ($name === 'reportWidth' && $this->settings$name === 'auto') {
+            if (function_exists('shell_exec') === true) {
+                $dimensions = shell_exec('stty size 2>&1');
+                if (is_string($dimensions) === true && preg_match('|\d+ (\d+)|', $dimensions, $matches) === 1) {
+                    $this->settings$name = (int) $matches1;
+                }
+            }
+
+            if ($this->settings$name === 'auto') {
+                // If shell_exec wasn't available or didn't yield a usable value, set to the default.
+                // This will prevent subsequent retrievals of the reportWidth from making another call to stty.
+                $this->settings$name = self::DEFAULT_REPORT_WIDTH;
+            }
+        }
+
         return $this->settings$name;
 
     }//end __get()
@@ -222,16 +247,20 @@
 
         switch ($name) {
         case 'reportWidth' :
-            // Support auto terminal width.
-            if ($value === 'auto'
-                && function_exists('shell_exec') === true
-                && preg_match('|\d+ (\d+)|', shell_exec('stty size 2>&1'), $matches) === 1
-            ) {
-                $value = (int) $matches1;
-            } else {
+            if (is_string($value) === true && $value === 'auto') {
+                // Nothing to do. Leave at 'auto'.
+                break;
+            }
+
+            if (is_int($value) === true) {
+                $value = abs($value);
+            } else if (is_string($value) === true && preg_match('`^\d+$`', $value) === 1) {
                 $value = (int) $value;
+            } else {
+                $value = self::DEFAULT_REPORT_WIDTH;
             }
             break;
+
         case 'standards' :
             $cleaned = ;
 
@@ -250,6 +279,20 @@
 
             $value = $cleaned;
             break;
+
+        // Only track time when explicitly needed.
+        case 'verbosity':
+            if ($value > 2) {
+                $this->settings'trackTime' = true;
+            }
+            break;
+        case 'reports':
+            $reports = array_change_key_case($value, CASE_LOWER);
+            if (array_key_exists('performance', $reports) === true) {
+                $this->settings'trackTime' = true;
+            }
+            break;
+
         default :
             // No validation required.
             break;
@@ -503,6 +546,7 @@
         $this->stdin           = false;
         $this->stdinContent    = null;
         $this->stdinPath       = null;
+        $this->trackTime       = false;
         $this->unknown         = ;
 
         $standard = self::getConfigData('default_standard');
@@ -690,7 +734,7 @@
 
 
     /**
-     * Processes a long (--example) command line argument.
+     * Processes a long (--example) command-line argument.
      *
      * @param string $arg The command line argument.
      * @param int    $pos The position of the argument on the command line.
@@ -709,7 +753,7 @@
             throw new DeepExitException($output, 0);
         case 'version':
             $output  = 'PHP_CodeSniffer version '.self::VERSION.' ('.self::STABILITY.') ';
-            $output .= 'by Squiz (http://www.squiz.net)'.PHP_EOL;
+            $output .= 'by Squiz and PHPCSStandards'.PHP_EOL;
             throw new DeepExitException($output, 0);
         case 'colors':
             if (isset(self::$overriddenDefaults'colors') === true) {
@@ -1205,13 +1249,17 @@
                 if ($this->dieOnUnknownArg === false) {
                     $eqPos = strpos($arg, '=');
                     try {
+                        $unknown = $this->unknown;
+
                         if ($eqPos === false) {
-                            $this->values$arg = $arg;
+                            $unknown$arg = $arg;
                         } else {
-                            $value = substr($arg, ($eqPos + 1));
-                            $arg   = substr($arg, 0, $eqPos);
-                            $this->values$arg = $value;
+                            $value         = substr($arg, ($eqPos + 1));
+                            $arg           = substr($arg, 0, $eqPos);
+                            $unknown$arg = $value;
                         }
+
+                        $this->unknown = $unknown;
                     } catch (RuntimeException $e) {
                         // Value is not valid, so just ignore it.
                     }
@@ -1389,7 +1437,7 @@
         echo '                e.g., module/php,es/js'.PHP_EOL;
         echo ' <file>         One or more files and/or directories to check'.PHP_EOL;
         echo ' <fileList>     A file containing a list of files and/or directories to check (one per line)'.PHP_EOL;
-        echo ' <filter>       Use either the "gitmodified" or "gitstaged" filter,'.PHP_EOL;
+        echo ' <filter>       Use either the "GitModified" or "GitStaged" filter,'.PHP_EOL;
         echo '                or specify the path to a custom filter class'.PHP_EOL;
         echo ' <generator>    Use either the "HTML", "Markdown" or "Text" generator'.PHP_EOL;
         echo '                (forces documentation generation instead of checking)'.PHP_EOL;
@@ -1397,8 +1445,8 @@
         echo ' <processes>    How many files should be checked simultaneously (default is 1)'.PHP_EOL;
         echo ' <report>       Print either the "full", "xml", "checkstyle", "csv"'.PHP_EOL;
         echo '                "json", "junit", "emacs", "source", "summary", "diff"'.PHP_EOL;
-        echo '                "svnblame", "gitblame", "hgblame" or "notifysend" report,'.PHP_EOL;
-        echo '                or specify the path to a custom report class'.PHP_EOL;
+        echo '                "svnblame", "gitblame", "hgblame", "notifysend" or "performance",'.PHP_EOL;
+        echo '                report or specify the path to a custom report class'.PHP_EOL;
         echo '                (the "full" report is printed by default)'.PHP_EOL;
         echo ' <reportFile>   Write the report to the specified file path'.PHP_EOL;
         echo ' <reportWidth>  How many columns wide screen reports should be printed'.PHP_EOL;
@@ -1451,7 +1499,7 @@
         echo '               e.g., module/php,es/js'.PHP_EOL;
         echo ' <file>        One or more files and/or directories to fix'.PHP_EOL;
         echo ' <fileList>    A file containing a list of files and/or directories to fix (one per line)'.PHP_EOL;
-        echo ' <filter>      Use either the "gitmodified" or "gitstaged" filter,'.PHP_EOL;
+        echo ' <filter>      Use either the "GitModified" or "GitStaged" filter,'.PHP_EOL;
         echo '               or specify the path to a custom filter class'.PHP_EOL;
         echo ' <patterns>    A comma separated list of patterns to ignore files and directories'.PHP_EOL;
         echo ' <processes>   How many files should be fixed simultaneously (default is 1)'.PHP_EOL;
@@ -1567,13 +1615,6 @@
                 $configFile = dirname($path).DIRECTORY_SEPARATOR.'CodeSniffer.conf';
             } else {
                 $configFile = dirname(__DIR__).DIRECTORY_SEPARATOR.'CodeSniffer.conf';
-                if (is_file($configFile) === false
-                    && strpos('@data_dir@', '@data_dir') === false
-                ) {
-                    // If data_dir was replaced, this is a PEAR install and we can
-                    // use the PEAR data dir to store the conf file.
-                    $configFile = '@data_dir@/PHP_CodeSniffer/CodeSniffer.conf';
-                }
             }
 
             if (is_file($configFile) === true

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Exceptions/DeepExitException.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Exceptions/RuntimeException.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Exceptions/TokenizerException.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/DummyFile.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/File.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Files;
@@ -209,6 +209,7 @@
      * An array of sniffs being processed and how long they took.
      *
      * @var array
+     * @see getListenerTimes()
      */
     protected $listenerTimes = ;
 
@@ -253,6 +254,7 @@
         $this->configCache'errorSeverity'   = $this->config->errorSeverity;
         $this->configCache'warningSeverity' = $this->config->warningSeverity;
         $this->configCache'recordErrors'    = $this->config->recordErrors;
+        $this->configCache'trackTime'       = $this->config->trackTime;
         $this->configCache'ignorePatterns'  = $this->ruleset->ignorePatterns;
         $this->configCache'includePatterns' = $this->ruleset->includePatterns;
 
@@ -343,6 +345,7 @@
         $listenerIgnoreTo = ;
         $inTests          = defined('PHP_CODESNIFFER_IN_TESTS');
         $checkAnnotations = $this->config->annotations;
+        $annotationErrors = ;
 
         // Foreach of the listeners that have registered to listen for this
         // token, get them to process it.
@@ -379,9 +382,12 @@
                                 if (isset($this->ruleset->sniffCodes$parts0) === true) {
                                     $listenerCode  = array_shift($parts);
                                     $propertyCode  = array_shift($parts);
-                                    $propertyValue = rtrim(implode(' ', $parts), " */\r\n");
+                                    $settings      = 
+                                        'value' => rtrim(implode(' ', $parts), " */\r\n"),
+                                        'scope' => 'sniff',
+                                    ;
                                     $listenerClass = $this->ruleset->sniffCodes$listenerCode;
-                                    $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
+                                    $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $settings);
                                 }
                             }
                         }
@@ -403,9 +409,20 @@
                         $listenerCode = $token'sniffCode';
                         if (isset($this->ruleset->sniffCodes$listenerCode) === true) {
                             $propertyCode  = $token'sniffProperty';
-                            $propertyValue = $token'sniffPropertyValue';
+                            $settings      = 
+                                'value' => $token'sniffPropertyValue',
+                                'scope' => 'sniff',
+                            ;
                             $listenerClass = $this->ruleset->sniffCodes$listenerCode;
-                            $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $propertyValue);
+                            try {
+                                $this->ruleset->setSniffProperty($listenerClass, $propertyCode, $settings);
+                            } catch (RuntimeException $e) {
+                                // Non-existant property being set via an inline annotation.
+                                // This is typically a PHPCS test case file, but we can't throw an error on the annotation
+                                // line as it would get ignored. We also don't want this error to block
+                                // the scan of the current file, so collect these and throw later.
+                                $annotationErrors = 'Line '.$token'line'.': '.str_replace('Ruleset invalid. ', '', $e->getMessage());
+                            }
                         }
                     }
                 }//end if
@@ -490,8 +507,11 @@
 
                 $this->activeListener = $class;
 
-                if (PHP_CODESNIFFER_VERBOSITY > 2) {
+                if ($this->configCache'trackTime' === true) {
                     $startTime = microtime(true);
+                }
+
+                if (PHP_CODESNIFFER_VERBOSITY > 2) {
                     echo "\t\t\tProcessing ".$this->activeListener.'... ';
                 }
 
@@ -500,14 +520,16 @@
                     $listenerIgnoreTo$this->activeListener = $ignoreTo;
                 }
 
-                if (PHP_CODESNIFFER_VERBOSITY > 2) {
+                if ($this->configCache'trackTime' === true) {
                     $timeTaken = (microtime(true) - $startTime);
                     if (isset($this->listenerTimes$this->activeListener) === false) {
                         $this->listenerTimes$this->activeListener = 0;
                     }
 
                     $this->listenerTimes$this->activeListener += $timeTaken;
+                }
 
+                if (PHP_CODESNIFFER_VERBOSITY > 2) {
                     $timeTaken = round(($timeTaken), 4);
                     echo "DONE in $timeTaken seconds".PHP_EOL;
                 }
@@ -530,12 +552,18 @@
             }
         }
 
+        if ($annotationErrors !== ) {
+            $error  = 'Encountered invalid inline phpcs:set annotations. Found:'.PHP_EOL;
+            $error .= implode(PHP_EOL, $annotationErrors);
+
+            $this->addWarning($error, null, 'Internal.PropertyDoesNotExist');
+        }
+
         if (PHP_CODESNIFFER_VERBOSITY > 2) {
             echo "\t*** END TOKEN PROCESSING ***".PHP_EOL;
             echo "\t*** START SNIFF PROCESSING REPORT ***".PHP_EOL;
 
-            asort($this->listenerTimes, SORT_NUMERIC);
-            $this->listenerTimes = array_reverse($this->listenerTimes, true);
+            arsort($this->listenerTimes, SORT_NUMERIC);
             foreach ($this->listenerTimes as $listener => $timeTaken) {
                 echo "\t$listener: ".round(($timeTaken), 4).' secs'.PHP_EOL;
             }
@@ -733,7 +761,7 @@
 
 
     /**
-     * Records a warning against a specific token in the file.
+     * Records a warning against a specific line in the file.
      *
      * @param string $warning  The error message.
      * @param int    $line     The line on which the warning occurred.
@@ -876,7 +904,7 @@
                 }
             }
 
-            // If it is ignored, make sure it's not whitelisted.
+            // If it is ignored, make sure there is no exception in place.
             if ($ignored === true
                 && isset($this->tokenizer->ignoredLines$line'.except') === true
             ) {
@@ -1211,6 +1239,18 @@
 
 
     /**
+     * Returns the time taken processing this file for each invoked sniff.
+     *
+     * @return array
+     */
+    public function getListenerTimes()
+    {
+        return $this->listenerTimes;
+
+    }//end getListenerTimes()
+
+
+    /**
      * Returns the absolute filename of this file.
      *
      * @return string
@@ -1281,25 +1321,25 @@
      *
      * <code>
      *   0 => array(
-     *         'name'                => '$var',  // The variable name.
-     *         'token'               => integer, // The stack pointer to the variable name.
-     *         'content'             => string,  // The full content of the variable definition.
-     *         'has_attributes'      => boolean, // Does the parameter have one or more attributes attached ?
-     *         'pass_by_reference'   => boolean, // Is the variable passed by reference?
-     *         'reference_token'     => integer, // The stack pointer to the reference operator
-     *                                           // or FALSE if the param is not passed by reference.
-     *         'variable_length'     => boolean, // Is the param of variable length through use of `...` ?
-     *         'variadic_token'      => integer, // The stack pointer to the ... operator
-     *                                           // or FALSE if the param is not variable length.
-     *         'type_hint'           => string,  // The type hint for the variable.
-     *         'type_hint_token'     => integer, // The stack pointer to the start of the type hint
-     *                                           // or FALSE if there is no type hint.
-     *         'type_hint_end_token' => integer, // The stack pointer to the end of the type hint
-     *                                           // or FALSE if there is no type hint.
-     *         'nullable_type'       => boolean, // TRUE if the type is preceded by the nullability
-     *                                           // operator.
-     *         'comma_token'         => integer, // The stack pointer to the comma after the param
-     *                                           // or FALSE if this is the last param.
+     *         'name'                => string,        // The variable name.
+     *         'token'               => integer,       // The stack pointer to the variable name.
+     *         'content'             => string,        // The full content of the variable definition.
+     *         'has_attributes'      => boolean,       // Does the parameter have one or more attributes attached ?
+     *         'pass_by_reference'   => boolean,       // Is the variable passed by reference?
+     *         'reference_token'     => integer|false, // The stack pointer to the reference operator
+     *                                                 // or FALSE if the param is not passed by reference.
+     *         'variable_length'     => boolean,       // Is the param of variable length through use of `...` ?
+     *         'variadic_token'      => integer|false, // The stack pointer to the ... operator
+     *                                                 // or FALSE if the param is not variable length.
+     *         'type_hint'           => string,        // The type hint for the variable.
+     *         'type_hint_token'     => integer|false, // The stack pointer to the start of the type hint
+     *                                                 // or FALSE if there is no type hint.
+     *         'type_hint_end_token' => integer|false, // The stack pointer to the end of the type hint
+     *                                                 // or FALSE if there is no type hint.
+     *         'nullable_type'       => boolean,       // TRUE if the type is preceded by the nullability
+     *                                                 // operator.
+     *         'comma_token'         => integer|false, // The stack pointer to the comma after the param
+     *                                                 // or FALSE if this is the last param.
      *        )
      * </code>
      *
@@ -1309,10 +1349,12 @@
      *         'default_equal_token' => integer, // The stack pointer to the equals sign.
      *
      * Parameters declared using PHP 8 constructor property promotion, have these additional array indexes:
-     *         'property_visibility' => string,  // The property visibility as declared.
-     *         'visibility_token'    => integer, // The stack pointer to the visibility modifier token.
-     *         'property_readonly'   => bool,    // TRUE if the readonly keyword was found.
-     *         'readonly_token'      => integer, // The stack pointer to the readonly modifier token.
+     *         'property_visibility' => string,        // The property visibility as declared.
+     *         'visibility_token'    => integer|false, // The stack pointer to the visibility modifier token
+     *                                                 // or FALSE if the visibility is not explicitly declared.
+     *         'property_readonly'   => boolean,       // TRUE if the readonly keyword was found.
+     *         'readonly_token'      => integer,       // The stack pointer to the readonly modifier token.
+     *                                                 // This index will only be set if the property is readonly.
      *
      * @param int $stackPtr The position in the stack of the function token
      *                      to acquire the parameters for.
@@ -1471,6 +1513,7 @@
             case T_TYPE_UNION:
             case T_TYPE_INTERSECTION:
             case T_FALSE:
+            case T_TRUE:
             case T_NULL:
                 // Part of a type hint or default value.
                 if ($defaultStart === null) {
@@ -1530,15 +1573,20 @@
                 $vars$paramCount'type_hint_end_token' = $typeHintEndToken;
                 $vars$paramCount'nullable_type'       = $nullableType;
 
-                if ($visibilityToken !== null) {
-                    $vars$paramCount'property_visibility' = $this->tokens$visibilityToken'content';
-                    $vars$paramCount'visibility_token'    = $visibilityToken;
+                if ($visibilityToken !== null || $readonlyToken !== null) {
+                    $vars$paramCount'property_visibility' = 'public';
+                    $vars$paramCount'visibility_token'    = false;
                     $vars$paramCount'property_readonly'   = false;
-                }
 
-                if ($readonlyToken !== null) {
-                    $vars$paramCount'property_readonly' = true;
-                    $vars$paramCount'readonly_token'    = $readonlyToken;
+                    if ($visibilityToken !== null) {
+                        $vars$paramCount'property_visibility' = $this->tokens$visibilityToken'content';
+                        $vars$paramCount'visibility_token'    = $visibilityToken;
+                    }
+
+                    if ($readonlyToken !== null) {
+                        $vars$paramCount'property_readonly' = true;
+                        $vars$paramCount'readonly_token'    = $readonlyToken;
+                    }
                 }
 
                 if ($this->tokens$i'code' === T_COMMA) {
@@ -1584,19 +1632,19 @@
      * The format of the return value is:
      * <code>
      *   array(
-     *    'scope'                 => 'public', // Public, private, or protected
-     *    'scope_specified'       => true,     // TRUE if the scope keyword was found.
-     *    'return_type'           => '',       // The return type of the method.
-     *    'return_type_token'     => integer,  // The stack pointer to the start of the return type
-     *                                         // or FALSE if there is no return type.
-     *    'return_type_end_token' => integer,  // The stack pointer to the end of the return type
-     *                                         // or FALSE if there is no return type.
-     *    'nullable_return_type'  => false,    // TRUE if the return type is preceded by the
-     *                                         // nullability operator.
-     *    'is_abstract'           => false,    // TRUE if the abstract keyword was found.
-     *    'is_final'              => false,    // TRUE if the final keyword was found.
-     *    'is_static'             => false,    // TRUE if the static keyword was found.
-     *    'has_body'              => false,    // TRUE if the method has a body
+     *    'scope'                 => string,        // Public, private, or protected
+     *    'scope_specified'       => boolean,       // TRUE if the scope keyword was found.
+     *    'return_type'           => string,        // The return type of the method.
+     *    'return_type_token'     => integer|false, // The stack pointer to the start of the return type
+     *                                              // or FALSE if there is no return type.
+     *    'return_type_end_token' => integer|false, // The stack pointer to the end of the return type
+     *                                              // or FALSE if there is no return type.
+     *    'nullable_return_type'  => boolean,       // TRUE if the return type is preceded by the
+     *                                              // nullability operator.
+     *    'is_abstract'           => boolean,       // TRUE if the abstract keyword was found.
+     *    'is_final'              => boolean,       // TRUE if the final keyword was found.
+     *    'is_static'             => boolean,       // TRUE if the static keyword was found.
+     *    'has_body'              => boolean,       // TRUE if the method has a body
      *   );
      * </code>
      *
@@ -1692,6 +1740,7 @@
                 T_PARENT            => T_PARENT,
                 T_STATIC            => T_STATIC,
                 T_FALSE             => T_FALSE,
+                T_TRUE              => T_TRUE,
                 T_NULL              => T_NULL,
                 T_NAMESPACE         => T_NAMESPACE,
                 T_NS_SEPARATOR      => T_NS_SEPARATOR,
@@ -1758,17 +1807,17 @@
      *
      * <code>
      *   array(
-     *    'scope'           => string,  // Public, private, or protected.
-     *    'scope_specified' => boolean, // TRUE if the scope was explicitly specified.
-     *    'is_static'       => boolean, // TRUE if the static keyword was found.
-     *    'is_readonly'     => boolean, // TRUE if the readonly keyword was found.
-     *    'type'            => string,  // The type of the var (empty if no type specified).
-     *    'type_token'      => integer, // The stack pointer to the start of the type
-     *                                  // or FALSE if there is no type.
-     *    'type_end_token'  => integer, // The stack pointer to the end of the type
-     *                                  // or FALSE if there is no type.
-     *    'nullable_type'   => boolean, // TRUE if the type is preceded by the nullability
-     *                                  // operator.
+     *    'scope'           => string,        // Public, private, or protected.
+     *    'scope_specified' => boolean,       // TRUE if the scope was explicitly specified.
+     *    'is_static'       => boolean,       // TRUE if the static keyword was found.
+     *    'is_readonly'     => boolean,       // TRUE if the readonly keyword was found.
+     *    'type'            => string,        // The type of the var (empty if no type specified).
+     *    'type_token'      => integer|false, // The stack pointer to the start of the type
+     *                                        // or FALSE if there is no type.
+     *    'type_end_token'  => integer|false, // The stack pointer to the end of the type
+     *                                        // or FALSE if there is no type.
+     *    'nullable_type'   => boolean,       // TRUE if the type is preceded by the nullability
+     *                                        // operator.
      *   );
      * </code>
      *
@@ -1893,6 +1942,7 @@
                 T_SELF              => T_SELF,
                 T_PARENT            => T_PARENT,
                 T_FALSE             => T_FALSE,
+                T_TRUE              => T_TRUE,
                 T_NULL              => T_NULL,
                 T_NAMESPACE         => T_NAMESPACE,
                 T_NS_SEPARATOR      => T_NS_SEPARATOR,
@@ -1945,8 +1995,9 @@
      * The format of the return value is:
      * <code>
      *   array(
-     *    'is_abstract' => false, // true if the abstract keyword was found.
-     *    'is_final'    => false, // true if the final keyword was found.
+     *    'is_abstract' => boolean, // TRUE if the abstract keyword was found.
+     *    'is_final'    => boolean, // TRUE if the final keyword was found.
+     *    'is_readonly' => boolean, // TRUE if the readonly keyword was found.
      *   );
      * </code>
      *
@@ -1966,6 +2017,7 @@
         $valid = 
             T_FINAL       => T_FINAL,
             T_ABSTRACT    => T_ABSTRACT,
+            T_READONLY    => T_READONLY,
             T_WHITESPACE  => T_WHITESPACE,
             T_COMMENT     => T_COMMENT,
             T_DOC_COMMENT => T_DOC_COMMENT,
@@ -1973,6 +2025,7 @@
 
         $isAbstract = false;
         $isFinal    = false;
+        $isReadonly = false;
 
         for ($i = ($stackPtr - 1); $i > 0; $i--) {
             if (isset($valid$this->tokens$i'code') === false) {
@@ -1987,12 +2040,17 @@
             case T_FINAL:
                 $isFinal = true;
                 break;
+
+            case T_READONLY:
+                $isReadonly = true;
+                break;
             }
         }//end for
 
         return 
             'is_abstract' => $isAbstract,
             'is_final'    => $isFinal,
+            'is_readonly' => $isReadonly,
         ;
 
     }//end getClassProperties()
@@ -2589,15 +2647,18 @@
      *
      * @param int|string|array $types   The type(s) of tokens to search for.
      * @param int              $start   The position to start searching from in the
-     *                                  token stack. The first token matching on
-     *                                  this line before this token will be returned.
+     *                                  token stack.
      * @param bool             $exclude If true, find the token that is NOT of
      *                                  the types specified in $types.
      * @param string           $value   The value that the token must be equal to.
      *                                  If value is omitted, tokens with any value will
      *                                  be returned.
      *
-     * @return int|false
+     * @return int|false The first token which matches on the line containing the start
+     *                   token, between the start of the line and the start token.
+     *                   Note: The first token matching might be the start token.
+     *                   FALSE when no matching token could be found between the start of
+     *                   the line and the start token.
      */
     public function findFirstOnLine($types, $start, $exclude=false, $value=null)
     {
@@ -2657,7 +2718,7 @@
         }
 
         // Make sure the token has conditions.
-        if (isset($this->tokens$stackPtr'conditions') === false) {
+        if (empty($this->tokens$stackPtr'conditions') === true) {
             return false;
         }
 
@@ -2698,7 +2759,7 @@
         }
 
         // Make sure the token has conditions.
-        if (isset($this->tokens$stackPtr'conditions') === false) {
+        if (empty($this->tokens$stackPtr'conditions') === true) {
             return false;
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/FileList.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/LocalFile.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/ExactMatch.php Changed

@@ -2,11 +2,11 @@
 /**
  * An abstract filter class for checking files and folders against exact matches.
  *
- * Supports both whitelists and blacklists.
+ * Supports both allowed files and blocked files.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Filters;
@@ -21,22 +21,22 @@
      *
      * @var array
      */
-    private $blacklist = null;
+    private $blockedFiles = null;
 
     /**
      * A list of files to include.
      *
-     * If the whitelist is empty, only files in the blacklist will be excluded.
+     * If the allowed files list is empty, only files in the blocked files list will be excluded.
      *
      * @var array
      */
-    private $whitelist = null;
+    private $allowedFiles = null;
 
 
     /**
      * Check whether the current element of the iterator is acceptable.
      *
-     * If a file is both blacklisted and whitelisted, it will be deemed unacceptable.
+     * If a file is both blocked and allowed, it will be deemed unacceptable.
      *
      * @return bool
      */
@@ -46,27 +46,27 @@
             return false;
         }
 
-        if ($this->blacklist === null) {
-            $this->blacklist = $this->getblacklist();
+        if ($this->blockedFiles === null) {
+            $this->blockedFiles = $this->getblacklist();
         }
 
-        if ($this->whitelist === null) {
-            $this->whitelist = $this->getwhitelist();
+        if ($this->allowedFiles === null) {
+            $this->allowedFiles = $this->getwhitelist();
         }
 
         $filePath = Util\Common::realpath($this->current());
 
-        // If file is both blacklisted and whitelisted, the blacklist takes precedence.
-        if (isset($this->blacklist$filePath) === true) {
+        // If file is both blocked and allowed, the blocked files list takes precedence.
+        if (isset($this->blockedFiles$filePath) === true) {
             return false;
         }
 
-        if (empty($this->whitelist) === true && empty($this->blacklist) === false) {
-            // We are only checking a blacklist, so everything else should be whitelisted.
+        if (empty($this->allowedFiles) === true && empty($this->blockedFiles) === false) {
+            // We are only checking a blocked files list, so everything else should be allowed.
             return true;
         }
 
-        return isset($this->whitelist$filePath);
+        return isset($this->allowedFiles$filePath);
 
     }//end accept()
 
@@ -74,23 +74,23 @@
     /**
      * Returns an iterator for the current entry.
      *
-     * Ensures that the blacklist and whitelist are preserved so they don't have
+     * Ensures that the blocked files list and the allowed files list are preserved so they don't have
      * to be generated each time.
      *
      * @return \RecursiveIterator
      */
     public function getChildren()
     {
-        $children            = parent::getChildren();
-        $children->blacklist = $this->blacklist;
-        $children->whitelist = $this->whitelist;
+        $children = parent::getChildren();
+        $children->blockedFiles = $this->blockedFiles;
+        $children->allowedFiles = $this->allowedFiles;
         return $children;
 
     }//end getChildren()
 
 
     /**
-     * Get a list of blacklisted file paths.
+     * Get a list of file paths to exclude.
      *
      * @return array
      */
@@ -98,7 +98,7 @@
 
 
     /**
-     * Get a list of whitelisted file paths.
+     * Get a list of file paths to include.
      *
      * @return array
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/Filter.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/GitModified.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Filters;
@@ -16,7 +16,7 @@
 
 
     /**
-     * Get a list of blacklisted file paths.
+     * Get a list of file paths to exclude.
      *
      * @return array
      */
@@ -28,7 +28,7 @@
 
 
     /**
-     * Get a list of whitelisted file paths.
+     * Get a list of file paths to include.
      *
      * @return array
      */
@@ -37,8 +37,7 @@
         $modified = ;
 
         $cmd    = 'git ls-files -o -m --exclude-standard -- '.escapeshellarg($this->basedir);
-        $output = ;
-        exec($cmd, $output);
+        $output = $this->exec($cmd);
 
         $basedir = $this->basedir;
         if (is_dir($basedir) === false) {
@@ -63,4 +62,27 @@
     }//end getWhitelist()
 
 
+    /**
+     * Execute an external command.
+     *
+     * {@internal This method is only needed to allow for mocking the return value
+     * to test the class logic.}
+     *
+     * @param string $cmd Command.
+     *
+     * @return array
+     */
+    protected function exec($cmd)
+    {
+        $output   = ;
+        $lastLine = exec($cmd, $output);
+        if ($lastLine === false) {
+            return ;
+        }
+
+        return $output;
+
+    }//end exec()
+
+
 }//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Filters/GitStaged.php Changed

@@ -6,7 +6,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2018 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Filters;
@@ -18,7 +18,7 @@
 
 
     /**
-     * Get a list of blacklisted file paths.
+     * Get a list of file paths to exclude.
      *
      * @return array
      */
@@ -30,7 +30,7 @@
 
 
     /**
-     * Get a list of whitelisted file paths.
+     * Get a list of file paths to include.
      *
      * @return array
      */
@@ -39,8 +39,7 @@
         $modified = ;
 
         $cmd    = 'git diff --cached --name-only -- '.escapeshellarg($this->basedir);
-        $output = ;
-        exec($cmd, $output);
+        $output = $this->exec($cmd);
 
         $basedir = $this->basedir;
         if (is_dir($basedir) === false) {
@@ -65,4 +64,27 @@
     }//end getWhitelist()
 
 
+    /**
+     * Execute an external command.
+     *
+     * {@internal This method is only needed to allow for mocking the return value
+     * to test the class logic.}
+     *
+     * @param string $cmd Command.
+     *
+     * @return array
+     */
+    protected function exec($cmd)
+    {
+        $output   = ;
+        $lastLine = exec($cmd, $output);
+        if ($lastLine === false) {
+            return ;
+        }
+
+        return $output;
+
+    }//end exec()
+
+
 }//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Fixer.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/Generator.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/HTML.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/Markdown.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Generators/Text.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reporter.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Cbf.php Changed

@@ -8,7 +8,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -28,10 +28,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      * @throws \PHP_CodeSniffer\Exceptions\DeepExitException

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Checkstyle.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Code.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Csv.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -22,10 +22,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Diff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -22,10 +22,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Emacs.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -22,10 +22,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Full.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */
@@ -64,15 +64,28 @@
         foreach ($report'messages' as $line => $lineErrors) {
             foreach ($lineErrors as $column => $colErrors) {
                 foreach ($colErrors as $error) {
-                    $length = strlen($error'message');
+                    // Start with the presumption of a single line error message.
+                    $length    = strlen($error'message');
+                    $srcLength = (strlen($error'source') + 3);
                     if ($showSources === true) {
-                        $length += (strlen($error'source') + 3);
+                        $length += $srcLength;
+                    }
+
+                    // ... but also handle multi-line messages correctly.
+                    if (strpos($error'message', "\n") !== false) {
+                        $errorLines = explode("\n", $error'message');
+                        $length     = max(array_map('strlen', $errorLines));
+
+                        if ($showSources === true) {
+                            $lastLine = array_pop($errorLines);
+                            $length   = max($length, (strlen($lastLine) + $srcLength));
+                        }
                     }
 
                     $maxErrorLength = max($maxErrorLength, ($length + 1));
-                }
-            }
-        }
+                }//end foreach
+            }//end foreach
+        }//end foreach
 
         $file       = $report'filename';
         $fileLength = strlen($file);
@@ -115,36 +128,51 @@
         // The maximum amount of space an error message can use.
         $maxErrorSpace = ($width - $paddingLength - 1);
 
+        $beforeMsg = '';
+        $afterMsg  = '';
+        if ($showSources === true) {
+            $beforeMsg = "\0331m";
+            $afterMsg  = "\0330m";
+        }
+
+        $beforeAfterLength = strlen($beforeMsg.$afterMsg);
+
         foreach ($report'messages' as $line => $lineErrors) {
             foreach ($lineErrors as $column => $colErrors) {
                 foreach ($colErrors as $error) {
-                    $message  = $error'message';
-                    $msgLines = $message;
-                    if (strpos($message, "\n") !== false) {
-                        $msgLines = explode("\n", $message);
-                    }
+                    $errorMsg = wordwrap(
+                        $error'message',
+                        $maxErrorSpace
+                    );
 
-                    $errorMsg = '';
-                    $lastLine = (count($msgLines) - 1);
-                    foreach ($msgLines as $k => $msgLine) {
-                        if ($k === 0) {
-                            if ($showSources === true) {
-                                $errorMsg .= "\0331m";
-                            }
-                        } else {
-                            $errorMsg .= PHP_EOL.$paddingLine2;
-                        }
+                    // Add the padding _after_ the wordwrap as the message itself may contain line breaks
+                    // and those lines will also need to receive padding.
+                    $errorMsg = str_replace("\n", $afterMsg.PHP_EOL.$paddingLine2.$beforeMsg, $errorMsg);
+                    $errorMsg = $beforeMsg.$errorMsg.$afterMsg;
 
-                        if ($k === $lastLine && $showSources === true) {
-                            $msgLine .= "\0330m".' ('.$error'source'.')';
+                    if ($showSources === true) {
+                        $lastMsg          = $errorMsg;
+                        $startPosLastLine = strrpos($errorMsg, PHP_EOL.$paddingLine2.$beforeMsg);
+                        if ($startPosLastLine !== false) {
+                            // Message is multiline. Grab the text of last line of the message, including the color codes.
+                            $lastMsg = substr($errorMsg, ($startPosLastLine + strlen(PHP_EOL.$paddingLine2)));
                         }
 
-                        $errorMsg .= wordwrap(
-                            $msgLine,
-                            $maxErrorSpace,
-                            PHP_EOL.$paddingLine2
-                        );
-                    }
+                        // When show sources is used, the message itself will be bolded, so we need to correct the length.
+                        $sourceSuffix = '('.$error'source'.')';
+
+                        $lastMsgPlusSourceLength = strlen($lastMsg);
+                        // Add space + source suffix length.
+                        $lastMsgPlusSourceLength += (1 + strlen($sourceSuffix));
+                        // Correct for the color codes.
+                        $lastMsgPlusSourceLength -= $beforeAfterLength;
+
+                        if ($lastMsgPlusSourceLength > $maxErrorSpace) {
+                            $errorMsg .= PHP_EOL.$paddingLine2.$sourceSuffix;
+                        } else {
+                            $errorMsg .= ' '.$sourceSuffix;
+                        }
+                    }//end if
 
                     // The padding that goes on the front of the line.
                     $padding = ($maxLineNumLength - strlen($line));

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Gitblame.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Hgblame.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Info.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */
@@ -45,7 +45,7 @@
 
 
     /**
-     * Prints the source of all errors and warnings.
+     * Prints the recorded metrics.
      *
      * @param string $cachedData    Any partial report data that was returned from
      *                              generateFileReport during the run.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Json.php Changed

@@ -5,7 +5,7 @@
  * @author    Jeffrey Fisher <jeffslofish@gmail.com>
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Junit.php Changed

@@ -5,7 +5,7 @@
  * @author    Oleg Lobach <oleg@lobach.info>
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -24,10 +24,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Notifysend.php Changed

@@ -11,7 +11,7 @@
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2012-2014 Christian Weiske
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -88,10 +88,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */
@@ -154,7 +154,7 @@
      * @param int      $totalErrors   Total number of errors found during the run.
      * @param int      $totalWarnings Total number of warnings found during the run.
      *
-     * @return string Error message or NULL if no error/warning found.
+     * @return string|null Error message or NULL if no error/warning found.
      */
     protected function generateMessage($checkedFiles, $totalErrors, $totalWarnings)
     {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Performance.php Added

@@ -0,0 +1,160 @@
+<?php
+/**
+ * Performance report for PHP_CodeSniffer.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2023 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Reports;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Common;
+use PHP_CodeSniffer\Util\Timing;
+
+class Performance implements Report
+{
+
+
+    /**
+     * Generate a partial report for a single processed file.
+     *
+     * Function should return TRUE if it printed or stored data about the file
+     * and FALSE if it ignored the file. Returning TRUE indicates that the file and
+     * its data should be counted in the grand totals.
+     *
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
+     *
+     * @return bool
+     */
+    public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)
+    {
+        $times = $phpcsFile->getListenerTimes();
+        foreach ($times as $sniff => $time) {
+            echo "$sniff>>$time".PHP_EOL;
+        }
+
+        return true;
+
+    }//end generateFileReport()
+
+
+    /**
+     * Prints the sniff performance report.
+     *
+     * @param string $cachedData    Any partial report data that was returned from
+     *                              generateFileReport during the run.
+     * @param int    $totalFiles    Total number of files processed during the run.
+     * @param int    $totalErrors   Total number of errors found during the run.
+     * @param int    $totalWarnings Total number of warnings found during the run.
+     * @param int    $totalFixable  Total number of problems that can be fixed.
+     * @param bool   $showSources   Show sources?
+     * @param int    $width         Maximum allowed line width.
+     * @param bool   $interactive   Are we running in interactive mode?
+     * @param bool   $toScreen      Is the report being printed to screen?
+     *
+     * @return void
+     */
+    public function generate(
+        $cachedData,
+        $totalFiles,
+        $totalErrors,
+        $totalWarnings,
+        $totalFixable,
+        $showSources=false,
+        $width=80,
+        $interactive=false,
+        $toScreen=true
+    ) {
+        $lines = explode(PHP_EOL, $cachedData);
+        array_pop($lines);
+
+        if (empty($lines) === true) {
+            return;
+        }
+
+        // First collect the accumulated timings.
+        $timings        = ;
+        $totalSniffTime = 0;
+        foreach ($lines as $line) {
+            $parts      = explode('>>', $line);
+            $sniffClass = $parts0;
+            $time       = $parts1;
+
+            if (isset($timings$sniffClass) === false) {
+                $timings$sniffClass = 0;
+            }
+
+            $timings$sniffClass += $time;
+            $totalSniffTime       += $time;
+        }
+
+        // Next, tidy up the sniff names and determine max needed column width.
+        $totalTimes   = ;
+        $maxNameWidth = 0;
+        foreach ($timings as $sniffClass => $secs) {
+            $sniffCode    = Common::getSniffCode($sniffClass);
+            $maxNameWidth = max($maxNameWidth, strlen($sniffCode));
+            $totalTimes$sniffCode = $secs;
+        }
+
+        // Leading space + up to 12 chars for the number.
+        $maxTimeWidth = 13;
+        // Leading space, open parenthesis, up to 5 chars for the number, space + % and close parenthesis.
+        $maxPercWidth = 10;
+        // Calculate the maximum width available for the sniff name.
+        $maxNameWidth = min(($width - $maxTimeWidth - $maxPercWidth), max(($width - $maxTimeWidth - $maxPercWidth), $maxNameWidth));
+
+        arsort($totalTimes);
+
+        echo PHP_EOL."\0331m".'PHP CODE SNIFFER SNIFF PERFORMANCE REPORT'."\0330m".PHP_EOL;
+        echo str_repeat('-', $width).PHP_EOL;
+        echo "\0331m".'SNIFF'.str_repeat(' ', ($width - 31)).'TIME TAKEN (SECS)     (%)'."\0330m".PHP_EOL;
+        echo str_repeat('-', $width).PHP_EOL;
+
+        // Mark sniffs which take more than twice as long as the average processing time per sniff
+        // in orange and when they take more than three times as long as the average,
+        // mark them in red.
+        $avgSniffTime       = ($totalSniffTime / count($totalTimes));
+        $doubleAvgSniffTime = (2 * $avgSniffTime);
+        $tripleAvgSniffTime = (3 * $avgSniffTime);
+
+        $format        = "%- {$maxNameWidth}.{$maxNameWidth}s % 12.6f (% 5.1f %%)".PHP_EOL;
+        $formatBold    = "\0331m%- {$maxNameWidth}.{$maxNameWidth}s % 12.6f (% 5.1f %%)\0330m".PHP_EOL;
+        $formatWarning = "%- {$maxNameWidth}.{$maxNameWidth}s \03333m% 12.6f (% 5.1f %%)\0330m".PHP_EOL;
+        $formatError   = "%- {$maxNameWidth}.{$maxNameWidth}s \03331m% 12.6f (% 5.1f %%)\0330m".PHP_EOL;
+
+        foreach ($totalTimes as $sniff => $time) {
+            $percent = round((($time / $totalSniffTime) * 100), 1);
+
+            if ($time > $tripleAvgSniffTime) {
+                printf($formatError, $sniff, $time, $percent);
+            } else if ($time > $doubleAvgSniffTime) {
+                printf($formatWarning, $sniff, $time, $percent);
+            } else {
+                printf($format, $sniff, $time, $percent);
+            }
+        }
+
+        echo str_repeat('-', $width).PHP_EOL;
+        printf($formatBold, 'TOTAL SNIFF PROCESSING TIME', $totalSniffTime, 100);
+
+        $runTime   = (Timing::getDuration() / 1000);
+        $phpcsTime = ($runTime - $totalSniffTime);
+
+        echo PHP_EOL.str_repeat('-', $width).PHP_EOL;
+        printf($format, 'Time taken by sniffs', $totalSniffTime, round((($totalSniffTime / $runTime) * 100), 1));
+        printf($format, 'Time taken by PHPCS runner', $phpcsTime, round((($phpcsTime / $runTime) * 100), 1));
+
+        echo str_repeat('-', $width).PHP_EOL;
+        printf($formatBold, 'TOTAL RUN TIME', $runTime, 100);
+        echo str_repeat('-', $width).PHP_EOL;
+
+    }//end generate()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Report.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -22,10 +22,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Source.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Summary.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Svnblame.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/VersionControl.php Changed

@@ -5,7 +5,7 @@
  * @author    Ben Selby <benmatselby@gmail.com>
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -31,16 +31,16 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */
     public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)
     {
-        $blames = $this->getBlameContent($report'filename');
+        $blames = $this->getBlameContent($phpcsFile->getFilename());
 
         $authorCache = ;
         $praiseCache = ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Reports/Xml.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Reports;
@@ -23,10 +23,10 @@
      * and FALSE if it ignored the file. Returning TRUE indicates that the file and
      * its data should be counted in the grand totals.
      *
-     * @param array                 $report      Prepared report data.
-     * @param \PHP_CodeSniffer\File $phpcsFile   The file being reported on.
-     * @param bool                  $showSources Show sources?
-     * @param int                   $width       Maximum allowed line width.
+     * @param array                       $report      Prepared report data.
+     * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being reported on.
+     * @param bool                        $showSources Show sources?
+     * @param int                         $width       Maximum allowed line width.
      *
      * @return bool
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Ruleset.php Changed

@@ -6,13 +6,14 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer;
 
 use PHP_CodeSniffer\Exceptions\RuntimeException;
 use PHP_CodeSniffer\Util;
+use stdClass;
 
 class Ruleset
 {
@@ -46,7 +47,7 @@
      * The key is the regular expression and the value is the type
      * of ignore pattern (absolute or relative).
      *
-     * @var array<string, string>
+     * @var array<string, array>
      */
     public $ignorePatterns = ;
 
@@ -87,7 +88,7 @@
      * The key is the token name being listened for and the value
      * is the sniff object.
      *
-     * @var array<int, \PHP_CodeSniffer\Sniffs\Sniff>
+     * @var array<int, array<string, array<string, mixed>>>
      */
     public $tokenListeners = ;
 
@@ -237,16 +238,12 @@
     public function explain()
     {
         $sniffs = array_keys($this->sniffCodes);
-        sort($sniffs);
-
-        ob_start();
+        sort($sniffs, (SORT_NATURAL | SORT_FLAG_CASE));
 
-        $lastStandard = null;
-        $lastCount    = '';
-        $sniffCount   = count($sniffs);
+        $sniffCount = count($sniffs);
 
-        // Add a dummy entry to the end so we loop
-        // one last time and clear the output buffer.
+        // Add a dummy entry to the end so we loop one last time
+        // and echo out the collected info about the last standard.
         $sniffs = '';
 
         $summaryLine = PHP_EOL."The $this->name standard contains 1 sniff".PHP_EOL;
@@ -256,7 +253,9 @@
 
         echo $summaryLine;
 
-        ob_start();
+        $lastStandard     = null;
+        $lastCount        = 0;
+        $sniffsInStandard = ;
 
         foreach ($sniffs as $i => $sniff) {
             if ($i === $sniffCount) {
@@ -268,32 +267,31 @@
                 }
             }
 
+            // Reached the first item in the next standard.
+            // Echo out the info collected from the previous standard.
             if ($currentStandard !== $lastStandard) {
-                $sniffList = ob_get_contents();
-                ob_end_clean();
-
-                echo PHP_EOL.$lastStandard.' ('.$lastCount.' sniff';
+                $subTitle = $lastStandard.' ('.$lastCount.' sniff';
                 if ($lastCount > 1) {
-                    echo 's';
+                    $subTitle .= 's';
                 }
 
-                echo ')'.PHP_EOL;
-                echo str_repeat('-', (strlen($lastStandard.$lastCount) + 10));
-                echo PHP_EOL;
-                echo $sniffList;
+                $subTitle .= ')';
 
-                $lastStandard = $currentStandard;
-                $lastCount    = 0;
+                echo PHP_EOL.$subTitle.PHP_EOL;
+                echo str_repeat('-', strlen($subTitle)).PHP_EOL;
+                echo '  '.implode(PHP_EOL.'  ', $sniffsInStandard).PHP_EOL;
+
+                $lastStandard     = $currentStandard;
+                $lastCount        = 0;
+                $sniffsInStandard = ;
 
                 if ($currentStandard === null) {
                     break;
                 }
-
-                ob_start();
             }//end if
 
-            echo '  '.$sniff.PHP_EOL;
-            $lastCount++;
+            $sniffsInStandard = $sniff;
+            ++$lastCount;
         }//end foreach
 
     }//end explain()
@@ -960,6 +958,11 @@
             if (isset($rule->properties) === true
                 && $this->shouldProcessElement($rule->properties) === true
             ) {
+                $propertyScope = 'standard';
+                if ($code === $ref || substr($ref, -9) === 'Sniff.php') {
+                    $propertyScope = 'sniff';
+                }
+
                 foreach ($rule->properties->property as $prop) {
                     if ($this->shouldProcessElement($prop) === false) {
                         continue;
@@ -980,9 +983,9 @@
                         $values = ;
                         if (isset($prop'extend') === true
                             && (string) $prop'extend' === 'true'
-                            && isset($this->ruleset$code'properties'$name) === true
+                            && isset($this->ruleset$code'properties'$name'value') === true
                         ) {
-                            $values = $this->ruleset$code'properties'$name;
+                            $values = $this->ruleset$code'properties'$name'value';
                         }
 
                         if (isset($prop->element) === true) {
@@ -1017,7 +1020,10 @@
                             }
                         }//end if
 
-                        $this->ruleset$code'properties'$name = $values;
+                        $this->ruleset$code'properties'$name = 
+                            'value' => $values,
+                            'scope' => $propertyScope,
+                        ;
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
                             echo str_repeat("\t", $depth);
                             echo "\t\t=> array property \"$name\" set to \"$printValue\"";
@@ -1028,7 +1034,10 @@
                             echo PHP_EOL;
                         }
                     } else {
-                        $this->ruleset$code'properties'$name = (string) $prop'value';
+                        $this->ruleset$code'properties'$name = 
+                            'value' => (string) $prop'value',
+                            'scope' => $propertyScope,
+                        ;
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
                             echo str_repeat("\t", $depth);
                             echo "\t\t=> property \"$name\" set to \"".(string) $prop'value'.'"';
@@ -1218,8 +1227,8 @@
 
             // Set custom properties.
             if (isset($this->ruleset$sniffCode'properties') === true) {
-                foreach ($this->ruleset$sniffCode'properties' as $name => $value) {
-                    $this->setSniffProperty($sniffClass, $name, $value);
+                foreach ($this->ruleset$sniffCode'properties' as $name => $settings) {
+                    $this->setSniffProperty($sniffClass, $name, $settings);
                 }
             }
 
@@ -1286,18 +1295,76 @@
      *
      * @param string $sniffClass The class name of the sniff.
      * @param string $name       The name of the property to change.
-     * @param string $value      The new value of the property.
+     * @param array  $settings   Array with the new value of the property and the scope of the property being set.
      *
      * @return void
+     *
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException When attempting to set a non-existent property on a sniff
+     *                                                      which doesn't declare the property or explicitly supports
+     *                                                      dynamic properties.
      */
-    public function setSniffProperty($sniffClass, $name, $value)
+    public function setSniffProperty($sniffClass, $name, $settings)
     {
         // Setting a property for a sniff we are not using.
         if (isset($this->sniffs$sniffClass) === false) {
             return;
         }
 
-        $name = trim($name);
+        $name         = trim($name);
+        $propertyName = $name;
+        if (substr($propertyName, -2) === '') {
+            $propertyName = substr($propertyName, 0, -2);
+        }
+
+        /*
+         * BC-compatibility layer for $settings using the pre-PHPCS 3.8.0 format.
+         *
+         * Prior to PHPCS 3.8.0, `$settings` was expected to only contain the new _value_
+         * for the property (which could be an array).
+         * Since PHPCS 3.8.0, `$settings` is expected to be an array with two keys: 'scope'
+         * and 'value', where 'scope' indicates whether the property should be set to the given 'value'
+         * for one individual sniff or for all sniffs in a standard.
+         *
+         * This BC-layer is only for integrations with PHPCS which may call this method directly
+         * and will be removed in PHPCS 4.0.0.
+         */
+
+        if (is_array($settings) === false
+            || isset($settings'scope', $settings'value') === false
+        ) {
+            // This will be an "old" format value.
+            $settings = 
+                'value' => $settings,
+                'scope' => 'standard',
+            ;
+
+            trigger_error(
+                __FUNCTION__.': the format of the $settings parameter has changed from (mixed) $value to array(\'scope\' => \'sniff|standard\', \'value\' => $value). Please update your integration code. See PR #3629 for more information.',
+                E_USER_DEPRECATED
+            );
+        }
+
+        $isSettable  = false;
+        $sniffObject = $this->sniffs$sniffClass;
+        if (property_exists($sniffObject, $propertyName) === true
+            || ($sniffObject instanceof stdClass) === true
+            || method_exists($sniffObject, '__set') === true
+        ) {
+            $isSettable = true;
+        }
+
+        if ($isSettable === false) {
+            if ($settings'scope' === 'sniff') {
+                $notice  = "Ruleset invalid. Property \"$propertyName\" does not exist on sniff ";
+                $notice .= array_search($sniffClass, $this->sniffCodes, true);
+                throw new RuntimeException($notice);
+            }
+
+            return;
+        }
+
+        $value = $settings'value';
+
         if (is_string($value) === true) {
             $value = trim($value);
         }
@@ -1312,7 +1379,7 @@
         } else if ($value === 'false') {
             $value = false;
         } else if (substr($name, -2) === '') {
-            $name   = substr($name, 0, -2);
+            $name   = $propertyName;
             $values = ;
             if ($value !== null) {
                 foreach (explode(',', $value) as $val) {
@@ -1328,7 +1395,7 @@
             $value = $values;
         }
 
-        $this->sniffs$sniffClass->$name = $value;
+        $sniffObject->$name = $value;
 
     }//end setSniffProperty()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Runner.php Changed

@@ -7,7 +7,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer;
@@ -49,7 +49,7 @@
     /**
      * Run the PHPCS script.
      *
-     * @return array
+     * @return int
      */
     public function runPHPCS()
     {
@@ -151,7 +151,7 @@
     /**
      * Run the PHPCBF script.
      *
-     * @return array
+     * @return int
      */
     public function runPHPCBF()
     {
@@ -595,7 +595,7 @@
      * @param string $file    The path of the file that raised the error.
      * @param int    $line    The line number the error was raised at.
      *
-     * @return void
+     * @return bool
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException
      */
     public function handleErrors($code, $message, $file, $line)
@@ -652,10 +652,43 @@
             }
         } catch (\Exception $e) {
             $error = 'An error occurred during processing; checking has been aborted. The error message was: '.$e->getMessage();
+
+            // Determine which sniff caused the error.
+            $sniffStack = null;
+            $nextStack  = null;
+            foreach ($e->getTrace() as $step) {
+                if (isset($step'file') === false) {
+                    continue;
+                }
+
+                if (empty($sniffStack) === false) {
+                    $nextStack = $step;
+                    break;
+                }
+
+                if (substr($step'file', -9) === 'Sniff.php') {
+                    $sniffStack = $step;
+                    continue;
+                }
+            }
+
+            if (empty($sniffStack) === false) {
+                if (empty($nextStack) === false
+                    && isset($nextStack'class') === true
+                    && substr($nextStack'class', -5) === 'Sniff'
+                ) {
+                    $sniffCode = Common::getSniffCode($nextStack'class');
+                } else {
+                    $sniffCode = substr(strrchr(str_replace('\\', '/', $sniffStack'file'), '/'), 1);
+                }
+
+                $error .= sprintf(PHP_EOL.'The error originated in the %s sniff on line %s.', $sniffCode, $sniffStack'line');
+            }
+
             $file->addErrorOnLine($error, 1, 'Internal.Exception');
         }//end try
 
-        $this->reporter->cacheFileReport($file, $this->config);
+        $this->reporter->cacheFileReport($file);
 
         if ($this->config->interactive === true) {
             /*
@@ -690,7 +723,7 @@
                     $file->ruleset->populateTokenListeners();
                     $file->reloadContent();
                     $file->process();
-                    $this->reporter->cacheFileReport($file, $this->config);
+                    $this->reporter->cacheFileReport($file);
                     break;
                 }
             }//end while

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractArraySniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractPatternSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Sniffs;
@@ -78,7 +78,7 @@
      * Classes extending <i>AbstractPatternTest</i> should implement the
      * <i>getPatterns()</i> method to register the patterns they wish to test.
      *
-     * @return int
+     * @return array<int|string>
      * @see    process()
      */
     final public function register()
@@ -250,7 +250,7 @@
      * @param int                         $stackPtr    The position in the tokens stack where
      *                                                 the listening token type was found.
      *
-     * @return array
+     * @return array|false
      */
     protected function processPattern($patternInfo, File $phpcsFile, $stackPtr)
     {
@@ -850,7 +850,7 @@
      * Creates a skip pattern.
      *
      * @param string $pattern The pattern being parsed.
-     * @param string $from    The token content that the skip pattern starts from.
+     * @param int    $from    The token position that the skip pattern starts from.
      *
      * @return array The pattern step.
      * @see    createTokenPattern()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractScopeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractVariableSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/Sniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/CodeAnalysis/EmptyPHPStatementStandard.xml Added

@@ -0,0 +1,44 @@
+<documentation title="Empty PHP Statement">
+    <standard>
+    <!CDATA
+    Empty PHP tags are not allowed.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: There is at least one statement inside the PHP tag pair.">
+        <!CDATA
+<?php <em>echo 'Hello World';</em> ?>
+<?= <em>'Hello World';</em> ?>
+        >
+        </code>
+        <code title="Invalid: There is no statement inside the PHP tag pair.">
+        <!CDATA
+<?php <em>;</em> ?>
+<?= <em></em> ?>
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    Superfluous semi-colons are not allowed.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: There is no superfluous semi-colon after a PHP statement.">
+            <!CDATA
+function_call()<em>;</em>
+if (true) {
+    echo 'Hello World'<em>;</em>
+}
+        >
+        </code>
+        <code title="Invalid: There are one or more superfluous semi-colons after a PHP statement.">
+            <!CDATA
+function_call()<em>;;;</em>
+if (true) {
+    echo 'Hello World';
+}<em>;</em>
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Formatting/SpaceBeforeCastStandard.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/PHP/SyntaxStandard.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/WhiteSpace/LanguageConstructSpacingStandard.xml Added

@@ -0,0 +1,44 @@
+<documentation title="Language Construct Spacing">
+    <standard>
+    <!CDATA
+    Language constructs that can be used without parentheses, must have a single space between the language construct keyword and its content.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Single space after language construct.">
+        <!CDATA
+echo<em> </em>'Hello, World!';
+throw<em> </em>new<em> </em>Exception();
+return<em> </em>$newLine;
+        >
+        </code>
+        <code title="Invalid: No space, more than one space or newline after language construct.">
+        <!CDATA
+echo<em></em>'Hello, World!';
+throw<em>   </em>new<em>   </em>Exception();
+return<em></em>
+$newLine;
+        >
+        </code>
+    </code_comparison>
+    <standard>
+    <!CDATA
+    A single space must be used between the "yield" and "from" keywords for a "yield from" expression.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Single space between yield and from.">
+        <!CDATA
+yield<em> </em>from 1, 2, 3;
+        >
+        </code>
+        <code title="Invalid: No space, more than one space or newline between yield and from.">
+        <!CDATA
+yield<em></em>from 1, 2, 3;
+yield<em>  </em>from 1, 2, 3;
+yield<em></em>
+from 1, 2, 3;
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Arrays/ArrayIndentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays;
@@ -76,9 +76,15 @@
         // check indent levels because it's not valid. But we don't enforce exactly
         // how far indented it should be.
         if ($startIndent < $baseIndent) {
-            $error = 'Array open brace not indented correctly; expected at least %s spaces but found %s';
+            $pluralizeSpace = 's';
+            if ($baseIndent === 1) {
+                $pluralizeSpace = '';
+            }
+
+            $error = 'Array open brace not indented correctly; expected at least %s space%s but found %s';
             $data  = 
                 $baseIndent,
+                $pluralizeSpace,
                 $startIndent,
             ;
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'OpenBraceIncorrect', $data);
@@ -117,9 +123,15 @@
                 continue;
             }
 
-            $error = 'Array key not indented correctly; expected %s spaces but found %s';
+            $pluralizeSpace = 's';
+            if ($expectedIndent === 1) {
+                $pluralizeSpace = '';
+            }
+
+            $error = 'Array key not indented correctly; expected %s space%s but found %s';
             $data  = 
                 $expectedIndent,
+                $pluralizeSpace,
                 $foundIndent,
             ;
             $fix   = $phpcsFile->addFixableError($error, $first, 'KeyIncorrect', $data);
@@ -154,9 +166,15 @@
             return;
         }
 
-        $error = 'Array close brace not indented correctly; expected %s spaces but found %s';
+        $pluralizeSpace = 's';
+        if ($expectedIndent === 1) {
+            $pluralizeSpace = '';
+        }
+
+        $error = 'Array close brace not indented correctly; expected %s space%s but found %s';
         $data  = 
             $expectedIndent,
+            $pluralizeSpace,
             $foundIndent,
         ;
         $fix   = $phpcsFile->addFixableError($error, $arrayEnd, 'CloseBraceIncorrect', $data);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/AssignmentInConditionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyPHPStatementSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php Changed

@@ -24,7 +24,7 @@
  *
  * @author    Manuel Pichler <mapi@manuel-pichler.de>
  * @copyright 2007-2014 Manuel Pichler. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis;
@@ -39,7 +39,7 @@
     /**
      * Registers the tokens that this sniff wants to listen for.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -100,8 +100,8 @@
     /**
      * Get all used variables in the incrementer part of a for statement.
      *
-     * @param array(integer=>array) $tokens Array with all code sniffer tokens.
-     * @param array(string=>mixed)  $token  Current for loop token
+     * @param array<int, array>    $tokens Array with all code sniffer tokens.
+     * @param array<string, mixed> $token  Current for loop token
      *
      * @return string List of all found incrementer variables.
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php Changed

@@ -17,14 +17,13 @@
  *
  * @author    Manuel Pichler <mapi@manuel-pichler.de>
  * @copyright 2007-2014 Manuel Pichler. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
 
 class UnnecessaryFinalModifierSniff implements Sniff
 {
@@ -33,7 +32,7 @@
     /**
      * Registers the tokens that this sniff wants to listen for.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -56,16 +55,13 @@
         $tokens = $phpcsFile->getTokens();
         $token  = $tokens$stackPtr;
 
-        // Skip for-statements without body.
+        // Skip for statements without body.
         if (isset($token'scope_opener') === false) {
             return;
         }
 
-        // Fetch previous token.
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-
-        // Skip for non final class.
-        if ($prev === false || $tokens$prev'code' !== T_FINAL) {
+        if ($phpcsFile->getClassProperties($stackPtr)'is_final' === false) {
+            // This class is not final so we don't need to check it.
             return;
         }
 
@@ -77,6 +73,13 @@
                 $error = 'Unnecessary FINAL modifier in FINAL class';
                 $phpcsFile->addWarning($error, $next, 'Found');
             }
+
+            // Skip over the contents of functions as those can't contain the `final` keyword anyway.
+            if ($tokens$next'code' === T_FUNCTION
+                && isset($tokens$next'scope_closer') === true
+            ) {
+                $next = $tokens$next'scope_closer';
+            }
         }
 
     }//end process()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php Changed

@@ -11,7 +11,7 @@
  * @author    Manuel Pichler <mapi@manuel-pichler.de>
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2007-2014 Manuel Pichler. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis;
@@ -30,11 +30,37 @@
      */
     public $ignoreTypeHints = ;
 
+    /**
+     * A list of all PHP magic methods with fixed method signatures.
+     *
+     * Note: `__construct()` and `__invoke()` are excluded on purpose
+     * as their method signature is not fixed.
+     *
+     * @var array
+     */
+    private $magicMethods = 
+        '__destruct'    => true,
+        '__call'        => true,
+        '__callstatic'  => true,
+        '__get'         => true,
+        '__set'         => true,
+        '__isset'       => true,
+        '__unset'       => true,
+        '__sleep'       => true,
+        '__wakeup'      => true,
+        '__serialize'   => true,
+        '__unserialize' => true,
+        '__tostring'    => true,
+        '__set_state'   => true,
+        '__clone'       => true,
+        '__debuginfo'   => true,
+    ;
+
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -69,16 +95,29 @@
         $errorCode  = 'Found';
         $implements = false;
         $extends    = false;
-        $classPtr   = $phpcsFile->getCondition($stackPtr, T_CLASS);
-        if ($classPtr !== false) {
-            $implements = $phpcsFile->findImplementedInterfaceNames($classPtr);
-            $extends    = $phpcsFile->findExtendedClassName($classPtr);
-            if ($extends !== false) {
-                $errorCode .= 'InExtendedClass';
-            } else if ($implements !== false) {
-                $errorCode .= 'InImplementedInterface';
+
+        if ($token'code' === T_FUNCTION) {
+            $classPtr = $phpcsFile->getCondition($stackPtr, T_CLASS);
+            if ($classPtr !== false) {
+                // Check for magic methods and ignore these as the method signature cannot be changed.
+                $methodName = $phpcsFile->getDeclarationName($stackPtr);
+                if (empty($methodName) === false) {
+                    $methodNameLc = strtolower($methodName);
+                    if (isset($this->magicMethods$methodNameLc) === true) {
+                        return;
+                    }
+                }
+
+                // Check for extends/implements and adjust the error code when found.
+                $implements = $phpcsFile->findImplementedInterfaceNames($classPtr);
+                $extends    = $phpcsFile->findExtendedClassName($classPtr);
+                if ($extends !== false) {
+                    $errorCode .= 'InExtendedClass';
+                } else if ($implements !== false) {
+                    $errorCode .= 'InImplementedInterface';
+                }
             }
-        }
+        }//end if
 
         $params       = ;
         $methodParams = $phpcsFile->getMethodParameters($stackPtr);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php Changed

@@ -4,13 +4,14 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
 
 class DocCommentSniff implements Sniff
 {
@@ -29,7 +30,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -280,9 +281,12 @@
             }
 
             // Check that there was single blank line after the tag block
-            // but account for a multi-line tag comments.
+            // but account for multi-line tag comments.
+            $find = Tokens::$phpcsCommentTokens;
+            $findT_DOC_COMMENT_TAG = T_DOC_COMMENT_TAG;
+
             $lastTag = $group$pos;
-            $next    = $phpcsFile->findNext(T_DOC_COMMENT_TAG, ($lastTag + 3), $commentEnd);
+            $next    = $phpcsFile->findNext($find, ($lastTag + 3), $commentEnd);
             if ($next !== false) {
                 $prev = $phpcsFile->findPrevious(T_DOC_COMMENT_TAG, T_DOC_COMMENT_STRING, ($next - 1), $commentStart);
                 if ($tokens$next'line' !== ($tokens$prev'line' + 2)) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Commenting/FixmeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Commenting/TodoSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/CSSLintSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Roman Levishchenko <index.0h@gmail.com>
  * @copyright 2013-2014 Roman Levishchenko
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Debug;
@@ -28,7 +28,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -44,13 +44,13 @@
      * @param int                         $stackPtr  The position in the stack where
      *                                               the token was found.
      *
-     * @return void
+     * @return int
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $csslintPath = Config::getExecutablePath('csslint');
         if ($csslintPath === null) {
-            return;
+            return ($phpcsFile->numTokens + 1);
         }
 
         $fileName = $phpcsFile->getFilename();
@@ -59,7 +59,7 @@
         exec($cmd, $output, $retval);
 
         if (is_array($output) === false) {
-            return;
+            return ($phpcsFile->numTokens + 1);
         }
 
         $count = count($output);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/ClosureLinterSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Debug;
@@ -22,14 +22,14 @@
      *
      * All other error codes will show warnings.
      *
-     * @var integer
+     * @var array
      */
     public $errorCodes = ;
 
     /**
      * A list of error codes to ignore.
      *
-     * @var integer
+     * @var array
      */
     public $ignoreCodes = ;
 
@@ -44,7 +44,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -60,14 +60,14 @@
      * @param int                         $stackPtr  The position in the stack where
      *                                               the token was found.
      *
-     * @return void
+     * @return int
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If jslint.js could not be run
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $lintPath = Config::getExecutablePath('gjslint');
         if ($lintPath === null) {
-            return;
+            return ($phpcsFile->numTokens + 1);
         }
 
         $fileName = $phpcsFile->getFilename();
@@ -77,7 +77,7 @@
         exec($cmd, $output, $retval);
 
         if (is_array($output) === false) {
-            return;
+            return ($phpcsFile->numTokens + 1);
         }
 
         foreach ($output as $finding) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/ESLintSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Ryan McCue <ryan+gh@hmn.md>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Debug;
@@ -35,7 +35,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -51,14 +51,14 @@
      * @param int                         $stackPtr  The position in the stack where
      *                                               the token was found.
      *
-     * @return void
+     * @return int
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If jshint.js could not be run
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $eslintPath = Config::getExecutablePath('eslint');
         if ($eslintPath === null) {
-            return;
+            return ($phpcsFile->numTokens + 1);
         }
 
         $filename = $phpcsFile->getFilename();

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Debug/JSHintSniff.php Changed

@@ -5,7 +5,7 @@
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @author    Alexander Wei§ <aweisswa@gmx.de>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Debug;
@@ -29,7 +29,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -45,15 +45,15 @@
      * @param int                         $stackPtr  The position in the stack where
      *                                               the token was found.
      *
-     * @return void
+     * @return int
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If jshint.js could not be run
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $rhinoPath  = Config::getExecutablePath('rhino');
         $jshintPath = Config::getExecutablePath('jshint');
-        if ($rhinoPath === null && $jshintPath === null) {
-            return;
+        if ($jshintPath === null) {
+            return ($phpcsFile->numTokens + 1);
         }
 
         $fileName   = $phpcsFile->getFilename();

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/ExecutableFileSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/LineEndingsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/LineLengthSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/OneObjectStructurePerFileSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Formatting/NoSpaceAfterCastSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting;
@@ -34,7 +34,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -54,8 +54,12 @@
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens        = $phpcsFile->getTokens();
-        $this->spacing = (int) $this->spacing;
+        $tokens         = $phpcsFile->getTokens();
+        $this->spacing  = (int) $this->spacing;
+        $pluralizeSpace = 's';
+        if ($this->spacing === 1) {
+            $pluralizeSpace = '';
+        }
 
         if ($tokens$stackPtr'code' === T_BINARY_CAST
             && $tokens$stackPtr'content' === 'b'
@@ -83,8 +87,11 @@
 
         $nextNonWhitespace = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
         if ($nextNonEmpty !== $nextNonWhitespace) {
-            $error = 'Expected %s space(s) after cast statement; comment found';
-            $data  = $this->spacing;
+            $error = 'Expected %s space%s after cast statement; comment found';
+            $data  = 
+                $this->spacing,
+                $pluralizeSpace,
+            ;
             $phpcsFile->addError($error, $stackPtr, 'CommentFound', $data);
 
             if ($tokens($stackPtr + 1)'code' === T_WHITESPACE) {
@@ -109,9 +116,10 @@
             return;
         }
 
-        $error = 'Expected %s space(s) after cast statement; %s found';
+        $error = 'Expected %s space%s after cast statement; %s found';
         $data  = 
             $this->spacing,
+            $pluralizeSpace,
             $found,
         ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting;
@@ -44,7 +44,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -64,8 +64,12 @@
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens        = $phpcsFile->getTokens();
-        $this->spacing = (int) $this->spacing;
+        $tokens         = $phpcsFile->getTokens();
+        $this->spacing  = (int) $this->spacing;
+        $pluralizeSpace = 's';
+        if ($this->spacing === 1) {
+            $pluralizeSpace = '';
+        }
 
         $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($nextNonEmpty === false) {
@@ -84,8 +88,11 @@
 
         $nextNonWhitespace = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
         if ($nextNonEmpty !== $nextNonWhitespace) {
-            $error = 'Expected %s space(s) after NOT operator; comment found';
-            $data  = $this->spacing;
+            $error = 'Expected %s space%s after NOT operator; comment found';
+            $data  = 
+                $this->spacing,
+                $pluralizeSpace,
+            ;
             $phpcsFile->addError($error, $stackPtr, 'CommentFound', $data);
             return;
         }
@@ -101,9 +108,10 @@
             return;
         }
 
-        $error = 'Expected %s space(s) after NOT operator; %s found';
+        $error = 'Expected %s space%s after NOT operator; %s found';
         $data  = 
             $this->spacing,
+            $pluralizeSpace,
             $found,
         ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Formatting/SpaceBeforeCastSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Functions;
@@ -20,7 +20,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -156,10 +156,13 @@
                 }//end if
 
                 if ($tokens($nextSeparator + 1)'code' !== T_WHITESPACE) {
-                    $error = 'No space found after comma in argument list';
-                    $fix   = $phpcsFile->addFixableError($error, $nextSeparator, 'NoSpaceAfterComma');
-                    if ($fix === true) {
-                        $phpcsFile->fixer->addContent($nextSeparator, ' ');
+                    // Ignore trailing comma's after last argument as that's outside the scope of this sniff.
+                    if (($nextSeparator + 1) !== $closeBracket) {
+                        $error = 'No space found after comma in argument list';
+                        $fix   = $phpcsFile->addFixableError($error, $nextSeparator, 'NoSpaceAfterComma');
+                        if ($fix === true) {
+                            $phpcsFile->fixer->addContent($nextSeparator, ' ');
+                        }
                     }
                 } else {
                     // If there is a newline in the space, then they must be formatting

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Functions;
@@ -34,7 +34,7 @@
     /**
      * Registers the tokens that this sniff wants to listen for.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -170,15 +170,13 @@
         $ignore = T_WHITESPACE;
         $next     = $phpcsFile->findNext($ignore, ($openingBrace + 1), null, true);
         if ($tokens$next'line' === $tokens$openingBrace'line') {
-            if ($next === $tokens$stackPtr'scope_closer') {
-                // Ignore empty functions.
-                return;
-            }
-
-            $error = 'Opening brace must be the last content on the line';
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($openingBrace);
+            // Only throw this error when this is not an empty function.
+            if ($next !== $tokens$stackPtr'scope_closer') {
+                $error = 'Opening brace must be the last content on the line';
+                $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
+                if ($fix === true) {
+                    $phpcsFile->fixer->addNewline($openingBrace);
+                }
             }
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\Functions;
@@ -34,7 +34,7 @@
     /**
      * Registers the tokens that this sniff wants to listen for.
      *
-     * @return void
+     * @return array<int|string>
      */
     public function register()
     {
@@ -130,17 +130,15 @@
         $ignore = T_WHITESPACE;
         $next     = $phpcsFile->findNext($ignore, ($openingBrace + 1), null, true);
         if ($tokens$next'line' === $tokens$openingBrace'line') {
-            if ($next === $tokens$stackPtr'scope_closer'
-                || $tokens$next'code' === T_CLOSE_TAG
+            // Only throw this error when this is not an empty function.
+            if ($next !== $tokens$stackPtr'scope_closer'
+                && $tokens$next'code' !== T_CLOSE_TAG
             ) {
-                // Ignore empty functions.
-                return;
-            }
-
-            $error = 'Opening brace must be the last content on the line';
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($openingBrace);
+                $error = 'Opening brace must be the last content on the line';
+                $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
+                if ($fix === true) {
+                    $phpcsFile->fixer->addNewline($openingBrace);
+                }
             }
         }
 
@@ -168,7 +166,7 @@
         if ($length !== 1) {
             $error = 'Expected 1 space before opening brace; found %s';
             $data  = $length;
-            $fix   = $phpcsFile->addFixableError($error, $closeBracket, 'SpaceBeforeBrace', $data);
+            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'SpaceBeforeBrace', $data);
             if ($fix === true) {
                 if ($length === 0 || $length === '\t') {
                     $phpcsFile->fixer->addContentBefore($openingBrace, ' ');

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/NamingConventions/AbstractClassNamePrefixSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/NamingConventions/InterfaceNameSuffixSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DiscourageGotoSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\PHP;
@@ -37,17 +37,46 @@
         T_NULL  => T_NULL,
     ;
 
+    /**
+     * Token types which can be encountered in a property type declaration.
+     *
+     * @var array<int|string, int|string>
+     */
+    private $propertyTypeTokens = 
+        T_CALLABLE             => T_CALLABLE,
+        T_SELF                 => T_SELF,
+        T_PARENT               => T_PARENT,
+        T_FALSE                => T_FALSE,
+        T_TRUE                 => T_TRUE,
+        T_NULL                 => T_NULL,
+        T_STRING               => T_STRING,
+        T_NAME_QUALIFIED       => T_NAME_QUALIFIED,
+        T_NAME_FULLY_QUALIFIED => T_NAME_FULLY_QUALIFIED,
+        T_NAME_RELATIVE        => T_NAME_RELATIVE,
+        T_NS_SEPARATOR         => T_NS_SEPARATOR,
+        T_NAMESPACE            => T_NAMESPACE,
+        T_TYPE_UNION           => T_TYPE_UNION,
+        T_TYPE_INTERSECTION    => T_TYPE_INTERSECTION,
+        T_NULLABLE             => T_NULLABLE,
+    ;
+
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
         $targets = $this->targets;
 
-        // Register function keywords to filter out type declarations.
+        // Register scope modifiers to filter out property type declarations.
+        $targets  += Tokens::$scopeModifiers;
+        $targets = T_VAR;
+        $targets = T_STATIC;
+        $targets = T_READONLY;
+
+        // Register function keywords to filter out param/return type declarations.
         $targets = T_FUNCTION;
         $targets = T_CLOSURE;
         $targets = T_FN;
@@ -64,12 +93,43 @@
      * @param int                         $stackPtr  The position of the current token in the
      *                                               stack passed in $tokens.
      *
-     * @return void
+     * @return void|int Optionally returns a stack pointer. The sniff will not be
+     *                  called again on the current file until the returned stack
+     *                  pointer is reached.
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
+        /*
+         * Skip over type declarations for properties.
+         *
+         * Note: for other uses of the visibility modifiers (functions, constants, trait use),
+         * nothing relevant will be skipped as the next non-empty token will be an "non-skippable"
+         * one.
+         * Functions are handled separately below (and then skip to their scope opener), so
+         * this should also not cause any confusion for constructor property promotion.
+         *
+         * For other uses of the "static" keyword, it also shouldn't be problematic as the only
+         * time the next non-empty token will be a "skippable" token will be in return type
+         * declarations, in which case, it is correct to skip over them.
+         */
+
+        if (isset(Tokens::$scopeModifiers$tokens$stackPtr'code') === true
+            || $tokens$stackPtr'code' === T_VAR
+            || $tokens$stackPtr'code' === T_STATIC
+            || $tokens$stackPtr'code' === T_READONLY
+        ) {
+            $skipOver = (Tokens::$emptyTokens + $this->propertyTypeTokens);
+            $skipTo   = $phpcsFile->findNext($skipOver, ($stackPtr + 1), null, true);
+            if ($skipTo !== false) {
+                return $skipTo;
+            }
+
+            // If we're at the end of the file, just return.
+            return;
+        }
+
         // Handle function declarations separately as they may contain the keywords in type declarations.
         if ($tokens$stackPtr'code' === T_FUNCTION
             || $tokens$stackPtr'code' === T_CLOSURE
@@ -79,9 +139,15 @@
                 return;
             }
 
+            // Make sure to skip over return type declarations.
             $end = $tokens$stackPtr'parenthesis_closer';
             if (isset($tokens$stackPtr'scope_opener') === true) {
                 $end = $tokens$stackPtr'scope_opener';
+            } else {
+                $skipTo = $phpcsFile->findNext(T_SEMICOLON, T_OPEN_CURLY_BRACKET, ($end + 1), null, false, null, true);
+                if ($skipTo !== false) {
+                    $end = $skipTo;
+                }
             }
 
             // Do a quick check if any of the targets exist in the declaration.
@@ -114,21 +180,6 @@
             return $end;
         }//end if
 
-        // Handle property declarations separately as they may contain the keywords in type declarations.
-        if (isset($tokens$stackPtr'conditions') === true) {
-            $conditions    = $tokens$stackPtr'conditions';
-            $lastCondition = end($conditions);
-            if (isset(Tokens::$ooScopeTokens$lastCondition) === true) {
-                // This can only be an OO constant or property declaration as methods are handled above.
-                $equals = $phpcsFile->findPrevious(T_EQUAL, ($stackPtr - 1), null, false, null, true);
-                if ($equals !== false) {
-                    $this->processConstant($phpcsFile, $stackPtr);
-                }
-
-                return;
-            }
-        }
-
         // Handle everything else.
         $this->processConstant($phpcsFile, $stackPtr);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\PHP;
@@ -37,6 +37,7 @@
         'mixed'    => true,
         'static'   => true,
         'false'    => true,
+        'true'     => true,
         'null'     => true,
         'never'    => true,
     ;
@@ -45,15 +46,15 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
         $tokens   = Tokens::$castTokens;
+        $tokens  += Tokens::$ooScopeTokens;
         $tokens = T_FUNCTION;
         $tokens = T_CLOSURE;
         $tokens = T_FN;
-        $tokens = T_VARIABLE;
         return $tokens;
 
     }//end register()
@@ -89,35 +90,66 @@
          * Check property types.
          */
 
-        if ($tokens$stackPtr'code' === T_VARIABLE) {
-            try {
-                $props = $phpcsFile->getMemberProperties($stackPtr);
-            } catch (RuntimeException $e) {
-                // Not an OO property.
+        if (isset(Tokens::$ooScopeTokens$tokens$stackPtr'code') === true) {
+            if (isset($tokens$stackPtr'scope_opener', $tokens$stackPtr'scope_closer') === false) {
                 return;
             }
 
-            // Strip off potential nullable indication.
-            $type = ltrim($props'type', '?');
+            for ($i = ($tokens$stackPtr'scope_opener' + 1); $i < $tokens$stackPtr'scope_closer'; $i++) {
+                // Skip over potentially large docblocks.
+                if ($tokens$i'code' === \T_DOC_COMMENT_OPEN_TAG
+                    && isset($tokens$i'comment_closer') === true
+                ) {
+                    $i = $tokens$i'comment_closer';
+                    continue;
+                }
 
-            if ($type !== '') {
-                $error     = 'PHP property type declarations must be lowercase; expected "%s" but found "%s"';
-                $errorCode = 'PropertyTypeFound';
+                // Skip over function declarations and everything nested within.
+                if ($tokens$i'code' === \T_FUNCTION
+                    && isset($tokens$i'scope_closer') === true
+                ) {
+                    $i = $tokens$i'scope_closer';
+                    continue;
+                }
 
-                if ($props'type_token' === T_TYPE_INTERSECTION) {
-                    // Intersection types don't support simple types.
-                } else if (strpos($type, '|') !== false) {
-                    $this->processUnionType(
-                        $phpcsFile,
-                        $props'type_token',
-                        $props'type_end_token',
-                        $error,
-                        $errorCode
-                    );
-                } else if (isset($this->phpTypesstrtolower($type)) === true) {
-                    $this->processType($phpcsFile, $props'type_token', $type, $error, $errorCode);
+                if ($tokens$i'code' !== \T_VARIABLE) {
+                    continue;
                 }
-            }
+
+                try {
+                    $props = $phpcsFile->getMemberProperties($i);
+                } catch (RuntimeException $e) {
+                    // Not an OO property.
+                    continue;
+                }
+
+                if (empty($props) === true) {
+                    // Parse error - property in interface or enum. Ignore.
+                    return;
+                }
+
+                // Strip off potential nullable indication.
+                $type = ltrim($props'type', '?');
+
+                if ($type !== '') {
+                    $error     = 'PHP property type declarations must be lowercase; expected "%s" but found "%s"';
+                    $errorCode = 'PropertyTypeFound';
+
+                    if ($props'type_token' === T_TYPE_INTERSECTION) {
+                        // Intersection types don't support simple types.
+                    } else if (strpos($type, '|') !== false) {
+                        $this->processUnionType(
+                            $phpcsFile,
+                            $props'type_token',
+                            $props'type_end_token',
+                            $error,
+                            $errorCode
+                        );
+                    } else if (isset($this->phpTypesstrtolower($type)) === true) {
+                        $this->processType($phpcsFile, $props'type_token', $type, $error, $errorCode);
+                    }
+                }
+            }//end for
 
             return;
         }//end if

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/RequireStrictTypesSniff.php Changed

@@ -4,13 +4,14 @@
  *
  * @author    Sertan Danis <sdanis@squiz.net>
  * @copyright 2006-2019 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\PHP;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
 
 class RequireStrictTypesSniff implements Sniff
 {
@@ -19,7 +20,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -40,23 +41,61 @@
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens  = $phpcsFile->getTokens();
-        $declare = $phpcsFile->findNext(T_DECLARE, $stackPtr);
-        $found   = false;
+        $declare = $phpcsFile->findNext(T_DECLARE, ($stackPtr + 1));
+
+        $found = false;
 
         if ($declare !== false) {
-            $nextString = $phpcsFile->findNext(T_STRING, $declare);
+            if (isset($tokens$declare'parenthesis_opener', $tokens$declare'parenthesis_closer') === false) {
+                // Live coding, ignore for now.
+                return $phpcsFile->numTokens;
+            }
+
+            $next = $tokens$declare'parenthesis_opener';
+
+            do {
+                $next = $phpcsFile->findNext(
+                    Tokens::$emptyTokens,
+                    ($next + 1),
+                    $tokens$declare'parenthesis_closer',
+                    true
+                );
 
-            if ($nextString !== false) {
-                if (strtolower($tokens$nextString'content') === 'strict_types') {
+                if ($next !== false
+                    && $tokens$next'code' === T_STRING
+                    && strtolower($tokens$next'content') === 'strict_types'
+                ) {
                     // There is a strict types declaration.
                     $found = true;
+                    break;
                 }
-            }
-        }
+
+                $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $tokens$declare'parenthesis_closer');
+            } while ($next !== false && $next < $tokens$declare'parenthesis_closer');
+        }//end if
 
         if ($found === false) {
             $error = 'Missing required strict_types declaration';
             $phpcsFile->addError($error, $stackPtr, 'MissingDeclaration');
+
+            return $phpcsFile->numTokens;
+        }
+
+        // Strict types declaration found, make sure strict types is enabled.
+        $skip     = Tokens::$emptyTokens;
+        $skip   = T_EQUAL;
+        $valuePtr = $phpcsFile->findNext($skip, ($next + 1), null, true);
+
+        if ($valuePtr !== false
+            && $tokens$valuePtr'code' === T_LNUMBER
+            && $tokens$valuePtr'content' === '0'
+        ) {
+            $error = 'Required strict_types declaration found, but strict types is disabled. Set the value to 1 to enable';
+            $fix   = $phpcsFile->addFixableWarning($error, $valuePtr, 'Disabled');
+
+            if ($fix === true) {
+                $phpcsFile->fixer->replaceToken($valuePtr, '1');
+            }
         }
 
         // Skip the rest of the file so we don't pick up additional

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/SyntaxSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/VersionControl/GitMergeConflictSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Jack Bates <ms419@freezone.co.uk>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\VersionControl;
@@ -34,7 +34,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -50,7 +50,7 @@
      * @param int                         $stackPtr  The position of the current token
      *                                               in the stack passed in $tokens.
      *
-     * @return void
+     * @return int
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -113,7 +113,7 @@
      *
      * @param string $path The path to return Subversion properties on.
      *
-     * @return array
+     * @return array|null
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If Subversion properties file could
      *                                                      not be opened.
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/ArbitraryParenthesesSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/IncrementDecrementSpacingSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2018 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace;
@@ -30,7 +30,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -63,7 +63,8 @@
         // Is this a pre-increment/decrement ?
         $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($nextNonEmpty !== false
-            && (($phpcsFile->tokenizerType === 'PHP' && $tokens$nextNonEmpty'code' === T_VARIABLE)
+            && (($phpcsFile->tokenizerType === 'PHP'
+            && ($tokens$nextNonEmpty'code' === T_VARIABLE || $tokens$nextNonEmpty'code' === T_STRING))
             || ($phpcsFile->tokenizerType === 'JS' && $tokens$nextNonEmpty'code' === T_STRING))
         ) {
             if ($nextNonEmpty === ($stackPtr + 1)) {
@@ -116,7 +117,10 @@
         // Is this a post-increment/decrement ?
         $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
         if ($prevNonEmpty !== false
-            && (($phpcsFile->tokenizerType === 'PHP' && $tokens$prevNonEmpty'code' === T_VARIABLE)
+            && (($phpcsFile->tokenizerType === 'PHP'
+            && ($tokens$prevNonEmpty'code' === T_VARIABLE
+            || $tokens$prevNonEmpty'code' === T_STRING
+            || $tokens$prevNonEmpty'code' === T_CLOSE_SQUARE_BRACKET))
             || ($phpcsFile->tokenizerType === 'JS' && $tokens$prevNonEmpty'code' === T_STRING))
         ) {
             if ($prevNonEmpty === ($stackPtr - 1)) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace;
@@ -80,7 +80,7 @@
      * This is a cached copy of the public version of this var, which
      * can be set in a ruleset file, and some core ignored tokens.
      *
-     * @var int
+     * @var array<int|string, bool>
      */
     private $ignoreIndentation = ;
 
@@ -102,7 +102,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -1090,8 +1090,11 @@
             if ($tokens$i'code' === T_CONSTANT_ENCAPSED_STRING
                 || $tokens$i'code' === T_DOUBLE_QUOTED_STRING
             ) {
-                $i = $phpcsFile->findNext($tokens$i'code', ($i + 1), null, true);
-                $i--;
+                $nextNonTextString = $phpcsFile->findNext($tokens$i'code', ($i + 1), null, true);
+                if ($nextNonTextString !== false) {
+                    $i = ($nextNonTextString - 1);
+                }
+
                 continue;
             }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace;
@@ -34,7 +34,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -54,8 +54,12 @@
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens        = $phpcsFile->getTokens();
-        $this->spacing = (int) $this->spacing;
+        $tokens         = $phpcsFile->getTokens();
+        $this->spacing  = (int) $this->spacing;
+        $pluralizeSpace = 's';
+        if ($this->spacing === 1) {
+            $pluralizeSpace = '';
+        }
 
         $nextNonEmpty = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($nextNonEmpty === false) {
@@ -81,8 +85,11 @@
 
         $nextNonWhitespace = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
         if ($nextNonEmpty !== $nextNonWhitespace) {
-            $error = 'Expected %s space(s) after the spread operator; comment found';
-            $data  = $this->spacing;
+            $error = 'Expected %s space%s after the spread operator; comment found';
+            $data  = 
+                $this->spacing,
+                $pluralizeSpace,
+            ;
             $phpcsFile->addError($error, $stackPtr, 'CommentFound', $data);
 
             if ($tokens($stackPtr + 1)'code' === T_WHITESPACE) {
@@ -107,9 +114,10 @@
             return;
         }
 
-        $error = 'Expected %s space(s) after the spread operator; %s found';
+        $error = 'Expected %s space%s after the spread operator; %s found';
         $data  = 
             $this->spacing,
+            $pluralizeSpace,
             $found,
         ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowLongArraySyntaxUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/DisallowShortArraySyntaxUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Classes;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the DuplicateClassName sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Classes\DuplicateClassNameSniff
+ */
 class DuplicateClassNameUnitTest extends AbstractSniffUnitTest
 {
 
@@ -50,7 +55,7 @@
                 12 => 1,
                 13 => 1,
             ;
-            break;
+
         case 'DuplicateClassNameUnitTest.2.inc':
             return 
                 2 => 1,
@@ -58,19 +63,18 @@
                 4 => 1,
                 5 => 1,
             ;
-            break;
+
         case 'DuplicateClassNameUnitTest.5.inc':
             return 
                 3 => 1,
                 7 => 1,
             ;
-            break;
+
         case 'DuplicateClassNameUnitTest.6.inc':
             return 10 => 1;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Classes/OpeningBraceSameLineUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Classes;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the OpeningBraceSameLine sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Classes\OpeningBraceSameLineSniff
+ */
 class OpeningBraceSameLineUnitTest extends AbstractSniffUnitTest
 {
 
@@ -27,18 +32,19 @@
     {
 
         return 
-            19 => 2,
-            23 => 1,
-            28 => 2,
-            34 => 1,
-            38 => 1,
-            41 => 1,
-            44 => 1,
-            47 => 1,
-            70 => 1,
-            79 => 1,
-            90 => 1,
-            94 => 1,
+            19  => 2,
+            23  => 1,
+            28  => 2,
+            34  => 1,
+            38  => 1,
+            41  => 1,
+            44  => 1,
+            47  => 1,
+            70  => 1,
+            79  => 1,
+            90  => 1,
+            94  => 1,
+            100 => 1,
         ;
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.5.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.6.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/AssignmentInConditionUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2017 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\CodeAnalysis;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the AssignmentInCondition sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\AssignmentInConditionSniff
+ */
 class AssignmentInConditionUnitTest extends AbstractSniffUnitTest
 {
 
@@ -36,46 +41,54 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return 
-            46 => 1,
-            47 => 1,
-            48 => 1,
-            49 => 1,
-            50 => 1,
-            51 => 1,
-            52 => 1,
-            53 => 1,
-            54 => 1,
-            55 => 1,
-            56 => 1,
-            57 => 1,
-            58 => 1,
-            59 => 1,
-            60 => 1,
-            61 => 2,
-            63 => 1,
-            64 => 1,
-            67 => 1,
-            68 => 1,
-            69 => 1,
-            70 => 1,
-            71 => 1,
-            72 => 1,
-            73 => 1,
-            75 => 1,
-            77 => 1,
-            80 => 2,
-            84 => 1,
-            85 => 2,
-            88 => 1,
-            90 => 1,
-            92 => 1,
-            95 => 1,
-        ;
+        switch ($testFile) {
+        case 'AssignmentInConditionUnitTest.1.inc':
+            return 
+                46 => 1,
+                47 => 1,
+                48 => 1,
+                49 => 1,
+                50 => 1,
+                51 => 1,
+                52 => 1,
+                53 => 1,
+                54 => 1,
+                55 => 1,
+                56 => 1,
+                57 => 1,
+                58 => 1,
+                59 => 1,
+                60 => 1,
+                61 => 2,
+                63 => 1,
+                64 => 1,
+                67 => 1,
+                68 => 1,
+                69 => 1,
+                70 => 1,
+                71 => 1,
+                72 => 1,
+                73 => 1,
+                75 => 1,
+                77 => 1,
+                80 => 2,
+                84 => 1,
+                85 => 2,
+                88 => 1,
+                90 => 1,
+                92 => 1,
+                95 => 1,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/EmptyStatementUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.1.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.inc Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopShouldBeWhileLoopUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Manuel Pichler <mapi@manuel-pichler.de>
  * @copyright 2007-2014 Manuel Pichler. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\CodeAnalysis;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ForLoopShouldBeWhileLoop sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\ForLoopShouldBeWhileLoopSniff
+ */
 class ForLoopShouldBeWhileLoopUnitTest extends AbstractSniffUnitTest
 {
 
@@ -36,14 +41,22 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the test file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return 
-            6  => 1,
-            10 => 1,
-        ;
+        switch ($testFile) {
+        case 'ForLoopShouldBeWhileLoopUnitTest.1.inc':
+            return 
+                6  => 1,
+                10 => 1,
+                34 => 1,
+            ;
+        default:
+            return ;
+        }
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/ForLoopWithTestFunctionCallUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/JumbledIncrementerUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.inc Changed

@@ -44,13 +44,13 @@
     $x = $parameter; // This line must be immediately after the HERE; with no intervening blank lines.
     $tango = <<<HERE
 1 Must be a HEREdoc
-2 
-3 
-4 
-5   
+2
+3
+4
+5
 6
 7
-8 
+8
 9 at least 9 lines long
 HERE;
 }
@@ -152,3 +152,100 @@
 }
 
 $found = in_array_cb($needle, $haystack, fn($array, $needle) => $array2 === $needle);
+
+
+/*
+ * Don't adjust the error code for closures and arrow functions in extended classes/classes implementing interfaces.
+ */
+class MyExtendedClass extends SomeClass {
+    public function something($a, $b) {
+        $c = $a + $b;
+        $closure = function ($c, $d) {
+            return $c * 2;
+        };
+    }
+}
+
+class MyExtendedClass implements SomeInterface {
+    public function something($a, $b) {
+        $c = $a + $b;
+        $fn = fn($c, $d) => $c2;
+    }
+}
+
+
+/**
+ * Magic methods must match the function signature dictated by PHP.
+ * Flagging unused parameters leads to notices which cannot be solved.
+ */
+class MagicMethodsWithParams {
+    public function __set(string $name, mixed $value) {
+        // Forbid dynamic properties & overloading inaccessible properties.
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __get(string $name) {
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __isset(string $name) {
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __unset(string $name) {
+        throw new RuntimeException('Forbidden');
+    }
+
+    public function __unserialize( array $data ) {
+        // Prevent unserializing from a stored representation of the object for security reasons.
+        $this->instance = new self();
+    }
+
+    public static function __set_state(array $properties) {
+        return new self();
+    }
+
+    public function __call(string $name, array $arguments) {
+        if (method_exists($this, $name)) {
+            // None of the methods which can be called in this class take arguments, so not passing them.
+            return $this->$name();
+        }
+    }
+
+    public static function __callStatic(string $name, array $arguments) {
+        if (method_exists($this, $name)) {
+            // None of the methods which can be called in this class take arguments, so not passing them.
+            return self::$name();
+        }
+    }
+}
+
+/**
+ * Unused parameters in magic methods which have flexible function signatures should still be flagged.
+ */
+class MagicMethodsWithParamsNotDictatedByPHP {
+    public $foo;
+    public function __construct($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+
+    public function __invoke($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+}
+
+/**
+ * Unused parameters in magic methods which have flexible function signatures
+ * where the method potentially overloads a parent method should still be flagged,
+ * but should use the `FoundInExtendedClassAfterLastUsed` error code.
+ */
+class MagicMethodsWithParamsNotDictatedByPHPInChildClass extends SomeParent{
+    public $foo;
+    public function __construct($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+
+    public function __invoke($foo, $bar, $baz) {
+        $this->foo = $foo;
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UnusedFunctionParameterUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/CodeAnalysis/UselessOverridingMethodUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.inc Changed

@@ -144,7 +144,7 @@
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @author    Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -232,7 +232,7 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author	  Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link	  http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -245,8 +245,18 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author	Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  	https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license	  	https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link		http://pear.php.net/package/PHP_CodeSniffer
  */
 
+/**
+ * Do something.
+ *
+ * @codeCoverageIgnore
+ *
+ * @phpcs:disable Stnd.Cat.SniffName
+ *
+ * @return void
+ */
+
 /** No docblock close tag. Must be last test without new line.
\ No newline at end of file

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.inc.fixed Changed

@@ -139,7 +139,7 @@
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @author    Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -237,7 +237,7 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author	  Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link	  http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -250,8 +250,18 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author    Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
+/**
+ * Do something.
+ *
+ * @codeCoverageIgnore
+ *
+ * @phpcs:disable Stnd.Cat.SniffName
+ *
+ * @return void
+ */
+
 /** No docblock close tag. Must be last test without new line.
\ No newline at end of file

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.js Changed

@@ -144,7 +144,7 @@
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @author    Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -232,7 +232,7 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author	  Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link	  http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -245,6 +245,6 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author	Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  	https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license	  	https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link		http://pear.php.net/package/PHP_CodeSniffer
  */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.js.fixed Changed

@@ -139,7 +139,7 @@
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @author    Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -237,7 +237,7 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author	  Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license	  https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license	  https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link	  http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -250,6 +250,6 @@
  * @author	  Greg Sherwood <gsherwood@squiz.net>
  * @author    Marc McIntyre <mmcintyre@squiz.net>
  * @copyright 2006-2012 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/DocCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/FixmeUnitTest.php Changed

@@ -5,13 +5,18 @@
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @author    Sam Graham <php-codesniffer@illusori.co.uk>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the Fixme sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Commenting\FixmeSniff
+ */
 class FixmeUnitTest extends AbstractSniffUnitTest
 {
 
@@ -22,11 +27,9 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
-     * @param string $testFile The name of the file being tested.
-     *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='FixmeUnitTest.inc')
+    public function getErrorList()
     {
         return 
             3  => 1,
@@ -48,11 +51,9 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
-     * @param string $testFile The name of the file being tested.
-     *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='FixmeUnitTest.inc')
+    public function getWarningList()
     {
         return ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Commenting/TodoUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the Todo sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Commenting\TodoSniff
+ */
 class TodoUnitTest extends AbstractSniffUnitTest
 {
 
@@ -21,11 +26,9 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
-     * @param string $testFile The name of the file being tested.
-     *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='TodoUnitTest.inc')
+    public function getErrorList()
     {
         return ;
 
@@ -38,11 +41,9 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
-     * @param string $testFile The name of the file being tested.
-     *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='TodoUnitTest.inc')
+    public function getWarningList()
     {
         return 
             3  => 1,

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\ControlStructures;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the InlineControlStructure sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\ControlStructures\InlineControlStructureSniff
+ */
 class InlineControlStructureUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='InlineControlStructureUnitTest.1.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'InlineControlStructureUnitTest.1.inc':

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Debug/CSSLintUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Debug/ClosureLinterUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Debug/ESLintUnitTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Debug;
@@ -12,6 +12,11 @@
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 use PHP_CodeSniffer\Config;
 
+/**
+ * Unit test class for the ESLint sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Debug\ESLintSniff
+ */
 class ESLintUnitTest extends AbstractSniffUnitTest
 {
 
@@ -36,37 +41,39 @@
     /**
      * Sets up this unit test.
      *
+     * @before
+     *
      * @return void
      */
-    protected function setUp()
+    protected function setUpPrerequisites()
     {
-        parent::setUp();
+        parent::setUpPrerequisites();
 
         $cwd = getcwd();
         file_put_contents($cwd.'/.eslintrc.json', self::ESLINT_CONFIG);
 
-    }//end setUp()
+    }//end setUpPrerequisites()
 
 
     /**
      * Remove artifact.
      *
+     * @after
+     *
      * @return void
      */
-    protected function tearDown()
+    protected function resetProperties()
     {
-        parent::tearDown();
-
         $cwd = getcwd();
         unlink($cwd.'/.eslintrc.json');
 
-    }//end tearDown()
+    }//end resetProperties()
 
 
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return bool
      */
     protected function shouldSkipTest()
     {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Debug/JSHintUnitTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Debug;
@@ -12,6 +12,11 @@
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 use PHP_CodeSniffer\Config;
 
+/**
+ * Unit test class for the JSHint sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Debug\JSHintSniff
+ */
 class JSHintUnitTest extends AbstractSniffUnitTest
 {
 
@@ -19,13 +24,13 @@
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return bool
      */
     protected function shouldSkipTest()
     {
         $rhinoPath  = Config::getExecutablePath('rhino');
         $jshintPath = Config::getExecutablePath('jshint');
-        if ($rhinoPath === null && $jshintPath === null) {
+        if ($jshintPath === null) {
             return true;
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ByteOrderMarkUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNewlineUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/EndFileNoNewlineUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Matthew Peveler <matt.peveler@gmail.com>
  * @copyright 2019 Matthew Peveler
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Files;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ExecutableFile sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Files\ExecutableFileSniff
+ */
 class ExecutableFileUnitTest extends AbstractSniffUnitTest
 {
 
@@ -18,14 +23,12 @@
     /**
      * Should this test be skipped for some reason.
      *
-     * @return void
+     * @return bool
      */
     protected function shouldSkipTest()
     {
-        // PEAR doesn't preserve the executable flag, so skip
-        // tests when running in a PEAR install.
-        // Also skip on Windows which doesn't have the concept of executable files.
-        return ($GLOBALS'PHP_CODESNIFFER_PEAR' || stripos(PHP_OS, 'WIN') === 0);
+        // Skip on Windows which doesn't have the concept of executable files.
+        return (stripos(PHP_OS, 'WIN') === 0);
 
     }//end shouldSkipTest()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/InlineHTMLUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Files;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the InlineHTML sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Files\InlineHTMLSniff
+ */
 class InlineHTMLUnitTest extends AbstractSniffUnitTest
 {
 
@@ -30,16 +35,15 @@
         switch ($testFile) {
         case 'InlineHTMLUnitTest.3.inc':
             return 4 => 1;
-            break;
+
         case 'InlineHTMLUnitTest.4.inc':
             return 1 => 1;
-            break;
+
         case 'InlineHTMLUnitTest.7.inc':
             return 1 => 1;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/LineEndingsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/LineLengthUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Files;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the LineLength sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff
+ */
 class LineLengthUnitTest extends AbstractSniffUnitTest
 {
 
@@ -50,14 +55,13 @@
                 45 => 1,
                 82 => 1,
             ;
-            break;
+
         case 'LineLengthUnitTest.2.inc':
         case 'LineLengthUnitTest.3.inc':
             return 7 => 1;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()
@@ -89,20 +93,19 @@
                 75 => 1,
                 84 => 1,
             ;
-            break;
+
         case 'LineLengthUnitTest.2.inc':
         case 'LineLengthUnitTest.3.inc':
             return 6 => 1;
-            break;
+
         case 'LineLengthUnitTest.4.inc':
             return 
                 10 => 1,
                 14 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/LowercasedFilenameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/OneClassPerFileUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/OneInterfacePerFileUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/OneObjectStructurePerFileUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Formatting/DisallowMultipleStatementsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Formatting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the MultipleStatementAlignment sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\MultipleStatementAlignmentSniff
+ */
 class MultipleStatementAlignmentUnitTest extends AbstractSniffUnitTest
 {
 
@@ -40,7 +45,7 @@
      *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='MultipleStatementAlignmentUnitTest.inc')
+    public function getWarningList($testFile='')
     {
         switch ($testFile) {
         case 'MultipleStatementAlignmentUnitTest.inc':
@@ -122,7 +127,7 @@
                 499 => 1,
                 500 => 1,
             ;
-        break;
+
         case 'MultipleStatementAlignmentUnitTest.js':
             return 
                 11  => 1,
@@ -154,10 +159,9 @@
                 114 => 1,
                 117 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Formatting/NoSpaceAfterCastUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Formatting/SpaceAfterCastUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Formatting/SpaceAfterNotUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Formatting/SpaceBeforeCastUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/CallTimePassByReferenceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceBsdAllmanUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Metrics/CyclomaticComplexityUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Metrics/NestingLevelUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/NamingConventions/AbstractClassNamePrefixUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/NamingConventions/CamelCapsFunctionNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/NamingConventions/ConstructorNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/NamingConventions/InterfaceNameSuffixUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/BacktickOperatorUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the BacktickOperator sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\BacktickOperatorSniff
+ */
 class BacktickOperatorUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,10 @@
      */
     public function getErrorList()
     {
-        return 2 => 2;
+        return 
+            2 => 2,
+            9 => 2,
+        ;
 
     }//end getErrorList()
 
@@ -40,6 +48,7 @@
      */
     public function getWarningList()
     {
+        // Warning about incorrect annotation will be shown on line 1 once PR #3915 would be merged.
         return ;
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/CharacterBeforePHPOpeningTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/ClosingPHPTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/DeprecatedFunctionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/DisallowRequestSuperglobalUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/DiscourageGotoUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/ForbiddenFunctionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.inc Changed

@@ -98,3 +98,52 @@
 }
 
 $cl = function (int|FALSE $param = NULL, Type|NULL $obj = new MyObj(FALSE)) : string|FALSE|NULL {};
+
+// Adding some extra tests to safeguard that function declarations which don't create scope are handled correctly.
+interface InterfaceMethodsWithReturnTypeNoScopeOpener {
+    private function typed($param = TRUE) : string|FALSE|NULL;
+}
+
+abstract class ClassMethodsWithReturnTypeNoScopeOpener {
+    abstract public function typed($param = FALSE) : TRUE;
+}
+
+// Additional tests to safeguard improved property type skip logic.
+readonly class Properties {
+    use SomeTrait {
+        sayHello as private myPrivateHello;
+    }
+
+    public Type|FALSE|NULL $propertyA = array(
+        'itemA' => TRUE,
+        'itemB' => FALSE,
+        'itemC' => NULL,
+    ), $propertyB = FALSE;
+
+    protected \FullyQualified&Partially\Qualified&namespace\Relative $propertyC;
+    var ?TRUE $propertyD;
+    static array|callable|FALSE|self|parent $propertyE = TRUE;
+    private
+        // phpcs:ignore Stnd.Cat.Sniff -- for reasons.
+        TRUE      /*comment*/
+        $propertyF = TRUE;
+
+    public function __construct(
+        public FALSE|NULL $promotedPropA,
+        readonly callable|TRUE $promotedPropB,
+    ) {
+        static $var;
+        echo static::class;
+        static::foo();
+        $var = $var instanceof static;
+        $obj = new static();
+    }
+
+    public static function foo(): static|self|FALSE {
+        $callable = static function() {};
+    }
+}
+
+// Last coding/parse error.
+// This has to be the last test in the file.
+function UnclosedCurly (): FALSE {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.inc.fixed Changed

@@ -98,3 +98,52 @@
 }
 
 $cl = function (int|FALSE $param = null, Type|NULL $obj = new MyObj(false)) : string|FALSE|NULL {};
+
+// Adding some extra tests to safeguard that function declarations which don't create scope are handled correctly.
+interface InterfaceMethodsWithReturnTypeNoScopeOpener {
+    private function typed($param = true) : string|FALSE|NULL;
+}
+
+abstract class ClassMethodsWithReturnTypeNoScopeOpener {
+    abstract public function typed($param = false) : TRUE;
+}
+
+// Additional tests to safeguard improved property type skip logic.
+readonly class Properties {
+    use SomeTrait {
+        sayHello as private myPrivateHello;
+    }
+
+    public Type|FALSE|NULL $propertyA = array(
+        'itemA' => true,
+        'itemB' => false,
+        'itemC' => null,
+    ), $propertyB = false;
+
+    protected \FullyQualified&Partially\Qualified&namespace\Relative $propertyC;
+    var ?TRUE $propertyD;
+    static array|callable|FALSE|self|parent $propertyE = true;
+    private
+        // phpcs:ignore Stnd.Cat.Sniff -- for reasons.
+        TRUE      /*comment*/
+        $propertyF = true;
+
+    public function __construct(
+        public FALSE|NULL $promotedPropA,
+        readonly callable|TRUE $promotedPropB,
+    ) {
+        static $var;
+        echo static::class;
+        static::foo();
+        $var = $var instanceof static;
+        $obj = new static();
+    }
+
+    public static function foo(): static|self|FALSE {
+        $callable = static function() {};
+    }
+}
+
+// Last coding/parse error.
+// This has to be the last test in the file.
+function UnclosedCurly (): FALSE {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the LowerCaseConstant sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\LowerCaseConstantSniff
+ */
 class LowerCaseConstantUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='LowerCaseConstantUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'LowerCaseConstantUnitTest.inc':
@@ -51,8 +56,16 @@
                 94  => 2,
                 95  => 1,
                 100 => 2,
+                104 => 1,
+                108 => 1,
+                118 => 1,
+                119 => 1,
+                120 => 1,
+                121 => 1,
+                125 => 1,
+                129 => 1,
             ;
-        break;
+
         case 'LowerCaseConstantUnitTest.js':
             return 
                 2  => 1,
@@ -64,10 +77,9 @@
                 13 => 1,
                 14 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseKeywordUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the LowerCaseType sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\LowerCaseTypeSniff
+ */
 class LowerCaseTypeUnitTest extends AbstractSniffUnitTest
 {
 
@@ -67,6 +72,7 @@
             82 => 2,
             85 => 1,
             94 => 5,
+            96 => 4,
         ;
 
     }//end getErrorList()
@@ -82,7 +88,8 @@
      */
     public function getWarningList()
     {
-        return ;
+        // Warning from getMemberProperties() about parse error.
+        return 100 => 1;
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/NoSilencedErrorsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.10.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.11.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.11.inc.fixed Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.12.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.12.inc.fixed Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.13.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.14.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.14.inc.fixed Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.15.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.15.inc.fixed Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.5.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.6.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.7.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.8.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.9.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/RequireStrictTypesUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Sertan Danis <sdanis@squiz.net>
  * @copyright 2006-2019 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the RequireStrictType sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\RequireStrictTypesSniff
+ */
 class RequireStrictTypesUnitTest extends AbstractSniffUnitTest
 {
 
@@ -28,27 +33,38 @@
     public function getErrorList($testFile='')
     {
         switch ($testFile) {
-        case 'RequireStrictTypesUnitTest.1.inc':
+        case 'RequireStrictTypesUnitTest.2.inc':
+        case 'RequireStrictTypesUnitTest.5.inc':
+        case 'RequireStrictTypesUnitTest.6.inc':
+        case 'RequireStrictTypesUnitTest.10.inc':
+            return 1 => 1;
+
+        default:
             return ;
-            break;
         }
 
-        return 1 => 1;
-
     }//end getErrorList()
 
 
     /**
      * Returns the lines where warnings should occur.
      *
-     * The key of the array should represent the line number and the value
-     * should represent the number of warnings that should occur on that line.
+     * @param string $testFile The name of the file being tested.
      *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return ;
+        switch ($testFile) {
+        case 'RequireStrictTypesUnitTest.11.inc':
+        case 'RequireStrictTypesUnitTest.12.inc':
+        case 'RequireStrictTypesUnitTest.14.inc':
+        case 'RequireStrictTypesUnitTest.15.inc':
+            return 3 => 1;
+
+        default:
+            return ;
+        }
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/SAPIUsageUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Strings/UnnecessaryStringConcatUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\Strings;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the UnnecessaryStringConcat sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\Strings\UnnecessaryStringConcatSniff
+ */
 class UnnecessaryStringConcatUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='UnnecessaryStringConcatUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'UnnecessaryStringConcatUnitTest.inc':
@@ -37,7 +42,7 @@
                 19 => 1,
                 20 => 1,
             ;
-            break;
+
         case 'UnnecessaryStringConcatUnitTest.js':
             return 
                 1  => 1,
@@ -46,10 +51,9 @@
                 14 => 1,
                 15 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/GitMergeConflictUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/VersionControl/SubversionPropertiesUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.1.inc Added

@@ -0,0 +1,182 @@
+<?php
+
+/*
+ * Make sure the sniff does not act on structures it shouldn't act on.
+ * All parentheses have extra spacing around it to test this properly.
+ */
+$b = functioncall( $something ) ;
+$b = function( $something ) {};
+$c = myFunction( $arg1 , $arg2 = array( ) );
+
+function something( $param ) {}
+
+$d = new MyClass(  );
+$e = new class(  ) {};
+
+try {
+} catch( Exception $e ) {
+}
+
+include( PATH . 'file.php' );
+
+if ( in_array( $arg1, array( 'foo','bar' ) ) ) {}
+isset( $abc );
+unset( $abc );
+empty( $abc );
+eval( $abc );
+exit( $abc );
+clone( $_date1 <= $_date2 ? $_date1 : $_date2 );
+declare( ticks=1 );
+list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
+throw( $e );
+yield from ( function(){} );
+
+$obj->{$var}( $foo,$bar );
+
+$bar(function( $a, $b ) {
+    return function( $c, $d ) use ( $a, $b ) {
+        echo $a, $b, $c, $d;
+    };
+})( 'a','b' )( 'c','d' );
+
+$closure( $foo,$bar );
+$var = $closure() + $closure( $foo,$bar ) + self::$closure( $foo,$bar );
+
+class Test {
+    public static function baz( $foo, $bar ) {
+        $a = new self( $foo,$bar );
+        $b = new static( $foo,$bar );
+    }
+}
+
+/*
+ * Test warning for empty parentheses.
+ */
+$a = 4 + (); // Warning.
+$a = 4 + (   ); // Warning.
+$a = 4 + (/* Not empty */);
+
+/*
+ * Test the actual sniff.
+ */
+if ((null !== $extra) && ($row->extra !== $extra)) {}
+
+if (( null !== $extra ) && ( $row->extra !== $extra )) {} // Bad x 4.
+
+if ((        null !== $extra // Bad x 1.
+    && is_int($extra))
+    && ( $row->extra !== $extra // Bad x 1.
+        || $something      ) // Bad x 1.
+) {}
+
+if (( null !== $extra ) // Bad x 2.
+    && ( $row->extra !== $extra ) // Bad x 2.
+) {}
+
+$a = (null !== $extra);
+$a = ( null !== $extra ); // Bad x 2.
+
+$sx = $vert ? ($w - 1) : 0;
+
+$this->is_overloaded = ( ( ini_get("mbstring.func_overload") & 2 ) != 0 ) && function_exists('mb_substr'); // Bad x 4.
+
+$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+
+if ( $success && ('nothumb' == $target || 'all' == $target) ) {}
+
+$directory = ('/' == $file strlen($file)-1 );
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
+if ((null !== $extra) && ($row->extra !== $extra)) {} // Bad x 4.
+
+if (( null !== $extra ) && ( $row->extra !== $extra )) {}
+
+if ((        null !== $extra // Bad x 1.
+    && is_int($extra)) // Bad x 1.
+    && ( $row->extra !== $extra
+        || $something      ) // Bad x 1.
+) {}
+
+if ((null !== $extra) // Bad x 2.
+    && ($row->extra !== $extra) // Bad x 2.
+) {}
+
+$a = (null !== $extra); // Bad x 2.
+$a = ( null !== $extra );
+
+$sx = $vert ? ($w - 1) : 0; // Bad x 2.
+
+$this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr'); // Bad x 4.
+
+$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 ); // Bad x 4.
+
+if ( $success && ('nothumb' == $target || 'all' == $target) ) {} // Bad x 2.
+
+$directory = ('/' == $file strlen($file)-1 ); // Bad x 2.
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
+
+/*
+ * Test handling of ignoreNewlines.
+ */
+if (
+    (
+        null !== $extra
+    ) && (
+        $row->extra !== $extra
+    )
+) {} // Bad x 4, 1 x line 123, 2 x line 125, 1 x line 127.
+
+
+$a = (
+    null !== $extra
+); // Bad x 2, 1 x line 131, 1 x line 133.
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
+if (
+    (
+        null !== $extra
+    ) && (
+        $row->extra !== $extra
+    )
+) {} // Bad x 4, 1 x line 137, 2 x line 139, 1 x line 141.
+
+$a = (
+    null !== $extra
+); // Bad x 2, 1 x line 144, 1 x line 146.
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines true
+if (
+    (
+        null !== $extra
+    ) && (
+        $row->extra !== $extra
+    )
+) {}
+
+$a = (
+    null !== $extra
+);
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
+
+if (true) {} ( 1+2) === 3 ? $a = 1 : $a = 2;
+class A {} ( 1+2) === 3 ? $a = 1 : $a = 2;
+function foo() {} ( 1+2) === 3 ? $a = 1 : $a = 2;
+
+// Issue #3618.
+class NonArbitraryParenthesesWithKeywords {
+    public static function baz( $foo, $bar ) {
+        $a = new self();
+        $b = new parent();
+        $c = new static();
+
+        // self/static are already tested above, round line 45.
+        $d = new parent( $foo,$bar );
+    }
+}
+
+// Test that the match expression does not trigger the sniff.
+$b = match (  $a  ) {
+    1 => true,
+};

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.1.inc.fixed Added

@@ -0,0 +1,170 @@
+<?php
+
+/*
+ * Make sure the sniff does not act on structures it shouldn't act on.
+ * All parentheses have extra spacing around it to test this properly.
+ */
+$b = functioncall( $something ) ;
+$b = function( $something ) {};
+$c = myFunction( $arg1 , $arg2 = array( ) );
+
+function something( $param ) {}
+
+$d = new MyClass(  );
+$e = new class(  ) {};
+
+try {
+} catch( Exception $e ) {
+}
+
+include( PATH . 'file.php' );
+
+if ( in_array( $arg1, array( 'foo','bar' ) ) ) {}
+isset( $abc );
+unset( $abc );
+empty( $abc );
+eval( $abc );
+exit( $abc );
+clone( $_date1 <= $_date2 ? $_date1 : $_date2 );
+declare( ticks=1 );
+list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
+throw( $e );
+yield from ( function(){} );
+
+$obj->{$var}( $foo,$bar );
+
+$bar(function( $a, $b ) {
+    return function( $c, $d ) use ( $a, $b ) {
+        echo $a, $b, $c, $d;
+    };
+})( 'a','b' )( 'c','d' );
+
+$closure( $foo,$bar );
+$var = $closure() + $closure( $foo,$bar ) + self::$closure( $foo,$bar );
+
+class Test {
+    public static function baz( $foo, $bar ) {
+        $a = new self( $foo,$bar );
+        $b = new static( $foo,$bar );
+    }
+}
+
+/*
+ * Test warning for empty parentheses.
+ */
+$a = 4 + (); // Warning.
+$a = 4 + (   ); // Warning.
+$a = 4 + (/* Not empty */);
+
+/*
+ * Test the actual sniff.
+ */
+if ((null !== $extra) && ($row->extra !== $extra)) {}
+
+if ((null !== $extra) && ($row->extra !== $extra)) {} // Bad x 4.
+
+if ((null !== $extra // Bad x 1.
+    && is_int($extra))
+    && ($row->extra !== $extra // Bad x 1.
+        || $something) // Bad x 1.
+) {}
+
+if ((null !== $extra) // Bad x 2.
+    && ($row->extra !== $extra) // Bad x 2.
+) {}
+
+$a = (null !== $extra);
+$a = (null !== $extra); // Bad x 2.
+
+$sx = $vert ? ($w - 1) : 0;
+
+$this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr'); // Bad x 4.
+
+$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+
+if ( $success && ('nothumb' == $target || 'all' == $target) ) {}
+
+$directory = ('/' == $file strlen($file)-1 );
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
+if (( null !== $extra ) && ( $row->extra !== $extra )) {} // Bad x 4.
+
+if (( null !== $extra ) && ( $row->extra !== $extra )) {}
+
+if (( null !== $extra // Bad x 1.
+    && is_int($extra) ) // Bad x 1.
+    && ( $row->extra !== $extra
+        || $something ) // Bad x 1.
+) {}
+
+if (( null !== $extra ) // Bad x 2.
+    && ( $row->extra !== $extra ) // Bad x 2.
+) {}
+
+$a = ( null !== $extra ); // Bad x 2.
+$a = ( null !== $extra );
+
+$sx = $vert ? ( $w - 1 ) : 0; // Bad x 2.
+
+$this->is_overloaded = ( ( ini_get("mbstring.func_overload") & 2 ) != 0 ) && function_exists('mb_substr'); // Bad x 4.
+
+$image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 ); // Bad x 4.
+
+if ( $success && ( 'nothumb' == $target || 'all' == $target ) ) {} // Bad x 2.
+
+$directory = ( '/' == $file strlen($file)-1  ); // Bad x 2.
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
+
+/*
+ * Test handling of ignoreNewlines.
+ */
+if (
+    (null !== $extra) && ($row->extra !== $extra)
+) {} // Bad x 4, 1 x line 123, 2 x line 125, 1 x line 127.
+
+
+$a = (null !== $extra); // Bad x 2, 1 x line 131, 1 x line 133.
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
+if (
+    ( null !== $extra ) && ( $row->extra !== $extra )
+) {} // Bad x 4, 1 x line 137, 2 x line 139, 1 x line 141.
+
+$a = ( null !== $extra ); // Bad x 2, 1 x line 144, 1 x line 146.
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
+
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines true
+if (
+    (
+        null !== $extra
+    ) && (
+        $row->extra !== $extra
+    )
+) {}
+
+$a = (
+    null !== $extra
+);
+// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
+
+if (true) {} (1+2) === 3 ? $a = 1 : $a = 2;
+class A {} (1+2) === 3 ? $a = 1 : $a = 2;
+function foo() {} (1+2) === 3 ? $a = 1 : $a = 2;
+
+// Issue #3618.
+class NonArbitraryParenthesesWithKeywords {
+    public static function baz( $foo, $bar ) {
+        $a = new self();
+        $b = new parent();
+        $c = new static();
+
+        // self/static are already tested above, round line 45.
+        $d = new parent( $foo,$bar );
+    }
+}
+
+// Test that the match expression does not trigger the sniff.
+$b = match (  $a  ) {
+    1 => true,
+};

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc Deleted

@@ -1,177 +0,0 @@
-<?php
-
-/*
- * Make sure the sniff does not act on structures it shouldn't act on.
- * All parentheses have extra spacing around it to test this properly.
- */
-$b = functioncall( $something ) ;
-$b = function( $something ) {};
-$c = myFunction( $arg1 , $arg2 = array( ) );
-
-function something( $param ) {}
-
-$d = new MyClass(  );
-$e = new class(  ) {};
-
-try {
-} catch( Exception $e ) {
-}
-
-include( PATH . 'file.php' );
-
-if ( in_array( $arg1, array( 'foo','bar' ) ) ) {}
-isset( $abc );
-unset( $abc );
-empty( $abc );
-eval( $abc );
-exit( $abc );
-clone( $_date1 <= $_date2 ? $_date1 : $_date2 );
-declare( ticks=1 );
-list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
-throw( $e );
-yield from ( function(){} );
-
-$obj->{$var}( $foo,$bar );
-
-$bar(function( $a, $b ) {
-    return function( $c, $d ) use ( $a, $b ) {
-        echo $a, $b, $c, $d;
-    };
-})( 'a','b' )( 'c','d' );
-
-$closure( $foo,$bar );
-$var = $closure() + $closure( $foo,$bar ) + self::$closure( $foo,$bar );
-
-class Test {
-    public static function baz( $foo, $bar ) {
-        $a = new self( $foo,$bar );
-        $b = new static( $foo,$bar );
-    }
-}
-
-/*
- * Test warning for empty parentheses.
- */
-$a = 4 + (); // Warning.
-$a = 4 + (   ); // Warning.
-$a = 4 + (/* Not empty */);
-
-/*
- * Test the actual sniff.
- */
-if ((null !== $extra) && ($row->extra !== $extra)) {}
-
-if (( null !== $extra ) && ( $row->extra !== $extra )) {} // Bad x 4.
-
-if ((        null !== $extra // Bad x 1.
-    && is_int($extra))
-    && ( $row->extra !== $extra // Bad x 1.
-        || $something      ) // Bad x 1.
-) {}
-
-if (( null !== $extra ) // Bad x 2.
-    && ( $row->extra !== $extra ) // Bad x 2.
-) {}
-
-$a = (null !== $extra);
-$a = ( null !== $extra ); // Bad x 2.
-
-$sx = $vert ? ($w - 1) : 0;
-
-$this->is_overloaded = ( ( ini_get("mbstring.func_overload") & 2 ) != 0 ) && function_exists('mb_substr'); // Bad x 4.
-
-$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
-
-if ( $success && ('nothumb' == $target || 'all' == $target) ) {}
-
-$directory = ('/' == $file strlen($file)-1 );
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
-if ((null !== $extra) && ($row->extra !== $extra)) {} // Bad x 4.
-
-if (( null !== $extra ) && ( $row->extra !== $extra )) {}
-
-if ((        null !== $extra // Bad x 1.
-    && is_int($extra)) // Bad x 1.
-    && ( $row->extra !== $extra
-        || $something      ) // Bad x 1.
-) {}
-
-if ((null !== $extra) // Bad x 2.
-    && ($row->extra !== $extra) // Bad x 2.
-) {}
-
-$a = (null !== $extra); // Bad x 2.
-$a = ( null !== $extra );
-
-$sx = $vert ? ($w - 1) : 0; // Bad x 2.
-
-$this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr'); // Bad x 4.
-
-$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 ); // Bad x 4.
-
-if ( $success && ('nothumb' == $target || 'all' == $target) ) {} // Bad x 2.
-
-$directory = ('/' == $file strlen($file)-1 ); // Bad x 2.
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
-
-/*
- * Test handling of ignoreNewlines.
- */
-if (
-    (
-        null !== $extra
-    ) && (
-        $row->extra !== $extra
-    )
-) {} // Bad x 4, 1 x line 123, 2 x line 125, 1 x line 127.
-
-
-$a = (
-    null !== $extra
-); // Bad x 2, 1 x line 131, 1 x line 133.
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
-if (
-    (
-        null !== $extra
-    ) && (
-        $row->extra !== $extra
-    )
-) {} // Bad x 4, 1 x line 137, 2 x line 139, 1 x line 141.
-
-$a = (
-    null !== $extra
-); // Bad x 2, 1 x line 144, 1 x line 146.
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines true
-if (
-    (
-        null !== $extra
-    ) && (
-        $row->extra !== $extra
-    )
-) {}
-
-$a = (
-    null !== $extra
-);
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
-
-if (true) {} ( 1+2) === 3 ? $a = 1 : $a = 2;
-class A {} ( 1+2) === 3 ? $a = 1 : $a = 2;
-function foo() {} ( 1+2) === 3 ? $a = 1 : $a = 2;
-
-// Issue #3618.
-class NonArbitraryParenthesesWithKeywords {
-    public static function baz( $foo, $bar ) {
-        $a = new self();
-        $b = new parent();
-        $c = new static();
-
-        // self/static are already tested above, round line 45.
-        $d = new parent( $foo,$bar );
-    }
-}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc.fixed Deleted

@@ -1,165 +0,0 @@
-<?php
-
-/*
- * Make sure the sniff does not act on structures it shouldn't act on.
- * All parentheses have extra spacing around it to test this properly.
- */
-$b = functioncall( $something ) ;
-$b = function( $something ) {};
-$c = myFunction( $arg1 , $arg2 = array( ) );
-
-function something( $param ) {}
-
-$d = new MyClass(  );
-$e = new class(  ) {};
-
-try {
-} catch( Exception $e ) {
-}
-
-include( PATH . 'file.php' );
-
-if ( in_array( $arg1, array( 'foo','bar' ) ) ) {}
-isset( $abc );
-unset( $abc );
-empty( $abc );
-eval( $abc );
-exit( $abc );
-clone( $_date1 <= $_date2 ? $_date1 : $_date2 );
-declare( ticks=1 );
-list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $q );
-throw( $e );
-yield from ( function(){} );
-
-$obj->{$var}( $foo,$bar );
-
-$bar(function( $a, $b ) {
-    return function( $c, $d ) use ( $a, $b ) {
-        echo $a, $b, $c, $d;
-    };
-})( 'a','b' )( 'c','d' );
-
-$closure( $foo,$bar );
-$var = $closure() + $closure( $foo,$bar ) + self::$closure( $foo,$bar );
-
-class Test {
-    public static function baz( $foo, $bar ) {
-        $a = new self( $foo,$bar );
-        $b = new static( $foo,$bar );
-    }
-}
-
-/*
- * Test warning for empty parentheses.
- */
-$a = 4 + (); // Warning.
-$a = 4 + (   ); // Warning.
-$a = 4 + (/* Not empty */);
-
-/*
- * Test the actual sniff.
- */
-if ((null !== $extra) && ($row->extra !== $extra)) {}
-
-if ((null !== $extra) && ($row->extra !== $extra)) {} // Bad x 4.
-
-if ((null !== $extra // Bad x 1.
-    && is_int($extra))
-    && ($row->extra !== $extra // Bad x 1.
-        || $something) // Bad x 1.
-) {}
-
-if ((null !== $extra) // Bad x 2.
-    && ($row->extra !== $extra) // Bad x 2.
-) {}
-
-$a = (null !== $extra);
-$a = (null !== $extra); // Bad x 2.
-
-$sx = $vert ? ($w - 1) : 0;
-
-$this->is_overloaded = ((ini_get("mbstring.func_overload") & 2) != 0) && function_exists('mb_substr'); // Bad x 4.
-
-$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
-
-if ( $success && ('nothumb' == $target || 'all' == $target) ) {}
-
-$directory = ('/' == $file strlen($file)-1 );
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
-if (( null !== $extra ) && ( $row->extra !== $extra )) {} // Bad x 4.
-
-if (( null !== $extra ) && ( $row->extra !== $extra )) {}
-
-if (( null !== $extra // Bad x 1.
-    && is_int($extra) ) // Bad x 1.
-    && ( $row->extra !== $extra
-        || $something ) // Bad x 1.
-) {}
-
-if (( null !== $extra ) // Bad x 2.
-    && ( $row->extra !== $extra ) // Bad x 2.
-) {}
-
-$a = ( null !== $extra ); // Bad x 2.
-$a = ( null !== $extra );
-
-$sx = $vert ? ( $w - 1 ) : 0; // Bad x 2.
-
-$this->is_overloaded = ( ( ini_get("mbstring.func_overload") & 2 ) != 0 ) && function_exists('mb_substr'); // Bad x 4.
-
-$image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 ); // Bad x 4.
-
-if ( $success && ( 'nothumb' == $target || 'all' == $target ) ) {} // Bad x 2.
-
-$directory = ( '/' == $file strlen($file)-1  ); // Bad x 2.
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
-
-/*
- * Test handling of ignoreNewlines.
- */
-if (
-    (null !== $extra) && ($row->extra !== $extra)
-) {} // Bad x 4, 1 x line 123, 2 x line 125, 1 x line 127.
-
-
-$a = (null !== $extra); // Bad x 2, 1 x line 131, 1 x line 133.
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 1
-if (
-    ( null !== $extra ) && ( $row->extra !== $extra )
-) {} // Bad x 4, 1 x line 137, 2 x line 139, 1 x line 141.
-
-$a = ( null !== $extra ); // Bad x 2, 1 x line 144, 1 x line 146.
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing spacing 0
-
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines true
-if (
-    (
-        null !== $extra
-    ) && (
-        $row->extra !== $extra
-    )
-) {}
-
-$a = (
-    null !== $extra
-);
-// phpcs:set Generic.WhiteSpace.ArbitraryParenthesesSpacing ignoreNewlines false
-
-if (true) {} (1+2) === 3 ? $a = 1 : $a = 2;
-class A {} (1+2) === 3 ? $a = 1 : $a = 2;
-function foo() {} (1+2) === 3 ? $a = 1 : $a = 2;
-
-// Issue #3618.
-class NonArbitraryParenthesesWithKeywords {
-    public static function baz( $foo, $bar ) {
-        $a = new self();
-        $b = new parent();
-        $c = new static();
-
-        // self/static are already tested above, round line 45.
-        $d = new parent( $foo,$bar );
-    }
-}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2017 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ArbitraryParenthesesSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\ArbitraryParenthesesSpacingSniff
+ */
 class ArbitraryParenthesesSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -21,45 +26,53 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            64  => 4,
-            66  => 1,
-            68  => 1,
-            69  => 1,
-            72  => 2,
-            73  => 2,
-            77  => 2,
-            81  => 4,
-            90  => 4,
-            94  => 1,
-            95  => 1,
-            97  => 1,
-            100 => 2,
-            101 => 2,
-            104 => 2,
-            107 => 2,
-            109 => 4,
-            111 => 4,
-            113 => 2,
-            115 => 2,
-            123 => 1,
-            125 => 2,
-            127 => 1,
-            131 => 1,
-            133 => 1,
-            137 => 1,
-            139 => 2,
-            141 => 1,
-            144 => 1,
-            146 => 1,
-            163 => 1,
-            164 => 1,
-            165 => 1,
-        ;
+        switch ($testFile) {
+        case 'ArbitraryParenthesesSpacingUnitTest.1.inc':
+            return 
+                64  => 4,
+                66  => 1,
+                68  => 1,
+                69  => 1,
+                72  => 2,
+                73  => 2,
+                77  => 2,
+                81  => 4,
+                90  => 4,
+                94  => 1,
+                95  => 1,
+                97  => 1,
+                100 => 2,
+                101 => 2,
+                104 => 2,
+                107 => 2,
+                109 => 4,
+                111 => 4,
+                113 => 2,
+                115 => 2,
+                123 => 1,
+                125 => 2,
+                127 => 1,
+                131 => 1,
+                133 => 1,
+                137 => 1,
+                139 => 2,
+                141 => 1,
+                144 => 1,
+                146 => 1,
+                163 => 1,
+                164 => 1,
+                165 => 1,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()
 
@@ -70,14 +83,22 @@
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return 
-            55 => 1,
-            56 => 1,
-        ;
+        switch ($testFile) {
+        case 'ArbitraryParenthesesSpacingUnitTest.1.inc':
+            return 
+                55 => 1,
+                56 => 1,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowSpaceIndentUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the DisallowSpaceIndent sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\DisallowSpaceIndentSniff
+ */
 class DisallowSpaceIndentUnitTest extends AbstractSniffUnitTest
 {
 
@@ -44,7 +49,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='DisallowSpaceIndentUnitTest.1.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'DisallowSpaceIndentUnitTest.1.inc':
@@ -85,7 +90,7 @@
                 117 => 1,
                 118 => 1,
             ;
-            break;
+
         case 'DisallowSpaceIndentUnitTest.3.inc':
             return 
                 2  => 1,
@@ -96,16 +101,15 @@
                 14 => 1,
                 15 => 1,
             ;
-            break;
+
         case 'DisallowSpaceIndentUnitTest.js':
             return 3 => 1;
-            break;
+
         case 'DisallowSpaceIndentUnitTest.css':
             return 2 => 1;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/IncrementDecrementSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2018 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the IncrementDecrementSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\IncrementDecrementSpacingSniff
+ */
 class IncrementDecrementSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,21 +30,34 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='IncrementDecrementSpacingUnitTest.inc')
+    public function getErrorList($testFile='')
     {
+        $errors = 
+            5  => 1,
+            6  => 1,
+            8  => 1,
+            10 => 1,
+            13 => 1,
+            14 => 1,
+            16 => 1,
+            17 => 1,
+        ;
+
         switch ($testFile) {
         case 'IncrementDecrementSpacingUnitTest.inc':
+            $errors21 = 1;
+            $errors23 = 1;
+            $errors26 = 1;
+            $errors27 = 1;
+            $errors30 = 1;
+            $errors31 = 1;
+            $errors34 = 1;
+            $errors37 = 1;
+
+            return $errors;
+
         case 'IncrementDecrementSpacingUnitTest.js':
-            return 
-                5  => 1,
-                6  => 1,
-                8  => 1,
-                10 => 1,
-                13 => 1,
-                14 => 1,
-                16 => 1,
-                17 => 1,
-            ;
+            return $errors;
 
         default:
             return ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.1.inc Added

@@ -0,0 +1,91 @@
+<?php
+echo $blah;
+echo    $blah;
+echo($blah);
+echo$blah;
+
+print $blah;
+print     $blah;
+print($blah);
+print$blah;
+
+include $blah;
+include     $blah;
+include($blah);
+include$blah;
+
+include_once $blah;
+include_once     $blah;
+include_once($blah);
+include_once$blah;
+
+require $blah;
+require     $blah;
+require($blah);
+require$blah;
+
+require_once $blah;
+require_once     $blah;
+require_once($blah);
+require_once$blah;
+
+$obj = new MyClass();
+$obj = new    MyClass();
+
+$obj = new $className();
+$obj = new$className();
+
+yield $blah;
+yield   $blah;
+yield$blah;
+
+yield from $test();
+yield FROM   $test();
+YIELD   from   $test();
+yield   from $test();
+yield
+from $test();
+yield
+
+
+From $test();
+yield FROM$test();
+
+throw new Exception();
+throw  new Exception();
+throw new   Exception();
+throw   new   Exception();
+
+throw $exception;
+throw$exception;
+
+namespace MyClass;
+namespace    MyClass;
+namespace MyNamespace\MyClass;
+namespace    MyNamespace\MyClass;
+
+// Namespace operator, not language construct.
+namespace\MyNamespace\MyClass;
+namespace \MyNamespace\MyClass;
+namespace   /*comment*/  \MyNamespace\MyClass;
+
+use MyClass;
+use    MyClass;
+use MyNamespace\MyClass;
+use    MyNamespace\MyClass;
+use \MyNamespace\MyClass;
+use    \MyNamespace\MyClass;
+
+return;
+return $blah;
+return   $blah;
+return($blah);
+return$blah;
+
+return	$tab;
+return
+$newLine;
+
+// The following line must have a single space at the end (after return)
+return 
+$spaceAndNewLine;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.1.inc.fixed Added

@@ -0,0 +1,85 @@
+<?php
+echo $blah;
+echo $blah;
+echo($blah);
+echo $blah;
+
+print $blah;
+print $blah;
+print($blah);
+print $blah;
+
+include $blah;
+include $blah;
+include($blah);
+include $blah;
+
+include_once $blah;
+include_once $blah;
+include_once($blah);
+include_once $blah;
+
+require $blah;
+require $blah;
+require($blah);
+require $blah;
+
+require_once $blah;
+require_once $blah;
+require_once($blah);
+require_once $blah;
+
+$obj = new MyClass();
+$obj = new MyClass();
+
+$obj = new $className();
+$obj = new $className();
+
+yield $blah;
+yield $blah;
+yield $blah;
+
+yield from $test();
+yield FROM $test();
+YIELD from $test();
+yield from $test();
+yield from $test();
+yield From $test();
+yield FROM $test();
+
+throw new Exception();
+throw new Exception();
+throw new Exception();
+throw new Exception();
+
+throw $exception;
+throw $exception;
+
+namespace MyClass;
+namespace MyClass;
+namespace MyNamespace\MyClass;
+namespace MyNamespace\MyClass;
+
+// Namespace operator, not language construct.
+namespace\MyNamespace\MyClass;
+namespace \MyNamespace\MyClass;
+namespace   /*comment*/  \MyNamespace\MyClass;
+
+use MyClass;
+use MyClass;
+use MyNamespace\MyClass;
+use MyNamespace\MyClass;
+use \MyNamespace\MyClass;
+use \MyNamespace\MyClass;
+
+return;
+return $blah;
+return $blah;
+return($blah);
+return $blah;
+
+return $tab;
+return $newLine;
+
+// The following line must have a single space at the end (after return)
+return $spaceAndNewLine;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.inc Deleted

@@ -1,79 +0,0 @@
-<?php
-echo $blah;
-echo    $blah;
-echo($blah);
-
-print $blah;
-print     $blah;
-print($blah);
-
-include $blah;
-include     $blah;
-include($blah);
-
-include_once $blah;
-include_once     $blah;
-include_once($blah);
-
-require $blah;
-require     $blah;
-require($blah);
-
-require_once $blah;
-require_once     $blah;
-require_once($blah);
-
-$obj = new MyClass();
-$obj = new    MyClass();
-
-yield $blah;
-yield   $blah;
-
-yield from $test();
-yield FROM   $test();
-YIELD   from   $test();
-yield   from $test();
-yield
-from $test();
-yield
-
-
-From $test();
-
-throw new Exception();
-throw  new Exception();
-throw new   Exception();
-throw   new   Exception();
-
-namespace MyClass;
-namespace    MyClass;
-namespace MyNamespace\MyClass;
-namespace    MyNamespace\MyClass;
-
-// Namespace operator, not language construct.
-namespace\MyNamespace\MyClass;
-namespace \MyNamespace\MyClass;
-namespace   /*comment*/  \MyNamespace\MyClass;
-
-use MyClass;
-use    MyClass;
-use MyNamespace\MyClass;
-use    MyNamespace\MyClass;
-use \MyNamespace\MyClass;
-use    \MyNamespace\MyClass;
-
-return;
-return $blah;
-return   $blah;
-return($blah);
-
-return	$tab;
-return
-$newLine;
-
-// The following line must have a single space at the end (after return)
-return 
-$spaceAndNewLine;
-
-// The following line must be the last line in the file
-return

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.inc.fixed Deleted

@@ -1,73 +0,0 @@
-<?php
-echo $blah;
-echo $blah;
-echo($blah);
-
-print $blah;
-print $blah;
-print($blah);
-
-include $blah;
-include $blah;
-include($blah);
-
-include_once $blah;
-include_once $blah;
-include_once($blah);
-
-require $blah;
-require $blah;
-require($blah);
-
-require_once $blah;
-require_once $blah;
-require_once($blah);
-
-$obj = new MyClass();
-$obj = new MyClass();
-
-yield $blah;
-yield $blah;
-
-yield from $test();
-yield FROM $test();
-YIELD from $test();
-yield from $test();
-yield from $test();
-yield From $test();
-
-throw new Exception();
-throw new Exception();
-throw new Exception();
-throw new Exception();
-
-namespace MyClass;
-namespace MyClass;
-namespace MyNamespace\MyClass;
-namespace MyNamespace\MyClass;
-
-// Namespace operator, not language construct.
-namespace\MyNamespace\MyClass;
-namespace \MyNamespace\MyClass;
-namespace   /*comment*/  \MyNamespace\MyClass;
-
-use MyClass;
-use MyClass;
-use MyNamespace\MyClass;
-use MyNamespace\MyClass;
-use \MyNamespace\MyClass;
-use \MyNamespace\MyClass;
-
-return;
-return $blah;
-return $blah;
-return($blah);
-
-return $tab;
-return $newLine;
-
-// The following line must have a single space at the end (after return)
-return $spaceAndNewLine;
-
-// The following line must be the last line in the file
-return

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2017 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the LanguageConstructSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\LanguageConstructSpacingSniff
+ */
 class LanguageConstructSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -21,37 +26,56 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            3  => 1,
-            7  => 1,
-            11 => 1,
-            15 => 1,
-            19 => 1,
-            23 => 1,
-            27 => 1,
-            30 => 1,
-            33 => 1,
-            34 => 1,
-            35 => 1,
-            36 => 1,
-            38 => 1,
-            44 => 1,
-            45 => 1,
-            46 => 2,
-            49 => 1,
-            51 => 1,
-            59 => 1,
-            61 => 1,
-            63 => 1,
-            67 => 1,
-            70 => 1,
-            71 => 1,
-            75 => 1,
-        ;
+        switch ($testFile) {
+        case 'LanguageConstructSpacingUnitTest.1.inc':
+            return 
+                3  => 1,
+                5  => 1,
+                8  => 1,
+                10 => 1,
+                13 => 1,
+                15 => 1,
+                18 => 1,
+                20 => 1,
+                23 => 1,
+                25 => 1,
+                28 => 1,
+                30 => 1,
+                33 => 1,
+                36 => 1,
+                39 => 1,
+                40 => 1,
+                43 => 1,
+                44 => 1,
+                45 => 1,
+                46 => 1,
+                48 => 1,
+                52 => 1,
+                55 => 1,
+                56 => 1,
+                57 => 2,
+                60 => 1,
+                63 => 1,
+                65 => 1,
+                73 => 1,
+                75 => 1,
+                77 => 1,
+                81 => 1,
+                83 => 1,
+                85 => 1,
+                86 => 1,
+                90 => 1,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/CSS/BrowserSpecificStylesSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/IncludeOwnSystemSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/IncludeSystemSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Channels/UnusedSystemSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Commenting/FunctionCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Debug/DebugCodeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Debug/FirebugConsoleSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Objects/AssignThisSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Objects/DisallowNewWidgetSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/PHP/AjaxNullComparisonSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/PHP/EvalObjectFactorySniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/PHP/GetRequestDataSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/PHP/ReturnFunctionValueSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Sniffs/Strings/JoinStringsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/CSS/BrowserSpecificStylesUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Channels/DisallowSelfActionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Channels/IncludeSystemUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Channels/UnusedSystemUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Commenting/FunctionCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Debug/DebugCodeUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Debug/FirebugConsoleUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Objects/AssignThisUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Objects/CreateWidgetTypeCallbackUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\MySource\Tests\Objects;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the CreateWidgetTypeCallback sniff.
+ *
+ * @covers PHP_CodeSniffer\Standards\MySource\Sniffs\Objects\CreateWidgetTypeCallbackSniff
+ */
 class CreateWidgetTypeCallbackUnitTest extends AbstractSniffUnitTest
 {
 
@@ -21,11 +26,9 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
-     * @param string $testFile The name of the file being tested.
-     *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='CreateWidgetTypeCallbackUnitTest.js')
+    public function getErrorList()
     {
         return 
             18  => 1,

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Objects/DisallowNewWidgetUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/PHP/AjaxNullComparisonUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/PHP/EvalObjectFactoryUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/PHP/GetRequestDataUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/PHP/ReturnFunctionValueUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/MySource/Tests/Strings/JoinStringsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php Changed

@@ -4,13 +4,12 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
-use PHP_CodeSniffer\Util\Tokens;
 
 class ClassCommentSniff extends FileCommentSniff
 {
@@ -19,7 +18,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -48,8 +47,12 @@
         $type      = strtolower($tokens$stackPtr'content');
         $errorData = $type;
 
-        $find = Tokens::$methodPrefixes;
-        $findT_WHITESPACE = T_WHITESPACE;
+        $find = 
+            T_ABSTRACT   => T_ABSTRACT,
+            T_FINAL      => T_FINAL,
+            T_READONLY   => T_READONLY,
+            T_WHITESPACE => T_WHITESPACE,
+        ;
 
         for ($commentEnd = ($stackPtr - 1); $commentEnd >= 0; $commentEnd--) {
             if (isset($find$tokens$commentEnd'code') === true) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Sniffs\Commenting;
@@ -72,7 +72,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -88,7 +88,7 @@
      * @param int                         $stackPtr  The position of the current token
      *                                               in the stack passed in $tokens.
      *
-     * @return int
+     * @return int|void
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -170,6 +170,7 @@
             T_FINAL,
             T_STATIC,
             T_ABSTRACT,
+            T_READONLY,
             T_CONST,
             T_PROPERTY,
         ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Sniffs\Commenting;
@@ -39,7 +39,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -129,11 +129,25 @@
                     && $tokens$i'line' !== $tokens($i + 1)'line'
                 ) {
                     $error = 'There must be no blank lines after the function comment';
-                    $phpcsFile->addError($error, $commentEnd, 'SpacingAfter');
+                    $fix   = $phpcsFile->addFixableError($error, $commentEnd, 'SpacingAfter');
+
+                    if ($fix === true) {
+                        $phpcsFile->fixer->beginChangeset();
+
+                        while ($i < $stackPtr
+                            && $tokens$i'code' === T_WHITESPACE
+                            && $tokens$i'line' !== $tokens($i + 1)'line'
+                        ) {
+                            $phpcsFile->fixer->replaceToken($i++, '');
+                        }
+
+                        $phpcsFile->fixer->endChangeset();
+                    }
+
                     break;
                 }
-            }
-        }
+            }//end for
+        }//end if
 
         $commentStart = $tokens$commentEnd'comment_opener';
         foreach ($tokens$commentStart'comment_tags' as $tag) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions;
@@ -58,7 +58,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -340,7 +340,8 @@
         // call itself is, so we can work out how far to
         // indent the arguments.
         $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
-        if ($tokens$first'code' === T_CONSTANT_ENCAPSED_STRING
+        if ($first !== false
+            && $tokens$first'code' === T_CONSTANT_ENCAPSED_STRING
             && $tokens($first - 1)'code' === T_CONSTANT_ENCAPSED_STRING
         ) {
             // We are in a multi-line string, so find the start and use
@@ -386,8 +387,10 @@
 
             $fix = $phpcsFile->addFixableError($error, $first, 'OpeningIndent', $data);
             if ($fix === true) {
+                // Set adjustment for use later to determine whether argument indentation is correct when fixing.
                 $adjustment = ($functionIndent - $foundFunctionIndent);
-                $padding    = str_repeat(' ', $functionIndent);
+
+                $padding = str_repeat(' ', $functionIndent);
                 if ($foundFunctionIndent === 0) {
                     $phpcsFile->fixer->addContentBefore($first, $padding);
                 } else if ($tokens$first'code' === T_INLINE_HTML) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions;
@@ -39,7 +39,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -297,63 +297,74 @@
             return;
         }
 
-        // The opening brace needs to be one space away from the closing parenthesis.
+        // The opening brace needs to be on the same line as the closing parenthesis.
+        // There should only be one space between the closing parenthesis - or the end of the
+        // return type - and the opening brace.
         $opener = $tokens$stackPtr'scope_opener';
         if ($tokens$opener'line' !== $tokens$closeBracket'line') {
             $error = 'The closing parenthesis and the opening brace of a multi-line function declaration must be on the same line';
-            $fix   = $phpcsFile->addFixableError($error, $opener, 'NewlineBeforeOpenBrace');
-            if ($fix === true) {
-                $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), $closeBracket, true);
-                $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->addContent($prev, ' {');
-
-                // If the opener is on a line by itself, removing it will create
-                // an empty line, so just remove the entire line instead.
-                $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($opener - 1), $closeBracket, true);
-                $next = $phpcsFile->findNext(T_WHITESPACE, ($opener + 1), null, true);
+            $code  = 'NewlineBeforeOpenBrace';
 
-                if ($tokens$prev'line' < $tokens$opener'line'
-                    && $tokens$next'line' > $tokens$opener'line'
-                ) {
-                    // Clear the whole line.
-                    for ($i = ($prev + 1); $i < $next; $i++) {
-                        if ($tokens$i'line' === $tokens$opener'line') {
-                            $phpcsFile->fixer->replaceToken($i, '');
-                        }
-                    }
-                } else {
-                    // Just remove the opener.
-                    $phpcsFile->fixer->replaceToken($opener, '');
-                    if ($tokens$next'line' === $tokens$opener'line') {
-                        $phpcsFile->fixer->replaceToken(($opener + 1), '');
-                    }
-                }
-
-                $phpcsFile->fixer->endChangeset();
-            }//end if
-        } else {
-            $prev = $tokens($opener - 1);
-            if ($prev'code' !== T_WHITESPACE) {
-                $length = 0;
+            $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($opener - 1), $closeBracket, true);
+            if ($tokens$prev'line' === $tokens$opener'line') {
+                // End of the return type is not on the same line as the close parenthesis.
+                $phpcsFile->addError($error, $opener, $code);
             } else {
-                $length = strlen($prev'content');
-            }
-
-            if ($length !== 1) {
-                $error = 'There must be a single space between the closing parenthesis and the opening brace of a multi-line function declaration; found %s spaces';
-                $fix   = $phpcsFile->addFixableError($error, ($opener - 1), 'SpaceBeforeOpenBrace', $length);
+                $fix = $phpcsFile->addFixableError($error, $opener, $code);
                 if ($fix === true) {
-                    if ($length === 0) {
-                        $phpcsFile->fixer->addContentBefore($opener, ' ');
+                    $phpcsFile->fixer->beginChangeset();
+                    $phpcsFile->fixer->addContent($prev, ' {');
+
+                    // If the opener is on a line by itself, removing it will create
+                    // an empty line, so remove the entire line instead.
+                    $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($opener - 1), $closeBracket, true);
+                    $next = $phpcsFile->findNext(T_WHITESPACE, ($opener + 1), null, true);
+
+                    if ($tokens$prev'line' < $tokens$opener'line'
+                        && $tokens$next'line' > $tokens$opener'line'
+                    ) {
+                        // Clear the whole line.
+                        for ($i = ($prev + 1); $i < $next; $i++) {
+                            if ($tokens$i'line' === $tokens$opener'line') {
+                                $phpcsFile->fixer->replaceToken($i, '');
+                            }
+                        }
                     } else {
-                        $phpcsFile->fixer->replaceToken(($opener - 1), ' ');
+                        // Just remove the opener.
+                        $phpcsFile->fixer->replaceToken($opener, '');
+                        if ($tokens$next'line' === $tokens$opener'line'
+                            && ($opener + 1) !== $next
+                        ) {
+                            $phpcsFile->fixer->replaceToken(($opener + 1), '');
+                        }
                     }
-                }
+
+                    $phpcsFile->fixer->endChangeset();
+                }//end if
 
                 return;
             }//end if
         }//end if
 
+        $prev = $tokens($opener - 1);
+        if ($prev'code' !== T_WHITESPACE) {
+            $length = 0;
+        } else {
+            $length = strlen($prev'content');
+        }
+
+        if ($length !== 1) {
+            $error = 'There must be a single space between the closing parenthesis/return type and the opening brace of a multi-line function declaration; found %s spaces';
+            $fix   = $phpcsFile->addFixableError($error, ($opener - 1), 'SpaceBeforeOpenBrace', $length);
+            if ($fix === true) {
+                if ($length === 0) {
+                    $phpcsFile->fixer->addContentBefore($opener, ' ');
+                } else {
+                    $phpcsFile->fixer->replaceToken(($opener - 1), ' ');
+                }
+            }
+        }
+
     }//end processMultiLineDeclaration()
 
 
@@ -496,6 +507,19 @@
                 $lastLine = $tokens$i'line';
             }//end if
 
+            if ($tokens$i'code' === T_OPEN_PARENTHESIS
+                && isset($tokens$i'parenthesis_closer') === true
+            ) {
+                $prevNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($i - 1), null, true);
+                if ($tokens$prevNonEmpty'code' !== T_USE) {
+                    // Since PHP 8.1, a default value can contain a class instantiation.
+                    // Skip over these "function calls" as they have their own indentation rules.
+                    $i        = $tokens$i'parenthesis_closer';
+                    $lastLine = $tokens$i'line';
+                    continue;
+                }
+            }
+
             if ($tokens$i'code' === T_ARRAY || $tokens$i'code' === T_OPEN_SHORT_ARRAY) {
                 // Skip arrays as they have their own indentation rules.
                 if ($tokens$i'code' === T_OPEN_SHORT_ARRAY) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Classes/ClassDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.inc Changed

@@ -31,7 +31,7 @@
  * @package   PHP_CodeSniffer
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @version   Release: 1.0
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
@@ -47,7 +47,7 @@
  * @package   PHP_CodeSniffer
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @version
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
@@ -136,10 +136,28 @@
  * @category  PHP
  * @package   PHP_CodeSniffer
  * @author    Greg Sherwood <gsherwood@squiz.net>
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 #Authenticate('admin_logged_in')
 class TodoController extends AbstractController implements MustBeLoggedInInterface
 {
 }
+
+/**
+ * Docblock
+ *
+ * @category  PHP
+ * @package   PHP_CodeSniffer
+ * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @link      http://pear.php.net/package/PHP_CodeSniffer
+ */
+abstract readonly class AbstractReadonlyWithDocblock {}
+
+/*
+ * Docblock
+ */
+readonly class ReadonlyWrongStyle {}
+
+readonly final class ReadonlyFinalWithoutDocblock {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/ClassCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FileCommentUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the FileComment sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\PEAR\Sniffs\Commenting\FileCommentSniff
+ */
 class FileCommentUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='FileCommentUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'FileCommentUnitTest.1.inc':
@@ -48,9 +53,8 @@
             ;
 
         case 'FileCommentUnitTest.2.inc':
-            return 1 => 1;
-
         case 'FileCommentUnitTest.3.inc':
+        case 'FileCommentUnitTest.4.inc':
             return 1 => 1;
 
         default:
@@ -70,7 +74,7 @@
      *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='FileCommentUnitTest.inc')
+    public function getWarningList($testFile='')
     {
         switch ($testFile) {
         case 'FileCommentUnitTest.1.inc':

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/FunctionCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Commenting/InlineCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/ControlStructures/ControlSignatureUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/ControlStructures/MultiLineConditionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Files/IncludingFileUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Formatting/MultiLineAssignmentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Tests\Functions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the FunctionCallSignature sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions\FunctionCallSignatureSniff
+ */
 class FunctionCallSignatureUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         if ($testFile === 'FunctionCallSignatureUnitTest.js') {
             return 
@@ -134,6 +139,8 @@
             559 => 1,
             567 => 1,
             568 => 1,
+            573 => 1,
+            574 => 1,
         ;
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc Changed

@@ -418,3 +418,73 @@
         // Do something.
     }
 }
+
+// PHP 8.1: new in initializers means that class instantiations with parameters can occur in a function declaration.
+function usingNewInInitializersCallParamsIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+        new InjectedDependencyA(),
+        new InjectedDependencyB
+    )
+) {}
+
+function usingNewInInitializersCallParamsNotIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+    new InjectedDependencyA,
+    new InjectedDependencyB()
+    )
+) {}
+
+function usingNewInInitializersCallParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+new InjectedDependencyA(), new InjectedDependencyB()
+)
+) {}
+
+class UsingNewInInitializers {
+    public function doSomething(
+        object $paramA,
+        stdClass $paramB = new stdClass(),
+        Exception $paramC = new Exception(
+            new ExceptionMessage(),
+            new ExceptionCode(),
+        ),
+    ) {
+    }
+
+    public function callParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+        Exception $param = new Exception(
+new ExceptionMessage(),
+    new ExceptionCode(),
+  ),
+    ) {
+    }
+}
+
+// Issue #3736 - prevent the fixer creating a parse error by removing the function close brace.
+class Test
+{
+    public function __construct(
+        protected int $id
+    )
+    {}
+}
+
+// Prevent fixer conflict with itself.
+function foo(
+    $param1,
+)
+: \SomeClass
+  {
+  }
+
+function foo(
+    $param1,
+    $param2
+) : // comment.
+   \Package\Sub\SomeClass   {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.inc.fixed Changed

@@ -416,3 +416,72 @@
         // Do something.
     }
 }
+
+// PHP 8.1: new in initializers means that class instantiations with parameters can occur in a function declaration.
+function usingNewInInitializersCallParamsIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+        new InjectedDependencyA(),
+        new InjectedDependencyB
+    )
+) {}
+
+function usingNewInInitializersCallParamsNotIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+    new InjectedDependencyA,
+    new InjectedDependencyB()
+    )
+) {}
+
+function usingNewInInitializersCallParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+new InjectedDependencyA(), new InjectedDependencyB()
+)
+) {}
+
+class UsingNewInInitializers {
+    public function doSomething(
+        object $paramA,
+        stdClass $paramB = new stdClass(),
+        Exception $paramC = new Exception(
+            new ExceptionMessage(),
+            new ExceptionCode(),
+        ),
+    ) {
+    }
+
+    public function callParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+        Exception $param = new Exception(
+new ExceptionMessage(),
+    new ExceptionCode(),
+  ),
+    ) {
+    }
+}
+
+// Issue #3736 - prevent the fixer creating a parse error by removing the function close brace.
+class Test
+{
+    public function __construct(
+        protected int $id
+    ) {
+    }
+}
+
+// Prevent fixer conflict with itself.
+function foo(
+    $param1,
+)
+: \SomeClass {
+  }
+
+function foo(
+    $param1,
+    $param2
+) : // comment.
+   \Package\Sub\SomeClass {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PEAR\Tests\Functions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the FunctionDeclaration sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions\FunctionDeclarationSniff
+ */
 class FunctionDeclarationUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='FunctionDeclarationUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         if ($testFile === 'FunctionDeclarationUnitTest.inc') {
             $errors = 
@@ -99,6 +104,9 @@
                 371 => 1,
                 402 => 1,
                 406 => 1,
+                475 => 1,
+                483 => 1,
+                490 => 2,
             ;
         } else {
             $errors =

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/NamingConventions/ValidFunctionNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/NamingConventions/ValidVariableNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/WhiteSpace/ObjectOperatorIndentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/WhiteSpace/ScopeIndentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR1\Sniffs\Files;
@@ -20,7 +20,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -36,7 +36,7 @@
      * @param int                         $stackPtr  The position of the current token in
      *                                               the token stack.
      *
-     * @return void
+     * @return int
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -103,7 +103,8 @@
                 && (empty($tokens$i'sniffCodes') === true
                 || isset($tokens$i'sniffCodes''PSR1') === true
                 || isset($tokens$i'sniffCodes''PSR1.Files') === true
-                || isset($tokens$i'sniffCodes''PSR1.Files.SideEffects') === true)
+                || isset($tokens$i'sniffCodes''PSR1.Files.SideEffects') === true
+                || isset($tokens$i'sniffCodes''PSR1.Files.SideEffects.FoundWithSymbols') === true)
             ) {
                 do {
                     $i = $phpcsFile->findNext(T_PHPCS_ENABLE, ($i + 1));
@@ -111,7 +112,8 @@
                     && empty($tokens$i'sniffCodes') === false
                     && isset($tokens$i'sniffCodes''PSR1') === false
                     && isset($tokens$i'sniffCodes''PSR1.Files') === false
-                    && isset($tokens$i'sniffCodes''PSR1.Files.SideEffects') === false);
+                    && isset($tokens$i'sniffCodes''PSR1.Files.SideEffects') === false
+                    && isset($tokens$i'sniffCodes''PSR1.Files.SideEffects.FoundWithSymbols') === false);
 
                 if ($i === false) {
                     // The entire rest of the file is disabled,
@@ -169,7 +171,9 @@
             }
 
             // Ignore function/class prefixes.
-            if (isset(Tokens::$methodPrefixes$tokens$i'code') === true) {
+            if (isset(Tokens::$methodPrefixes$tokens$i'code') === true
+                || $tokens$i'code' === T_READONLY
+            ) {
                 continue;
             }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.17.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Tests/Files/SideEffectsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR1/Tests/Methods/CamelCapsMethodNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Classes/ClosingBraceStandard.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Classes/OpeningBraceSpaceStandard.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/ControlStructures Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/ControlStructures/BooleanOperatorPlacementStandard.xml Added

@@ -0,0 +1,59 @@
+<documentation title="Boolean Operator Placement">
+    <standard>
+    <!CDATA
+    Boolean operators between conditions in control structures must always be at the beginning or at the end of the line, not a mix of both.
+
+    This rule applies to if/else conditions, while loops and switch/match statements.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Boolean operator between conditions consistently at the beginning of the line.">
+        <!CDATA
+if (
+    $expr1
+    && $expr2
+    && ($expr3
+    || $expr4)
+    && $expr5
+) {
+    // if body.
+}
+        >
+        </code>
+        <code title="Invalid: Mix of boolean operators at the beginning and the end of the line.">
+        <!CDATA
+if (
+    $expr1 &&
+    ($expr2 || $expr3)
+    && $expr4
+) {
+    // if body.
+}
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Boolean operator between conditions consistently at the end of the line.">
+        <!CDATA
+if (
+    $expr1 ||
+    ($expr2 || $expr3) &&
+    $expr4
+) {
+    // if body.
+}
+        >
+        </code>
+        <code title="Invalid: Mix of boolean operators at the beginning and the end of the line.">
+        <!CDATA
+match (
+    $expr1
+    && $expr2 ||
+    $expr3
+) {
+    // structure body.
+};
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Files Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Docs/Files/OpenTagStandard.xml Added

@@ -0,0 +1,40 @@
+<documentation title="Open PHP Tag">
+    <standard>
+    <!CDATA
+    When the opening <?php tag is on the first line of the file, it must be on its own line with no other statements unless it is a file containing markup outside of PHP opening and closing tags.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Opening PHP tag on a line by itself.">
+        <!CDATA
+<em><?php</em>
+
+echo 'hi';
+        >
+        </code>
+        <code title="Invalid: Opening PHP tag not on a line by itself.">
+        <!CDATA
+<?php <em>echo 'hi';</em>
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Opening PHP tag not on a line by itself, but has markup outside the closing PHP tag.">
+        <!CDATA
+<?php declare(strict_types=1); ?>
+<html>
+<body>
+    <?php
+        // ... additional PHP code ...
+    ?>
+</body>
+</html>
+        >
+        </code>
+        <code title="Invalid: Opening PHP tag not on a line by itself without any markup in the file.">
+        <!CDATA
+<?php declare(strict_types=1); ?>
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2019 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR12\Sniffs\Classes;
@@ -36,7 +36,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -97,7 +97,11 @@
                 $first  = $phpcsFile->findFirstOnLine(T_WHITESPACE, $stackPtr, true);
                 $indent = str_repeat(' ', ($tokens$first'column' - 1));
                 $phpcsFile->fixer->beginChangeset();
-                $phpcsFile->fixer->replaceToken(($prev + 1), '');
+
+                if ($tokens($prev + 1)'code' === \T_WHITESPACE) {
+                    $phpcsFile->fixer->replaceToken(($prev + 1), '');
+                }
+
                 $phpcsFile->fixer->addNewline($prev);
                 $phpcsFile->fixer->addContentBefore($opener, $indent);
                 $phpcsFile->fixer->endChangeset();

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/ClosingBraceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/OpeningBraceSpaceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/ControlStructures/BooleanOperatorPlacementSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/ControlStructures/ControlStructureSpacingSniff.php Changed

@@ -4,14 +4,14 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2019 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR12\Sniffs\ControlStructures;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff as PSR2Spacing;
+use PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff as PSR2ControlStructureSpacing;
 use PHP_CodeSniffer\Util\Tokens;
 
 class ControlStructureSpacingSniff implements Sniff
@@ -24,11 +24,28 @@
      */
     public $indent = 4;
 
+    /**
+     * Instance of the PSR2 ControlStructureSpacingSniff sniff.
+     *
+     * @var \PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff
+     */
+    private $psr2ControlStructureSpacing;
+
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->psr2ControlStructureSpacing = new PSR2ControlStructureSpacing();
+
+    }//end __construct()
+
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -38,7 +55,6 @@
             T_FOREACH,
             T_FOR,
             T_SWITCH,
-            T_ELSE,
             T_ELSEIF,
             T_CATCH,
             T_MATCH,
@@ -71,8 +87,7 @@
 
         if ($tokens$parenOpener'line' === $tokens$parenCloser'line') {
             // Conditions are all on the same line, so follow PSR2.
-            $sniff = new PSR2Spacing();
-            return $sniff->process($phpcsFile, $stackPtr);
+            return $this->psr2ControlStructureSpacing->process($phpcsFile, $stackPtr);
         }
 
         $next = $phpcsFile->findNext(T_WHITESPACE, ($parenOpener + 1), $parenCloser, true);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Files/DeclareStatementSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Files/FileHeaderSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2019 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR12\Sniffs\Files;
@@ -20,7 +20,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -36,7 +36,7 @@
      * @param int                         $stackPtr  The position of the current
      *                                               token in the stack.
      *
-     * @return int|null
+     * @return int|void
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -188,6 +188,7 @@
 
                 if (isset($commentOpeners$tokens$docToken'code') === false
                     && isset(Tokens::$methodPrefixes$tokens$docToken'code') === false
+                    && $tokens$docToken'code' !== T_READONLY
                 ) {
                     // Check for an @var annotation.
                     $annotation = false;
@@ -283,7 +284,7 @@
      * @param array                       $headerLines Header information, as sourced
      *                                                 from getHeaderLines().
      *
-     * @return int|null
+     * @return void
      */
     public function processHeaderLines(File $phpcsFile, $headerLines)
     {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Files/OpenTagSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2019 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR12\Sniffs\Files;
@@ -19,7 +19,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -44,25 +44,28 @@
             return $phpcsFile->numTokens;
         }
 
-        $next = $phpcsFile->findNext(T_INLINE_HTML, 0);
-        if ($next !== false) {
-            // This rule only applies to PHP-only files.
-            return $phpcsFile->numTokens;
-        }
-
         $tokens = $phpcsFile->getTokens();
         $next   = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
         if ($next === false) {
             // Empty file.
-            return;
+            return $phpcsFile->numTokens;
+        }
+
+        if ($tokens$next'line' !== $tokens$stackPtr'line') {
+            // Tag is on a line by itself.
+            return $phpcsFile->numTokens;
+        }
+
+        $next = $phpcsFile->findNext(T_INLINE_HTML, 0);
+        if ($next !== false) {
+            // This rule only applies to PHP-only files.
+            return $phpcsFile->numTokens;
         }
 
-        if ($tokens$next'line' === $tokens$stackPtr'line') {
-            $error = 'Opening PHP tag must be on a line by itself';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NotAlone');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($stackPtr);
-            }
+        $error = 'Opening PHP tag must be on a line by itself';
+        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'NotAlone');
+        if ($fix === true) {
+            $phpcsFile->fixer->addNewline($stackPtr);
         }
 
         return $phpcsFile->numTokens;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Functions/ReturnTypeDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Namespaces/CompoundNamespaceDepthSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Operators/OperatorSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Properties/ConstantVisibilitySniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR12\Sniffs\Traits;
@@ -20,7 +20,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -36,7 +36,7 @@
      * @param int                         $stackPtr  The position of the current token in the
      *                                               stack passed in $tokens.
      *
-     * @return void
+     * @return void|int
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -177,6 +177,38 @@
                 }//end if
             }//end if
 
+            $error = 'Expected 1 space after USE in trait import statement; %s found';
+            if ($tokens($useToken + 1)'code' !== T_WHITESPACE) {
+                $data = '0';
+                $fix  = $phpcsFile->addFixableError($error, $useToken, 'SpaceAfterUse', $data);
+                if ($fix === true) {
+                    $phpcsFile->fixer->addContent($useToken, ' ');
+                }
+            } else if ($tokens($useToken + 1)'content' !== ' ') {
+                $next = $phpcsFile->findNext(T_WHITESPACE, ($useToken + 1), null, true);
+                if ($tokens$next'line' !== $tokens$useToken'line') {
+                    $found = 'newline';
+                } else {
+                    $found = $tokens($useToken + 1)'length';
+                }
+
+                $data = $found;
+                $fix  = $phpcsFile->addFixableError($error, $useToken, 'SpaceAfterUse', $data);
+                if ($fix === true) {
+                    if ($found === 'newline') {
+                        $phpcsFile->fixer->beginChangeset();
+                        for ($x = ($useToken + 1); $x < $next; $x++) {
+                            $phpcsFile->fixer->replaceToken($x, '');
+                        }
+
+                        $phpcsFile->fixer->addContent($useToken, ' ');
+                        $phpcsFile->fixer->endChangeset();
+                    } else {
+                        $phpcsFile->fixer->replaceToken(($useToken + 1), ' ');
+                    }
+                }
+            }//end if
+
             // Check the formatting of the statement.
             if (isset($tokens$useToken'scope_opener') === true) {
                 $this->processUseGroup($phpcsFile, $useToken);
@@ -652,38 +684,6 @@
     {
         $tokens = $phpcsFile->getTokens();
 
-        $error = 'Expected 1 space after USE in trait import statement; %s found';
-        if ($tokens($stackPtr + 1)'code' !== T_WHITESPACE) {
-            $data = '0';
-            $fix  = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterAs', $data);
-            if ($fix === true) {
-                $phpcsFile->fixer->addContent($stackPtr, ' ');
-            }
-        } else if ($tokens($stackPtr + 1)'content' !== ' ') {
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
-            if ($tokens$next'line' !== $tokens$stackPtr'line') {
-                $found = 'newline';
-            } else {
-                $found = $tokens($stackPtr + 1)'length';
-            }
-
-            $data = $found;
-            $fix  = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterAs', $data);
-            if ($fix === true) {
-                if ($found === 'newline') {
-                    $phpcsFile->fixer->beginChangeset();
-                    for ($x = ($stackPtr + 1); $x < $next; $x++) {
-                        $phpcsFile->fixer->replaceToken($x, '');
-                    }
-
-                    $phpcsFile->fixer->addContent($stackPtr, ' ');
-                    $phpcsFile->fixer->endChangeset();
-                } else {
-                    $phpcsFile->fixer->replaceToken(($stackPtr + 1), ' ');
-                }
-            }
-        }//end if
-
         $next = $phpcsFile->findNext(T_COMMA, T_SEMICOLON, ($stackPtr + 1));
         if ($next !== false && $tokens$next'code' === T_COMMA) {
             $error = 'Each imported trait must have its own "use" import statement';

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/AnonClassDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClosingBraceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/OpeningBraceSpaceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/ControlStructures/BooleanOperatorPlacementUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/ControlStructures/ControlStructureSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/DeclareStatementUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.18.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/FileHeaderUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Files/OpenTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Functions/NullableTypeDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Functions/ReturnTypeDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Namespaces/CompoundNamespaceDepthUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Operators/OperatorSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Properties/ConstantVisibilityUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/ruleset.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Docs/Files/ClosingTagStandard.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Docs/Methods/FunctionCallSignatureStandard.xml Added

@@ -0,0 +1,107 @@
+<documentation title="Function Call Signature">
+    <standard>
+    <!CDATA
+    Checks that the function call format is correct.
+    >
+    </standard>
+    <code_comparison>
+        <code title="Valid: Correct spacing is used around parentheses.">
+        <!CDATA
+foo<em></em>(<em></em>$bar, $baz<em></em>);
+        >
+        </code>
+        <code title="Invalid: Incorrect spacing used, too much space around the parentheses.">
+        <!CDATA
+foo<em> </em>(<em> </em>$bar, $baz<em> </em>);
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Correct number of spaces used for indent in a multi-line function call.">
+        <!CDATA
+foo(
+<em>    </em>$bar,
+<em>    </em>$baz
+);
+        >
+        </code>
+        <code title="Invalid: Incorrect number of spaces used for indent in a multi-line function call.">
+        <!CDATA
+foo(
+<em>  </em>$bar,
+<em>      </em>$baz
+);
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Closing parenthesis for a multi-line function call is on a new line after the last parameter.">
+        <!CDATA
+foo(
+    $bar,
+    $baz
+<em>)</em>;
+        >
+        </code>
+        <code title="Invalid: Closing parenthesis for a multi-line function call is not on a new line after the last parameter.">
+        <!CDATA
+foo(
+    $bar,
+    $baz<em>)</em>;
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: The first argument of a multi-line function call is on a new line.">
+        <!CDATA
+foo(
+    <em>$bar</em>,
+    $baz
+);
+        >
+        </code>
+        <code title="Invalid: The first argument of a multi-line function call is not on a new line.">
+        <!CDATA
+foo(<em>$bar</em>,
+    $baz
+);
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Only one argument per line in a multi-line function call.">
+        <!CDATA
+foo(
+    $bar,
+    <em>$baz</em>
+);
+        >
+        </code>
+        <code title="Invalid: Two or more arguments per line in a multi-line function call.">
+        <!CDATA
+foo(
+    $bar, <em>$baz</em>
+);
+        >
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: No blank lines in a multi-line function call.">
+        <!CDATA
+foo(
+    $bar,
+    $baz
+);
+        >
+        </code>
+        <code title="Invalid: Blank line in multi-line function call.">
+        <!CDATA
+foo(
+    $bar,
+<em></em>
+    $baz
+);
+        >
+        </code>
+    </code_comparison>
+</documentation>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Docs/Methods/FunctionClosingBraceStandard.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes;
@@ -71,7 +71,7 @@
                 $blankSpace = substr($prevContent, strpos($prevContent, $phpcsFile->eolChar));
                 $spaces     = strlen($blankSpace);
 
-                if (in_array($tokens($stackPtr - 2)'code', T_ABSTRACT, T_FINAL, true) === true
+                if (in_array($tokens($stackPtr - 2)'code', T_ABSTRACT, T_FINAL, T_READONLY, true) === true
                     && $spaces !== 1
                 ) {
                     $prevContent = strtolower($tokens($stackPtr - 2)'content');
@@ -89,6 +89,7 @@
                 }
             } else if ($tokens($stackPtr - 2)'code' === T_ABSTRACT
                 || $tokens($stackPtr - 2)'code' === T_FINAL
+                || $tokens($stackPtr - 2)'code' === T_READONLY
             ) {
                 $prevContent = strtolower($tokens($stackPtr - 2)'content');
                 $error       = 'Expected 1 space between %s and %s keywords; newline found';
@@ -491,12 +492,12 @@
 
             if ($fix === true) {
                 $phpcsFile->fixer->beginChangeset();
-                for ($i = ($prevContent + 1); $i < $closeBrace; $i++) {
+                for ($i = ($prevContent + 1); $tokens$i'line' !== $tokens$closeBrace'line'; $i++) {
                     $phpcsFile->fixer->replaceToken($i, '');
                 }
 
                 if (strpos($tokens$prevContent'content', $phpcsFile->eolChar) === false) {
-                    $phpcsFile->fixer->replaceToken($closeBrace, $phpcsFile->eolChar.$tokens$closeBrace'content');
+                    $phpcsFile->fixer->addNewline($prevContent);
                 }
 
                 $phpcsFile->fixer->endChangeset();

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes;
@@ -118,30 +118,70 @@
             $phpcsFile->addError($error, $stackPtr, 'ScopeMissing', $data);
         }
 
+        /*
+         * Note: per PSR-PER section 4.6, the order should be:
+         * - Inheritance modifier: `abstract` or `final`.
+         * - Visibility modifier: `public`, `protected`, or `private`.
+         * - Scope modifier: `static`.
+         * - Mutation modifier: `readonly`.
+         * - Type declaration.
+         * - Name.
+         *
+         * Ref: https://www.php-fig.org/per/coding-style/#46-modifier-keywords
+         *
+         * At this time (PHP 8.2), inheritance modifiers cannot be applied to properties and
+         * the `static` and `readonly` modifiers are mutually exclusive and cannot be used together.
+         *
+         * Based on that, the below modifier keyword order checks are sufficient (for now).
+         */
+
         if ($propertyInfo'scope_specified' === true && $propertyInfo'is_static' === true) {
             $scopePtr  = $phpcsFile->findPrevious(Tokens::$scopeModifiers, ($stackPtr - 1));
             $staticPtr = $phpcsFile->findPrevious(T_STATIC, ($stackPtr - 1));
-            if ($scopePtr < $staticPtr) {
-                return;
-            }
+            if ($scopePtr > $staticPtr) {
+                $error = 'The static declaration must come after the visibility declaration';
+                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'StaticBeforeVisibility');
+                if ($fix === true) {
+                    $phpcsFile->fixer->beginChangeset();
 
-            $error = 'The static declaration must come after the visibility declaration';
-            $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'StaticBeforeVisibility');
-            if ($fix === true) {
-                $phpcsFile->fixer->beginChangeset();
+                    for ($i = ($scopePtr + 1); $scopePtr < $stackPtr; $i++) {
+                        if ($tokens$i'code' !== T_WHITESPACE) {
+                            break;
+                        }
 
-                for ($i = ($scopePtr + 1); $scopePtr < $stackPtr; $i++) {
-                    if ($tokens$i'code' !== T_WHITESPACE) {
-                        break;
+                        $phpcsFile->fixer->replaceToken($i, '');
                     }
 
-                    $phpcsFile->fixer->replaceToken($i, '');
+                    $phpcsFile->fixer->replaceToken($scopePtr, '');
+                    $phpcsFile->fixer->addContentBefore($staticPtr, $propertyInfo'scope'.' ');
+
+                    $phpcsFile->fixer->endChangeset();
                 }
+            }
+        }//end if
+
+        if ($propertyInfo'scope_specified' === true && $propertyInfo'is_readonly' === true) {
+            $scopePtr    = $phpcsFile->findPrevious(Tokens::$scopeModifiers, ($stackPtr - 1));
+            $readonlyPtr = $phpcsFile->findPrevious(T_READONLY, ($stackPtr - 1));
+            if ($scopePtr > $readonlyPtr) {
+                $error = 'The readonly declaration must come after the visibility declaration';
+                $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'ReadonlyBeforeVisibility');
+                if ($fix === true) {
+                    $phpcsFile->fixer->beginChangeset();
+
+                    for ($i = ($scopePtr + 1); $scopePtr < $stackPtr; $i++) {
+                        if ($tokens$i'code' !== T_WHITESPACE) {
+                            break;
+                        }
+
+                        $phpcsFile->fixer->replaceToken($i, '');
+                    }
 
-                $phpcsFile->fixer->replaceToken($scopePtr, '');
-                $phpcsFile->fixer->addContentBefore($staticPtr, $propertyInfo'scope'.' ');
+                    $phpcsFile->fixer->replaceToken($scopePtr, '');
+                    $phpcsFile->fixer->addContentBefore($readonlyPtr, $propertyInfo'scope'.' ');
 
-                $phpcsFile->fixer->endChangeset();
+                    $phpcsFile->fixer->endChangeset();
+                }
             }
         }//end if

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/ClassDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Classes/PropertyDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/ControlStructures/ControlStructureSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/ControlStructures/ElseIfDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Files/ClosingTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Methods/FunctionClosingBraceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Methods/MethodDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Arrays;
@@ -20,7 +20,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -330,11 +330,17 @@
             }
         } else if ($tokens$arrayEnd'column' !== $keywordStart) {
             // Check the closing bracket is lined up under the "a" in array.
-            $expected = ($keywordStart - 1);
-            $found    = ($tokens$arrayEnd'column' - 1);
-            $error    = 'Closing parenthesis not aligned correctly; expected %s space(s) but found %s';
-            $data     = 
+            $expected       = ($keywordStart - 1);
+            $found          = ($tokens$arrayEnd'column' - 1);
+            $pluralizeSpace = 's';
+            if ($expected === 1) {
+                $pluralizeSpace = '';
+            }
+
+            $error = 'Closing parenthesis not aligned correctly; expected %s space%s but found %s';
+            $data  = 
                 $expected,
+                $pluralizeSpace,
                 $found,
             ;
 
@@ -430,9 +436,13 @@
                 }
 
                 if ($keyUsed === true && $tokens$lastToken'code' === T_COMMA) {
-                    $error = 'No key specified for array entry; first entry specifies key';
-                    $phpcsFile->addError($error, $nextToken, 'NoKeySpecified');
-                    return;
+                    $nextToken = $phpcsFile->findNext(Tokens::$emptyTokens, ($lastToken + 1), null, true);
+                    // Allow for PHP 7.4+ array unpacking within an array declaration.
+                    if ($tokens$nextToken'code' !== T_ELLIPSIS) {
+                        $error = 'No key specified for array entry; first entry specifies key';
+                        $phpcsFile->addError($error, $nextToken, 'NoKeySpecified');
+                        return;
+                    }
                 }
 
                 if ($keyUsed === false) {
@@ -470,8 +480,17 @@
                         true
                     );
 
-                    $indices  = 'value' => $valueContent;
-                    $singleUsed = true;
+                    $indices          = 'value' => $valueContent;
+                    $usesArrayUnpacking = $phpcsFile->findPrevious(
+                        Tokens::$emptyTokens,
+                        ($nextToken - 2),
+                        null,
+                        true
+                    );
+                    if ($tokens$usesArrayUnpacking'code' !== T_ELLIPSIS) {
+                        // Don't decide if an array is key => value indexed or not when PHP 7.4+ array unpacking is used.
+                        $singleUsed = true;
+                    }
                 }//end if
 
                 $lastToken = $nextToken;
@@ -661,12 +680,18 @@
                 } else if ($previousIsWhitespace === true) {
                     $expected = $keywordStart;
 
-                    $first = $phpcsFile->findFirstOnLine(T_WHITESPACE, $valuePointer, true);
-                    $found = ($tokens$first'column' - 1);
+                    $first          = $phpcsFile->findFirstOnLine(T_WHITESPACE, $valuePointer, true);
+                    $found          = ($tokens$first'column' - 1);
+                    $pluralizeSpace = 's';
+                    if ($expected === 1) {
+                        $pluralizeSpace = '';
+                    }
+
                     if ($found !== $expected) {
-                        $error = 'Array value not aligned correctly; expected %s spaces but found %s';
+                        $error = 'Array value not aligned correctly; expected %s space%s but found %s';
                         $data  = 
                             $expected,
+                            $pluralizeSpace,
                             $found,
                         ;
 
@@ -750,11 +775,17 @@
             }
 
             if ($tokens$indexPointer'column' !== $indicesStart && ($indexPointer - 1) !== $arrayStart) {
-                $expected = ($indicesStart - 1);
-                $found    = ($tokens$indexPointer'column' - 1);
-                $error    = 'Array key not aligned correctly; expected %s spaces but found %s';
-                $data     = 
+                $expected       = ($indicesStart - 1);
+                $found          = ($tokens$indexPointer'column' - 1);
+                $pluralizeSpace = 's';
+                if ($expected === 1) {
+                    $pluralizeSpace = '';
+                }
+
+                $error = 'Array key not aligned correctly; expected %s space%s but found %s';
+                $data  = 
                     $expected,
+                    $pluralizeSpace,
                     $found,
                 ;
 
@@ -766,15 +797,21 @@
                         $phpcsFile->fixer->replaceToken(($indexPointer - 1), str_repeat(' ', $expected));
                     }
                 }
-            }
+            }//end if
 
             $arrowStart = ($tokens$indexPointer'column' + $maxLength + 1);
             if ($tokens$index'arrow''column' !== $arrowStart) {
-                $expected = ($arrowStart - ($index'index_length' + $tokens$indexPointer'column'));
-                $found    = ($tokens$index'arrow''column' - ($index'index_length' + $tokens$indexPointer'column'));
-                $error    = 'Array double arrow not aligned correctly; expected %s space(s) but found %s';
-                $data     = 
+                $expected       = ($arrowStart - ($index'index_length' + $tokens$indexPointer'column'));
+                $found          = ($tokens$index'arrow''column' - ($index'index_length' + $tokens$indexPointer'column'));
+                $pluralizeSpace = 's';
+                if ($expected === 1) {
+                    $pluralizeSpace = '';
+                }
+
+                $error = 'Array double arrow not aligned correctly; expected %s space%s but found %s';
+                $data  = 
                     $expected,
+                    $pluralizeSpace,
                     $found,
                 ;
 
@@ -788,7 +825,7 @@
                 }
 
                 continue;
-            }
+            }//end if
 
             $valueStart = ($arrowStart + 3);
             if ($tokens$valuePointer'column' !== $valueStart) {
@@ -798,9 +835,15 @@
                     $found = 'newline';
                 }
 
-                $error = 'Array value not aligned correctly; expected %s space(s) but found %s';
+                $pluralizeSpace = 's';
+                if ($expected === 1) {
+                    $pluralizeSpace = '';
+                }
+
+                $error = 'Array value not aligned correctly; expected %s space%s but found %s';
                 $data  = 
                     $expected,
+                    $pluralizeSpace,
                     $found,
                 ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ColonSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ColourDefinitionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/DuplicateStyleDefinitionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ForbiddenStylesSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/IndentationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/NamedColoursSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/OpacitySniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/SemicolonSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/CSS/ShorthandSizeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Classes/DuplicatePropertySniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php Changed

@@ -12,14 +12,13 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
 
 class ClassCommentSniff implements Sniff
 {
@@ -28,7 +27,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -49,8 +48,12 @@
     public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
-        $find   = Tokens::$methodPrefixes;
-        $findT_WHITESPACE = T_WHITESPACE;
+        $find   = 
+            T_ABSTRACT   => T_ABSTRACT,
+            T_FINAL      => T_FINAL,
+            T_READONLY   => T_READONLY,
+            T_WHITESPACE => T_WHITESPACE,
+        ;
 
         $previousContent = null;
         for ($commentEnd = ($stackPtr - 1); $commentEnd >= 0; $commentEnd--) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting;
@@ -30,7 +30,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -112,9 +112,15 @@
             }
 
             if ($tokens$i'column' !== $requiredColumn) {
-                $error = 'Expected %s space(s) before asterisk; %s found';
+                $pluralizeSpace = 's';
+                if (($requiredColumn - 1) === 1) {
+                    $pluralizeSpace = '';
+                }
+
+                $error = 'Expected %s space%s before asterisk; %s found';
                 $data  = 
                     ($requiredColumn - 1),
+                    $pluralizeSpace,
                     ($tokens$i'column' - 1),
                 ;
                 $fix   = $phpcsFile->addFixableError($error, $i, 'SpaceBeforeStar', $data);
@@ -126,7 +132,7 @@
                         $phpcsFile->fixer->replaceToken(($i - 1), $padding);
                     }
                 }
-            }
+            }//end if
 
             if ($tokens$i'code' !== T_DOC_COMMENT_STAR) {
                 continue;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting;
@@ -27,7 +27,7 @@
     /**
      * The current PHP version.
      *
-     * @var integer
+     * @var integer|string|null
      */
     private $phpVersion = null;
 
@@ -143,9 +143,12 @@
                             }
                         }
                     }//end if
-                } else if ($returnType !== 'mixed' && in_array('void', $typeNames, true) === false) {
-                    // If return type is not void, there needs to be a return statement
-                    // somewhere in the function that returns something.
+                } else if ($returnType !== 'mixed'
+                    && $returnType !== 'never'
+                    && in_array('void', $typeNames, true) === false
+                ) {
+                    // If return type is not void, never, or mixed, there needs to be a
+                    // return statement somewhere in the function that returns something.
                     if (isset($tokens$stackPtr'scope_closer') === true) {
                         $endToken = $tokens$stackPtr'scope_closer';
                         for ($returnToken = $stackPtr; $returnToken < $endToken; $returnToken++) {
@@ -405,6 +408,10 @@
             $suggestedTypeNames = ;
 
             foreach ($typeNames as $typeName) {
+                if ($typeName === '') {
+                    continue;
+                }
+
                 // Strip nullable operator.
                 if ($typeName0 === '?') {
                     $typeName = substr($typeName, 1);
@@ -551,16 +558,38 @@
 
             // Make sure the param name is correct.
             if (isset($realParams$pos) === true) {
-                $realName = $realParams$pos'name';
-                if ($realName !== $param'var') {
+                $realName     = $realParams$pos'name';
+                $paramVarName = $param'var';
+
+                if ($param'var'0 === '&') {
+                    // Even when passed by reference, the variable name in $realParams does not have
+                    // a leading '&'. This sniff will accept both '&$var' and '$var' in these cases.
+                    $paramVarName = substr($param'var', 1);
+
+                    // This makes sure that the 'MissingParamTag' check won't throw a false positive.
+                    $foundParams(count($foundParams) - 1) = $paramVarName;
+
+                    if ($realParams$pos'pass_by_reference' !== true && $realName === $paramVarName) {
+                        // Don't complain about this unless the param name is otherwise correct.
+                        $error = 'Doc comment for parameter %s is prefixed with "&" but parameter is not passed by reference';
+                        $code  = 'ParamNameUnexpectedAmpersandPrefix';
+                        $data  = $paramVarName;
+
+                        // We're not offering an auto-fix here because we can't tell if the docblock
+                        // is wrong, or the parameter should be passed by reference.
+                        $phpcsFile->addError($error, $param'tag', $code, $data);
+                    }
+                }
+
+                if ($realName !== $paramVarName) {
                     $code = 'ParamNameNoMatch';
                     $data = 
-                        $param'var',
+                        $paramVarName,
                         $realName,
                     ;
 
                     $error = 'Doc comment for parameter %s does not match ';
-                    if (strtolower($param'var') === strtolower($realName)) {
+                    if (strtolower($paramVarName) === strtolower($realName)) {
                         $error .= 'case of ';
                         $code   = 'ParamNameNoCaseMatch';
                     }
@@ -568,7 +597,7 @@
                     $error .= 'actual variable name %s';
 
                     $phpcsFile->addError($error, $param'tag', $code, $data);
-                }
+                }//end if
             } else if (substr($param'var', -4) !== ',...') {
                 // We must have an extra parameter comment.
                 $error = 'Superfluous parameter comment';

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting;
@@ -30,7 +30,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -49,7 +49,7 @@
      * @param int                         $stackPtr  The position of the current token in the
      *                                               stack passed in $tokens.
      *
-     * @return void
+     * @return void|int
      */
     public function process(File $phpcsFile, $stackPtr)
     {
@@ -83,6 +83,7 @@
                 T_FINAL,
                 T_STATIC,
                 T_ABSTRACT,
+                T_READONLY,
                 T_CONST,
                 T_PROPERTY,
                 T_INCLUDE,

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting;
@@ -30,16 +30,24 @@
     {
         $tokens = $phpcsFile->getTokens();
         $ignore = 
-            T_PUBLIC       => T_PUBLIC,
-            T_PRIVATE      => T_PRIVATE,
-            T_PROTECTED    => T_PROTECTED,
-            T_VAR          => T_VAR,
-            T_STATIC       => T_STATIC,
-            T_READONLY     => T_READONLY,
-            T_WHITESPACE   => T_WHITESPACE,
-            T_STRING       => T_STRING,
-            T_NS_SEPARATOR => T_NS_SEPARATOR,
-            T_NULLABLE     => T_NULLABLE,
+            T_PUBLIC            => T_PUBLIC,
+            T_PRIVATE           => T_PRIVATE,
+            T_PROTECTED         => T_PROTECTED,
+            T_VAR               => T_VAR,
+            T_STATIC            => T_STATIC,
+            T_READONLY          => T_READONLY,
+            T_WHITESPACE        => T_WHITESPACE,
+            T_STRING            => T_STRING,
+            T_NS_SEPARATOR      => T_NS_SEPARATOR,
+            T_NAMESPACE         => T_NAMESPACE,
+            T_NULLABLE          => T_NULLABLE,
+            T_TYPE_UNION        => T_TYPE_UNION,
+            T_TYPE_INTERSECTION => T_TYPE_INTERSECTION,
+            T_NULL              => T_NULL,
+            T_TRUE              => T_TRUE,
+            T_FALSE             => T_FALSE,
+            T_SELF              => T_SELF,
+            T_PARENT            => T_PARENT,
         ;
 
         for ($commentEnd = ($stackPtr - 1); $commentEnd >= 0; $commentEnd--) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures;
@@ -37,7 +37,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -105,9 +105,15 @@
         }
 
         if ($found !== $expected) {
-            $error = 'Expected %s space(s) after %s keyword; %s found';
+            $pluralizeSpace = 's';
+            if ($expected === 1) {
+                $pluralizeSpace = '';
+            }
+
+            $error = 'Expected %s space%s after %s keyword; %s found';
             $data  = 
                 $expected,
+                $pluralizeSpace,
                 strtoupper($tokens$stackPtr'content'),
                 $found,
             ;
@@ -120,7 +126,7 @@
                     $phpcsFile->fixer->replaceToken(($stackPtr + 1), str_repeat(' ', $expected));
                 }
             }
-        }
+        }//end if
 
         // Single space after closing parenthesis.
         if (isset($tokens$stackPtr'parenthesis_closer') === true
@@ -146,9 +152,15 @@
             }
 
             if ($found !== $expected) {
-                $error = 'Expected %s space(s) after closing parenthesis; found %s';
+                $pluralizeSpace = 's';
+                if ($expected === 1) {
+                    $pluralizeSpace = '';
+                }
+
+                $error = 'Expected %s space%s after closing parenthesis; found %s';
                 $data  = 
                     $expected,
+                    $pluralizeSpace,
                     $found,
                 ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Debug/JSLintSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Debug;
@@ -28,7 +28,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -44,7 +44,7 @@
      * @param int                         $stackPtr  The position in the stack where
      *                                               the token was found.
      *
-     * @return void
+     * @return int
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If jslint.js could not be run
      */
     public function process(File $phpcsFile, $stackPtr)
@@ -52,7 +52,7 @@
         $rhinoPath  = Config::getExecutablePath('rhino');
         $jslintPath = Config::getExecutablePath('jslint');
         if ($rhinoPath === null || $jslintPath === null) {
-            return;
+            return ($phpcsFile->numTokens + 1);
         }
 
         $fileName = $phpcsFile->getFilename();

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\Debug;
@@ -29,7 +29,7 @@
     /**
      * Returns the token types that this sniff is interested in.
      *
-     * @return int
+     * @return array<int|string>
      */
     public function register()
     {
@@ -45,14 +45,14 @@
      * @param int                         $stackPtr  The position in the stack where
      *                                               the token was found.
      *
-     * @return void
+     * @return int
      * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If Javascript Lint ran into trouble.
      */
     public function process(File $phpcsFile, $stackPtr)
     {
         $jslPath = Config::getExecutablePath('jsl');
         if ($jslPath === null) {
-            return;
+            return ($phpcsFile->numTokens + 1);
         }
 
         $fileName = $phpcsFile->getFilename();

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Objects/ObjectMemberCommaSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/EvalSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php Changed

@@ -4,13 +4,14 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP;
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
 
 class InnerFunctionsSniff implements Sniff
 {
@@ -19,7 +20,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -41,21 +42,28 @@
     {
         $tokens = $phpcsFile->getTokens();
 
-        $function = $phpcsFile->getCondition($stackPtr, T_FUNCTION);
-        if ($function === false) {
-            // Not a nested function.
+        if (isset($tokens$stackPtr'conditions') === false) {
             return;
         }
 
-        $class = $phpcsFile->getCondition($stackPtr, T_ANON_CLASS, false);
-        if ($class !== false && $class > $function) {
-            // Ignore methods in anon classes.
-            return;
+        $conditions         = $tokens$stackPtr'conditions';
+        $reversedConditions = array_reverse($conditions, true);
+
+        $outerFuncToken = null;
+        foreach ($reversedConditions as $condToken => $condition) {
+            if ($condition === T_FUNCTION || $condition === T_CLOSURE) {
+                $outerFuncToken = $condToken;
+                break;
+            }
+
+            if (\array_key_exists($condition, Tokens::$ooScopeTokens) === true) {
+                // Ignore methods in OOP structures defined within functions.
+                return;
+            }
         }
 
-        $prev = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if ($tokens$prev'code' === T_EQUAL) {
-            // Ignore closures.
+        if ($outerFuncToken === null) {
+            // Not a nested function.
             return;
         }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP;
@@ -39,7 +39,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -75,6 +75,11 @@
         }
 
         // Make sure this is a function call or a use statement.
+        if (empty($tokens$stackPtr'nested_attributes') === false) {
+            // Class instantiation in attribute, not function call.
+            return;
+        }
+
         $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
         if ($next === false) {
             // Not a function call.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP;
@@ -16,11 +16,27 @@
 class NonExecutableCodeSniff implements Sniff
 {
 
+    /**
+     * Tokens for terminating expressions, which can be used inline.
+     *
+     * This is in contrast to terminating statements, which cannot be used inline
+     * and would result in a parse error (which is not the concern of this sniff).
+     *
+     * `throw` can be used as an expression since PHP 8.0.
+     * {@link https://wiki.php.net/rfc/throw_expression}
+     *
+     * @var array
+     */
+    private $expressionTokens = 
+        T_EXIT  => T_EXIT,
+        T_THROW => T_THROW,
+    ;
+
 
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -49,42 +65,58 @@
     {
         $tokens = $phpcsFile->getTokens();
 
-        // If this token is preceded with an "or", it only relates to one line
-        // and should be ignored. For example: fopen() or die().
         $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if ($tokens$prev'code' === T_LOGICAL_OR || $tokens$prev'code' === T_BOOLEAN_OR) {
-            return;
-        }
 
-        // Check if this token is actually part of a one-line IF or ELSE statement.
-        for ($i = ($stackPtr - 1); $i > 0; $i--) {
-            if ($tokens$i'code' === T_CLOSE_PARENTHESIS) {
-                $i = $tokens$i'parenthesis_opener';
-                continue;
-            } else if (isset(Tokens::$emptyTokens$tokens$i'code') === true) {
-                continue;
+        // Tokens which can be used in inline expressions need special handling.
+        if (isset($this->expressionTokens$tokens$stackPtr'code') === true) {
+            // If this token is preceded by a logical operator, it only relates to one line
+            // and should be ignored. For example: fopen() or die().
+            // Note: There is one exception: throw expressions can not be used with xor.
+            if (isset(Tokens::$booleanOperators$tokens$prev'code') === true
+                && ($tokens$stackPtr'code' === T_THROW && $tokens$prev'code' === T_LOGICAL_XOR) === false
+            ) {
+                return;
             }
 
-            break;
-        }
+            // Expressions are allowed in the `else` clause of ternaries.
+            if ($tokens$prev'code' === T_INLINE_THEN || $tokens$prev'code' === T_INLINE_ELSE) {
+                return;
+            }
+
+            // Expressions are allowed with PHP 7.0+ null coalesce and PHP 7.4+ null coalesce equals.
+            if ($tokens$prev'code' === T_COALESCE || $tokens$prev'code' === T_COALESCE_EQUAL) {
+                return;
+            }
 
-        if ($tokens$i'code' === T_IF
-            || $tokens$i'code' === T_ELSE
-            || $tokens$i'code' === T_ELSEIF
+            // Expressions are allowed in arrow functions.
+            if ($tokens$prev'code' === T_FN_ARROW) {
+                return;
+            }
+        }//end if
+
+        // This token may be part of an inline condition.
+        // If we find a closing parenthesis that belongs to a condition,
+        // or an "else", we should ignore this token.
+        if ($tokens$prev'code' === T_ELSE
+            || (isset($tokens$prev'parenthesis_owner') === true
+            && ($tokens$tokens$prev'parenthesis_owner''code' === T_IF
+            || $tokens$tokens$prev'parenthesis_owner''code' === T_ELSEIF))
         ) {
             return;
         }
 
         if ($tokens$stackPtr'code' === T_RETURN) {
-            $next = $phpcsFile->findNext(T_WHITESPACE, ($stackPtr + 1), null, true);
+            $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($stackPtr + 1), null, true);
             if ($tokens$next'code' === T_SEMICOLON) {
-                $next = $phpcsFile->findNext(T_WHITESPACE, ($next + 1), null, true);
+                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), null, true);
                 if ($tokens$next'code' === T_CLOSE_CURLY_BRACKET) {
                     // If this is the closing brace of a function
                     // then this return statement doesn't return anything
                     // and is not required anyway.
                     $owner = $tokens$next'scope_condition';
-                    if ($tokens$owner'code' === T_FUNCTION) {
+                    if ($tokens$owner'code' === T_FUNCTION
+                        || $tokens$owner'code' === T_CLOSURE
+                    ) {
                         $warning = 'Empty return statement not required here';
                         $phpcsFile->addWarning($warning, $stackPtr, 'ReturnNotRequired');
                         return;
@@ -136,22 +168,6 @@
             }//end if
         }//end if
 
-        // This token may be part of an inline condition.
-        // If we find a closing parenthesis that belongs to a condition
-        // we should ignore this token.
-        $prev = $phpcsFile->findPrevious(Tokens::$emptyTokens, ($stackPtr - 1), null, true);
-        if (isset($tokens$prev'parenthesis_owner') === true) {
-            $owner  = $tokens$prev'parenthesis_owner';
-            $ignore = 
-                T_IF     => true,
-                T_ELSE   => true,
-                T_ELSEIF => true,
-            ;
-            if (isset($ignore$tokens$owner'code') === true) {
-                return;
-            }
-        }
-
         $ourConditions = array_keys($tokens$stackPtr'conditions');
 
         if (empty($ourConditions) === false) {
@@ -204,8 +220,8 @@
             $end = ($phpcsFile->numTokens - 1);
         }//end if
 
-        // Find the semicolon that ends this statement, skipping
-        // nested statements like FOR loops and closures.
+        // Find the semicolon or closing PHP tag that ends this statement,
+        // skipping nested statements like FOR loops and closures.
         for ($start = ($stackPtr + 1); $start < $phpcsFile->numTokens; $start++) {
             if ($start === $end) {
                 break;
@@ -225,7 +241,7 @@
                 continue;
             }
 
-            if ($tokens$start'code' === T_SEMICOLON) {
+            if ($tokens$start'code' === T_SEMICOLON || $tokens$start'code' === T_CLOSE_TAG) {
                 break;
             }
         }//end for
@@ -258,6 +274,16 @@
                 continue;
             }
 
+            // Skip HTML whitespace.
+            if ($tokens$i'code' === T_INLINE_HTML && \trim($tokens$i'content') === '') {
+                continue;
+            }
+
+            // Skip PHP re-open tag (eg, after inline HTML).
+            if ($tokens$i'code' === T_OPEN_TAG) {
+                continue;
+            }
+
             $line = $tokens$i'line';
             if ($line > $lastLine) {
                 $type    = substr($tokens$stackPtr'type', 2);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace;
@@ -48,7 +48,7 @@
     /**
      * Returns an array of tokens this test wants to listen for.
      *
-     * @return array
+     * @return array<int|string>
      */
     public function register()
     {
@@ -262,22 +262,21 @@
                 $prevContent = $phpcsFile->findPrevious(T_WHITESPACE, ($tokens$prevContent'comment_opener' - 1), null, true);
             }
 
-            $prevLineToken = $prevContent;
-
             // Before we throw an error, check that we are not throwing an error
             // for another function. We don't want to error for no blank lines after
             // the previous function and no blank lines before this one as well.
-            $prevLine   = ($tokens$prevContent'line' - 1);
-            $i          = ($stackPtr - 1);
-            $foundLines = 0;
-
             $stopAt = 0;
-            if (isset($tokens$stackPtr'conditions') === true) {
-                $conditions = $tokens$stackPtr'conditions';
+            if (isset($tokens$prevLineToken'conditions') === true) {
+                $conditions = $tokens$prevLineToken'conditions';
                 $conditions = array_keys($conditions);
                 $stopAt     = array_pop($conditions);
             }
 
+            $prevLineToken = $prevContent;
+            $prevLine      = ($tokens$prevContent'line' - 1);
+            $i          = ($stackPtr - 1);
+            $foundLines = 0;
+
             while ($currentLine !== $prevLine && $currentLine > 1 && $i > $stopAt) {
                 if ($tokens$i'code' === T_FUNCTION) {
                     // Found another interface or abstract function.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/PropertyLabelSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayBracketSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc Changed

@@ -475,14 +475,63 @@
        static fn () : string => '',
       );
 
-$foo = 
+$foo = array(
         'foo' => match ($anything) {
             'foo' => 'bar',
             default => null,
         },
-       ;
+       );
 
 // Intentional syntax error.
 $a = array(
       'a' =>
      );
+
+// Safeguard correct errors for key/no key when PHP 7.4+ array unpacking is encountered.
+$x = array(
+    ...$a,
+      'foo' => 'bar',
+     );
+
+$x = array(
+      'foo' => 'bar',
+    ...$a,
+     );
+
+$x = array(
+      'foo' => 'bar',
+    ...$a,
+      'baz' => 'bar',
+     );
+
+$x = array(
+    ...$a,
+    'foo' => 'bar', // OK.
+    'bar', // NoKeySpecified Error (based on second entry).
+     );
+
+$x = array(
+    ...$a,
+    'bar', // OK.
+    'foo' => 'bar', // KeySpecified Error (based on second entry).
+     );
+
+$x = array(
+    'foo' => 'bar',
+    ...$a,
+    'baz' => 'bar',
+    'bar', // NoKeySpecified Error (based on first entry).
+     );
+
+$x = array(
+    'bar',
+    ...$a,
+    'bar',
+    'baz' => 'bar', // KeySpecified (based on first entry).
+     );
+
+ $x =
+ array(
+  'a',
+  'b',
+   );

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.1.inc.fixed Changed

@@ -511,14 +511,63 @@
        static fn () : string => '',
       );
 
-$foo = 
+$foo = array(
         'foo' => match ($anything) {
             'foo' => 'bar',
             default => null,
         },
-       ;
+       );
 
 // Intentional syntax error.
 $a = array(
       'a' =>
      );
+
+// Safeguard correct errors for key/no key when PHP 7.4+ array unpacking is encountered.
+$x = array(
+    ...$a,
+      'foo' => 'bar',
+     );
+
+$x = array(
+      'foo' => 'bar',
+    ...$a,
+     );
+
+$x = array(
+      'foo' => 'bar',
+    ...$a,
+      'baz' => 'bar',
+     );
+
+$x = array(
+    ...$a,
+    'foo' => 'bar', // OK.
+    'bar', // NoKeySpecified Error (based on second entry).
+     );
+
+$x = array(
+    ...$a,
+    'bar', // OK.
+    'foo' => 'bar', // KeySpecified Error (based on second entry).
+     );
+
+$x = array(
+    'foo' => 'bar',
+    ...$a,
+    'baz' => 'bar',
+    'bar', // NoKeySpecified Error (based on first entry).
+     );
+
+$x = array(
+    'bar',
+    ...$a,
+    'bar',
+    'baz' => 'bar', // KeySpecified (based on first entry).
+     );
+
+ $x =
+ array(
+  'a',
+  'b',
+ );

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc Changed

@@ -464,7 +464,63 @@
        static fn () : string => '',
       ;
 
+$foo = 
+        'foo' => match ($anything) {
+            'foo' => 'bar',
+            default => null,
+        },
+       ;
+
 // Intentional syntax error.
 $a = 
       'a' =>
      ;
+
+// Safeguard correct errors for key/no key when PHP 7.4+ array unpacking is encountered.
+$x = 
+    ...$a,
+      'foo' => 'bar',
+     ;
+
+$x = 
+      'foo' => 'bar',
+    ...$a,
+     ;
+
+$x = 
+      'foo' => 'bar',
+    ...$a,
+      'baz' => 'bar',
+     ;
+
+$x = 
+    ...$a,
+    'foo' => 'bar', // OK.
+    'bar', // NoKeySpecified Error (based on second entry).
+     ;
+
+$x = 
+    ...$a,
+    'bar', // OK.
+    'foo' => 'bar', // KeySpecified Error (based on second entry).
+     ;
+
+$x = 
+    'foo' => 'bar',
+    ...$a,
+    'baz' => 'bar',
+    'bar', // NoKeySpecified Error (based on first entry).
+     ;
+
+$x = 
+    'bar',
+    ...$a,
+    'bar',
+    'baz' => 'bar', // KeySpecified (based on first entry).
+     ;
+
+ $x =
+ 
+  'a',
+  'b',
+   ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.2.inc.fixed Changed

@@ -498,7 +498,63 @@
        static fn () : string => '',
       ;
 
+$foo = 
+        'foo' => match ($anything) {
+            'foo' => 'bar',
+            default => null,
+        },
+       ;
+
 // Intentional syntax error.
 $a = 
       'a' =>
      ;
+
+// Safeguard correct errors for key/no key when PHP 7.4+ array unpacking is encountered.
+$x = 
+    ...$a,
+      'foo' => 'bar',
+     ;
+
+$x = 
+      'foo' => 'bar',
+    ...$a,
+     ;
+
+$x = 
+      'foo' => 'bar',
+    ...$a,
+      'baz' => 'bar',
+     ;
+
+$x = 
+    ...$a,
+    'foo' => 'bar', // OK.
+    'bar', // NoKeySpecified Error (based on second entry).
+     ;
+
+$x = 
+    ...$a,
+    'bar', // OK.
+    'foo' => 'bar', // KeySpecified Error (based on second entry).
+     ;
+
+$x = 
+    'foo' => 'bar',
+    ...$a,
+    'baz' => 'bar',
+    'bar', // NoKeySpecified Error (based on first entry).
+     ;
+
+$x = 
+    'bar',
+    ...$a,
+    'bar',
+    'baz' => 'bar', // KeySpecified (based on first entry).
+     ;
+
+ $x =
+ 
+  'a',
+  'b',
+ ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Arrays/ArrayDeclarationUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Arrays;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ArrayDeclaration sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Arrays\ArrayDeclarationSniff
+ */
 class ArrayDeclarationUnitTest extends AbstractSniffUnitTest
 {
 
@@ -124,6 +129,11 @@
                 467 => 1,
                 471 => 1,
                 472 => 1,
+                510 => 1,
+                516 => 1,
+                523 => 1,
+                530 => 1,
+                537 => 1,
             ;
         case 'ArrayDeclarationUnitTest.2.inc':
             return 
@@ -210,6 +220,11 @@
                 456 => 1,
                 460 => 1,
                 461 => 1,
+                499 => 1,
+                505 => 1,
+                512 => 1,
+                519 => 1,
+                526 => 1,
             ;
         default:
             return ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/ClassDefinitionClosingBraceSpaceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/ClassDefinitionNameSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/ClassDefinitionOpeningBraceSpaceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/ColonSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/ColourDefinitionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/DisallowMultipleStyleDefinitionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/DuplicateStyleDefinitionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/EmptyClassDefinitionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/EmptyStyleDefinitionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/ForbiddenStylesUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/IndentationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/LowercaseStyleDefinitionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/MissingColonUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/NamedColoursUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/OpacityUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/SemicolonSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/CSS/ShorthandSizeUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/ClassDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/ClassFileNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/DuplicatePropertyUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/LowercaseClassKeywordsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClassCommentUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ClassComment sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\ClassCommentSniff
+ */
 class ClassCommentUnitTest extends AbstractSniffUnitTest
 {
 
@@ -26,10 +31,12 @@
     public function getErrorList()
     {
         return 
-            2  => 1,
-            15 => 1,
-            31 => 1,
-            54 => 1,
+            2   => 1,
+            15  => 1,
+            31  => 1,
+            54  => 1,
+            143 => 1,
+            145 => 1,
         ;
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/DocCommentAlignmentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/EmptyCatchCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.js.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.10.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the FileComment sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\FileCommentSniff
+ */
 class FileCommentUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='FileCommentUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'FileCommentUnitTest.1.inc':
@@ -46,6 +51,7 @@
         case 'FileCommentUnitTest.6.inc':
         case 'FileCommentUnitTest.7.inc':
         case 'FileCommentUnitTest.9.inc':
+        case 'FileCommentUnitTest.10.inc':
             return 1 => 1;
 
         case 'FileCommentUnitTest.5.inc':

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FunctionCommentThrowTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc Changed

@@ -1046,3 +1046,91 @@
  * @return void
  * @throws Exception If any other error occurs. */
 function throwCommentOneLine() {}
+
+/**
+ * When two adjacent pipe symbols are used (by mistake), the sniff should not throw a PHP Fatal error
+ *
+ * @param stdClass||null $object While invalid, this should not throw a PHP Fatal error.
+ * @return void
+ */
+function doublePipeFatalError(?stdClass $object) {}
+
+/**
+ * Test for passing variables by reference
+ *
+ * This sniff treats the '&' as optional for parameters passed by reference, but
+ * forbidden for parameters which are not passed by reference.
+ *
+ * Because mismatches may be in either direction, we cannot auto-fix these.
+ *
+ * @param string $foo    A string passed in by reference.
+ * @param string &$bar   A string passed in by reference.
+ * @param string $baz    A string NOT passed in by reference.
+ * @param string &$qux   A string NOT passed in by reference.
+ * @param string &$case1 A string passed in by reference with a case mismatch.
+ * @param string &$CASE2 A string NOT passed in by reference, also with a case mismatch.
+ *
+ * @return void
+ */
+public function variablesPassedByReference(&$foo, &$bar, $baz, $qux, &$CASE1, $case2)
+{
+    return;
+}
+
+/**
+ * Test for param tag containing ref, but param in declaration not being by ref.
+ *
+ * @param string &$foo This should be flagged as (only) ParamNameUnexpectedAmpersandPrefix.
+ * @param string &$bar This should be flagged as (only) ParamNameNoMatch.
+ * @param string &$baz This should be flagged as (only) ParamNameNoCaseMatch.
+ *
+ * @return void
+ */
+function passedByRefMismatch($foo, $bra, $BAZ) {
+	return;
+}
+
+/**
+ * Test variable case
+ *
+ * @param string $foo         This parameter is lowercase.
+ * @param string $BAR         This parameter is UPPERCASE.
+ * @param string $BazQux      This parameter is TitleCase.
+ * @param string $corgeGrault This parameter is camelCase.
+ * @param string $GARPLY      This parameter should be in lowercase.
+ * @param string $waldo       This parameter should be in TitleCase.
+ * @param string $freD        This parameter should be in UPPERCASE.
+ * @param string $PLUGH       This parameter should be in TitleCase.
+ *
+ * @return void
+ */
+public function variableCaseTest(
+    $foo,
+    $BAR,
+    $BazQux,
+    $corgeGrault,
+    $garply,
+    $Waldo,
+    $FRED,
+    $PluGh
+) {
+    return;
+}
+
+/**
+ * Test variable order mismatch
+ *
+ * @param string $foo This is the third parameter.
+ * @param string $bar This is the first parameter.
+ * @param string $baz This is the second parameter.
+ *
+ * @return void
+ */
+public function variableOrderMismatch($bar, $baz, $foo) {
+    return;
+}
+
+/**
+ * @return never
+ */
+function foo() {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.inc.fixed Changed

@@ -1046,3 +1046,91 @@
  * @return void
  * @throws Exception If any other error occurs. */
 function throwCommentOneLine() {}
+
+/**
+ * When two adjacent pipe symbols are used (by mistake), the sniff should not throw a PHP Fatal error
+ *
+ * @param stdClass|null $object While invalid, this should not throw a PHP Fatal error.
+ * @return void
+ */
+function doublePipeFatalError(?stdClass $object) {}
+
+/**
+ * Test for passing variables by reference
+ *
+ * This sniff treats the '&' as optional for parameters passed by reference, but
+ * forbidden for parameters which are not passed by reference.
+ *
+ * Because mismatches may be in either direction, we cannot auto-fix these.
+ *
+ * @param string $foo    A string passed in by reference.
+ * @param string &$bar   A string passed in by reference.
+ * @param string $baz    A string NOT passed in by reference.
+ * @param string &$qux   A string NOT passed in by reference.
+ * @param string &$case1 A string passed in by reference with a case mismatch.
+ * @param string &$CASE2 A string NOT passed in by reference, also with a case mismatch.
+ *
+ * @return void
+ */
+public function variablesPassedByReference(&$foo, &$bar, $baz, $qux, &$CASE1, $case2)
+{
+    return;
+}
+
+/**
+ * Test for param tag containing ref, but param in declaration not being by ref.
+ *
+ * @param string &$foo This should be flagged as (only) ParamNameUnexpectedAmpersandPrefix.
+ * @param string &$bar This should be flagged as (only) ParamNameNoMatch.
+ * @param string &$baz This should be flagged as (only) ParamNameNoCaseMatch.
+ *
+ * @return void
+ */
+function passedByRefMismatch($foo, $bra, $BAZ) {
+	return;
+}
+
+/**
+ * Test variable case
+ *
+ * @param string $foo         This parameter is lowercase.
+ * @param string $BAR         This parameter is UPPERCASE.
+ * @param string $BazQux      This parameter is TitleCase.
+ * @param string $corgeGrault This parameter is camelCase.
+ * @param string $GARPLY      This parameter should be in lowercase.
+ * @param string $waldo       This parameter should be in TitleCase.
+ * @param string $freD        This parameter should be in UPPERCASE.
+ * @param string $PLUGH       This parameter should be in TitleCase.
+ *
+ * @return void
+ */
+public function variableCaseTest(
+    $foo,
+    $BAR,
+    $BazQux,
+    $corgeGrault,
+    $garply,
+    $Waldo,
+    $FRED,
+    $PluGh
+) {
+    return;
+}
+
+/**
+ * Test variable order mismatch
+ *
+ * @param string $foo This is the third parameter.
+ * @param string $bar This is the first parameter.
+ * @param string $baz This is the second parameter.
+ *
+ * @return void
+ */
+public function variableOrderMismatch($bar, $baz, $foo) {
+    return;
+}
+
+/**
+ * @return never
+ */
+function foo() {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FunctionCommentUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the FunctionComment sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\FunctionCommentSniff
+ */
 class FunctionCommentUnitTest extends AbstractSniffUnitTest
 {
 
@@ -48,8 +53,7 @@
             138  => 4,
             139  => 4,
             143  => 2,
-            152  => 1,
-            155  => 2,
+            155  => 1,
             159  => 1,
             166  => 1,
             173  => 1,
@@ -116,6 +120,23 @@
             1004 => 2,
             1006 => 1,
             1029 => 1,
+            1053 => 1,
+            1058 => 2,
+            1069 => 1,
+            1070 => 1,
+            1071 => 1,
+            1080 => 2,
+            1083 => 1,
+            1084 => 1,
+            1085 => 1,
+            1093 => 4,
+            1100 => 1,
+            1101 => 1,
+            1102 => 1,
+            1103 => 1,
+            1123 => 1,
+            1124 => 1,
+            1125 => 1,
         ;
 
         // Scalar type hints only work from PHP 7 onwards.
@@ -131,12 +152,16 @@
             $errors575  = 2;
             $errors627  = 1;
             $errors1002 = 1;
+            $errors1075 = 6;
+            $errors1089 = 3;
+            $errors1107 = 8;
+            $errors1129 = 3;
         } else {
             $errors729 = 4;
             $errors740 = 2;
             $errors752 = 2;
             $errors982 = 1;
-        }
+        }//end if
 
         // Object type hints only work from PHP 7.2 onwards.
         if (PHP_VERSION_ID >= 70200) {

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/InlineCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/LongConditionClosingCommentUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Commenting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the LongConditionClosingComment sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Commenting\LongConditionClosingCommentSniff
+ */
 class LongConditionClosingCommentUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='LongConditionClosingCommentUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'LongConditionClosingCommentUnitTest.inc':
@@ -60,7 +65,7 @@
                 1008 => 1,
                 1032 => 1,
             ;
-            break;
+
         case 'LongConditionClosingCommentUnitTest.js':
             return 
                 47  => 1,
@@ -76,10 +81,9 @@
                 439 => 1,
                 444 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/PostStatementCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/VariableCommentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\ControlStructures;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ControlSignature sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ControlSignatureSniff
+ */
 class ControlSignatureUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='ControlSignatureUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         $errors = 
             7   => 1,
@@ -77,6 +82,8 @@
             $errors279 = 1;
             $errors283 = 1;
             $errors306 = 3;
+            $errors309 = 1;
+            $errors315 = 1;
         }//end if
 
         return $errors;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ElseIfDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForEachLoopDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/ForLoopDeclarationUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\ControlStructures;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ForLoopDeclaration sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ForLoopDeclarationSniff
+ */
 class ForLoopDeclarationUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='ForLoopDeclarationUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'ForLoopDeclarationUnitTest.inc':
@@ -113,7 +118,7 @@
      *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='ForLoopDeclarationUnitTest.inc')
+    public function getWarningList($testFile='')
     {
         switch ($testFile) {
         case 'ForLoopDeclarationUnitTest.inc':

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/InlineIfDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/LowercaseDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\ControlStructures;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the SwitchDeclaration sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\SwitchDeclarationSniff
+ */
 class SwitchDeclarationUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='SwitchDeclarationUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'SwitchDeclarationUnitTest.inc':
@@ -138,7 +143,7 @@
      *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='SwitchDeclarationUnitTest.inc')
+    public function getWarningList($testFile='')
     {
         if ($testFile === 'SwitchDeclarationUnitTest.js') {
             return 273 => 1;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Debug/JSLintUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Debug/JavaScriptLintUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Files/FileExtensionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Formatting;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the OperatorBracket sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Formatting\OperatorBracketSniff
+ */
 class OperatorBracketUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='OperatorBracketUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'OperatorBracketUnitTest.inc':
@@ -73,7 +78,7 @@
                 193 => 1,
                 194 => 2,
             ;
-            break;
+
         case 'OperatorBracketUnitTest.js':
             return 
                 5   => 1,
@@ -90,10 +95,9 @@
                 63  => 1,
                 108 => 1,
             ;
-             break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/FunctionDeclarationArgumentSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/FunctionDeclarationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/FunctionDuplicateArgumentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/GlobalFunctionUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/LowercaseFunctionKeywordsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc Changed

@@ -255,3 +255,50 @@
     ) {
     }
 }
+
+// PHP 8.1: new in initializers means that class instantiations with parameters can occur in a function declaration.
+function usingNewInInitializersCallParamsIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+        new InjectedDependencyA(),
+        new InjectedDependencyB
+    )
+) {}
+
+function usingNewInInitializersCallParamsNotIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+    new InjectedDependencyA,
+    new InjectedDependencyB()
+    )
+) {}
+
+function usingNewInInitializersCallParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+new InjectedDependencyA(), new InjectedDependencyB()
+)
+) {}
+
+class UsingNewInInitializers {
+    public function doSomething(
+        object $paramA,
+        stdClass $paramB = new stdClass(),
+        Exception $paramC = new Exception(
+            new ExceptionMessage(),
+            new ExceptionCode(),
+        ),
+    ) {
+    }
+
+    public function callParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+        Exception $param = new Exception(
+new ExceptionMessage(),
+    new ExceptionCode(),
+  ),
+    ) {
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.inc.fixed Changed

@@ -267,3 +267,50 @@
     ) {
     }
 }
+
+// PHP 8.1: new in initializers means that class instantiations with parameters can occur in a function declaration.
+function usingNewInInitializersCallParamsIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+        new InjectedDependencyA(),
+        new InjectedDependencyB
+    )
+) {}
+
+function usingNewInInitializersCallParamsNotIndented(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+    new InjectedDependencyA,
+    new InjectedDependencyB()
+    )
+) {}
+
+function usingNewInInitializersCallParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+    int $paramA,
+    string $paramB,
+    object $paramC = new SomeClass(
+new InjectedDependencyA(), new InjectedDependencyB()
+)
+) {}
+
+class UsingNewInInitializers {
+    public function doSomething(
+        object $paramA,
+        stdClass $paramB = new stdClass(),
+        Exception $paramC = new Exception(
+            new ExceptionMessage(),
+            new ExceptionCode(),
+        ),
+    ) {
+    }
+
+    public function callParamsIncorrectlyIndentedShouldNotBeFlaggedNorFixed(
+        Exception $param = new Exception(
+new ExceptionMessage(),
+    new ExceptionCode(),
+  ),
+    ) {
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Functions/MultiLineFunctionDeclarationUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Functions;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the MultiLineFunctionDeclaration sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\MultiLineFunctionDeclarationSniff
+ */
 class MultiLineFunctionDeclarationUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='MultiLineFunctionDeclarationUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         if ($testFile === 'MultiLineFunctionDeclarationUnitTest.inc') {
             $errors =

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/NamingConventions/ValidFunctionNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/NamingConventions/ValidVariableNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Objects/DisallowObjectStringIndexUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Objects/ObjectInstantiationUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Objects/ObjectMemberCommaUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\Operators;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ComparisonOperatorUsage sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\Operators\ComparisonOperatorUsageSniff
+ */
 class ComparisonOperatorUsageUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='ComparisonOperatorUsageUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'ComparisonOperatorUsageUnitTest.inc':
@@ -59,7 +64,7 @@
                 131 => 1,
                 135 => 1,
             ;
-            break;
+
         case 'ComparisonOperatorUsageUnitTest.js':
             return 
                 5  => 1,
@@ -74,10 +79,9 @@
                 67 => 1,
                 71 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Operators/IncrementDecrementUsageUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/CommentedOutCodeUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the CommentedOutCode sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\CommentedOutCodeSniff
+ */
 class CommentedOutCodeUnitTest extends AbstractSniffUnitTest
 {
 
@@ -40,7 +45,7 @@
      *
      * @return array<int, int>
      */
-    public function getWarningList($testFile='CommentedOutCodeUnitTest.inc')
+    public function getWarningList($testFile='')
     {
         switch ($testFile) {
         case 'CommentedOutCodeUnitTest.inc':
@@ -58,16 +63,15 @@
                 147 => 1,
                 158 => 1,
             ;
-            break;
+
         case 'CommentedOutCodeUnitTest.css':
             return 
                 7  => 1,
                 16 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowBooleanStatementUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowInlineIfUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the DisallowObEndFlush sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\DisallowInlineIfSniff
+ */
 class DisallowInlineIfUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='DisallowInlineIfUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'DisallowInlineIfUnitTest.inc':
@@ -33,13 +38,12 @@
                 8  => 1,
                 18 => 1,
             ;
-            break;
+
         case 'DisallowInlineIfUnitTest.js':
             return 1 => 1;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowMultipleAssignmentsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowSizeFunctionsInLoopsUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the DisallowSizeFunctionsInLoops sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\DisallowSizeFunctionsInLoopsSniff
+ */
 class DisallowSizeFunctionsInLoopsUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='DisallowSizeFunctionsInLoopsUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'DisallowSizeFunctionsInLoopsUnitTest.inc':
@@ -43,13 +48,12 @@
                 44 => 1,
                 46 => 1,
             ;
-            break;
+
         case 'DisallowSizeFunctionsInLoopsUnitTest.js':
             return 1 => 1;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DiscouragedFunctionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/EmbeddedPhpUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/EvalUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/GlobalKeywordUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.1.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.inc Deleted

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/HeredocUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the Heredoc sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\HeredocSniff
+ */
 class HeredocUnitTest extends AbstractSniffUnitTest
 {
 
@@ -21,14 +26,22 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            2 => 1,
-            8 => 1,
-        ;
+        switch ($testFile) {
+        case 'HeredocUnitTest.1.inc':
+            return 
+                2 => 1,
+                8 => 1,
+            ;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/InnerFunctionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/LowercasePHPFunctionsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.1.inc Changed

@@ -297,5 +297,124 @@
 $var_after_class_in_global_space = 1;
 do_something_else();
 
-// Intentional syntax error.
-return array_map(
+// These are parse errors, but that's not the concern of the sniff.
+function parseError1() {
+    defined('FOO') or return 'foo';
+    echo 'unreachable';
+}
+
+function parseError2() {
+    defined('FOO') || continue;
+    echo 'unreachable';
+}
+
+// All logical operators are allowed with inline expressions (but this was not correctly handled by the sniff).
+function exitExpressionsWithLogicalOperators() {
+    $condition = false;
+    $condition || exit();
+    $condition or die();
+
+    $condition = true;
+    $condition && die();
+    $condition and exit;
+
+    $condition xor die();
+
+    echo 'still executable as exit, in all of the above cases, is used as part of an expression';
+}
+
+// Inline expressions are allowed in ternaries.
+function exitExpressionsInTernary() {
+    $value = $myValue ? $myValue : exit();
+    $value = $myValue ?: exit();
+    $value = $var == 'foo' ? 'bar' : die( 'world' );
+
+    $value = (!$myValue ) ? exit() : $myValue;
+    $value = $var != 'foo' ? die( 'world' ) : 'bar';
+
+    echo 'still executable';
+}
+
+// Inline expressions are allowed with null coalesce and null coalesce equals.
+function exitExpressionsWithNullCoalesce() {
+    $value = $nullableValue ?? exit();
+    $value ??= die();
+    echo 'still executable';
+}
+
+// Inline expressions are allowed in arrow functions.
+function exitExpressionsInArrowFunction() {
+    $callable = fn() => die();
+    echo 'still executable';
+}
+
+// PHP 8.0+: throw expressions which don't stop execution.
+function nonStoppingThrowExpressions() {
+    $callable = fn() => throw new Exception();
+
+    $value = $myValue ? 'something' : throw new Exception();
+    $value = $myValue ?: throw new Exception();
+    $value = $myValue ? throw new Exception() : 'something';
+
+    $value = $nullableValue ?? throw new Exception();
+    $value ??= throw new Exception();
+
+    $condition && throw new Exception();
+    $condition || throw new Exception();
+    $condition and throw new Exception();
+    $condition or throw new Exception();
+
+    echo 'still executable as throw, in all of the above cases, is used as part of an expression';
+
+    throw new Exception();
+    echo 'non-executable';
+}
+
+// PHP 8.0+: throw expressions which do stop execution.
+function executionStoppingThrowExpressionsA() {
+    $condition xor throw new Exception();
+    echo 'non-executable';
+}
+
+function executionStoppingThrowExpressionsB() {
+    throw $userIsAuthorized ? new ForbiddenException() : new UnauthorizedException();
+    echo 'non-executable';
+}
+
+function executionStoppingThrowExpressionsC() {
+    throw $condition1 && $condition2 ? new Exception1() : new Exception2();
+    echo 'non-executable';
+}
+
+function executionStoppingThrowExpressionsD() {
+    throw $exception ??= new Exception();
+    echo 'non-executable';
+}
+
+function executionStoppingThrowExpressionsE() {
+    throw $maybeNullException ?? new Exception();
+    echo 'non-executable';
+}
+
+function returnNotRequiredIgnoreCommentsA()
+{
+    if ($something === TRUE) {
+        return /*comment*/;
+    }
+
+    echo 'foo';
+    return /*comment*/;
+}
+
+function returnNotRequiredIgnoreCommentsB()
+{
+    echo 'foo';
+    return;
+    /*comment*/
+}
+
+$closure = function ()
+{
+    echo 'foo';
+    return; // This return should be flagged as not required.
+};

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.2.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.3.inc Added

@@ -0,0 +1,64 @@
+
+<?php if (true): ?>
+    <?php foreach ( as $item): ?>
+        <?php continue; ?>
+    <?php endforeach; ?>
+<?php endif; ?>
+
+
+<?php if (true) { ?>
+    <?php foreach ( as $item) { ?>
+        <?php continue; ?>
+    <?php } ?>
+<?php } ?>
+
+
+<?php if (true) { ?>
+    <?php foreach ( as $item) { ?>
+        
+        <?php continue ?>
+    <?php } ?>
+<?php } ?>
+
+
+<?php if (true): ?>
+    <?php foreach ( as $item): ?>
+        <?php continue; ?>
+        <div>non-executable</div>
+    <?php endforeach; ?>
+<?php endif; ?>
+
+
+<?php if (true): ?>
+    <?php foreach ( as $item): ?>
+        
+        <?php continue ?>
+        <div>non-executable</div>
+    <?php endforeach; ?>
+<?php endif; ?>
+
+
+<?php if (true): ?>
+    <?php foreach ( as $item): ?>
+        <?php continue; ?>
+
+        <div>non-executable</div>
+
+    <?php endforeach; ?>
+<?php endif; ?>
+
+
+<?php if (true): ?>
+    <?php foreach ( as $item): ?>
+        <?php continue; ?>
+        <?= 'unreachable - no semicolon' ?>
+    <?php endforeach; ?>
+<?php endif; ?>
+
+
+<?php if (true): ?>
+    <?php foreach ( as $item): ?>
+        <?php continue; ?>
+        <?= 'unreachable - with semicolon'; ?>
+    <?php endforeach; ?>
+<?php endif; ?>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.4.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/NonExecutableCodeUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\PHP;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the NonExecutableCode sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\PHP\NonExecutableCodeSniff
+ */
 class NonExecutableCodeUnitTest extends AbstractSniffUnitTest
 {
 
@@ -74,8 +79,19 @@
                 252 => 1,
                 253 => 1,
                 254 => 2,
+                303 => 1,
+                308 => 1,
+                370 => 1,
+                376 => 1,
+                381 => 1,
+                386 => 1,
+                391 => 1,
+                396 => 1,
+                406 => 1,
+                412 => 1,
+                419 => 1,
             ;
-            break;
+
         case 'NonExecutableCodeUnitTest.2.inc':
             return 
                 7  => 1,
@@ -84,11 +100,22 @@
                 10 => 2,
                 14 => 1,
                 54 => 2,
+                65 => 2,
+                69 => 2,
+                70 => 2,
+                71 => 2,
+            ;
+
+        case 'NonExecutableCodeUnitTest.3.inc':
+            return 
+                27 => 1,
+                36 => 1,
+                45 => 1,
+                54 => 1,
+                62 => 1,
             ;
-            break;
         default:
             return ;
-            break;
         }//end switch
 
     }//end getWarningList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Scope/MemberVarScopeUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Scope/MethodScopeUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Scope/StaticThisUsageUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Strings/ConcatenationSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Strings/DoubleQuoteUsageUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Strings/EchoedStringsUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/CastSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ControlStructureSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ControlStructureSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ControlStructureSpacingSniff
+ */
 class ControlStructureSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='ControlStructureSpacingUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'ControlStructureSpacingUnitTest.inc':
@@ -61,7 +66,7 @@
                 261 => 1,
                 262 => 1,
             ;
-            break;
+
         case 'ControlStructureSpacingUnitTest.js':
             return 
                 3  => 1,
@@ -76,10 +81,9 @@
                 74 => 2,
                 75 => 2,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/FunctionClosingBraceSpaceUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the FunctionClosingBraceSpace sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\FunctionClosingBraceSpaceSniff
+ */
 class FunctionClosingBraceSpaceUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='FunctionClosingBraceSpaceUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'FunctionClosingBraceSpaceUnitTest.inc':
@@ -37,7 +42,7 @@
                 31 => 1,
                 39 => 1,
             ;
-            break;
+
         case 'FunctionClosingBraceSpaceUnitTest.js':
             return 
                 13  => 1,
@@ -49,10 +54,9 @@
                 84  => 1,
                 128 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/FunctionOpeningBraceSpaceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.1.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.1.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/FunctionSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/LanguageConstructSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/LogicalOperatorSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the LogicalOperatorSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\LogicalOperatorSpacingSniff
+ */
 class LogicalOperatorSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -21,11 +26,9 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
-     * @param string $testFile The name of the file being tested.
-     *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='LogicalOperatorSpacingUnitTest.inc')
+    public function getErrorList()
     {
         return 
             4  => 2,

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/MemberVarSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ObjectOperatorSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the OperatorSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\OperatorSpacingSniff
+ */
 class OperatorSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='OperatorSpacingUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'OperatorSpacingUnitTest.inc':
@@ -100,7 +105,7 @@
                 266 => 2,
                 271 => 2,
             ;
-            break;
+
         case 'OperatorSpacingUnitTest.js':
             return 
                 4   => 1,
@@ -143,10 +148,9 @@
                 100 => 1,
                 103 => 2,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/PropertyLabelSpacingUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeClosingBraceUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc Added

@@ -0,0 +1,141 @@
+<?php
+class MyClass
+{
+    public static $var = null;
+    protected $var = null;
+
+    public   static  $var = null;
+    protected  $var = null;
+
+    private function myFunction() {}
+    public static function myFunction() {}
+
+    private   function myFunction() {}
+    public  static function myFunction() {}
+    private static   function myFunction() {}
+
+    private  static
+        function myFunction() {}
+
+    public static function output()
+    {
+        // New in PHP 5.3
+        static::bar();
+    }
+
+    public static$var = null;
+
+    public
+    static
+    $var = null;
+}
+
+abstract class Foo
+{
+    public static function getInstance()
+    {
+        return new static();
+    }
+}
+
+if ($geometry instanceof static      || $geometry instanceof static) {
+    echo 'foo';
+}
+
+class MyClass1 {
+    use HelloWorld { sayHello as private; }
+}
+
+abstract class Foo
+{
+    public static function getInstance()
+    {
+        return new /* comment */   static();
+    }
+
+    public static function output()
+    {
+        static   /* comment */ :: bar();
+    }
+}
+
+class MyOtherClass
+{
+    public
+        $varK = array( 'a', 'b' );
+
+    protected    $varK,
+        $varL,
+        $varM;
+
+    protected static
+        $varK, $varL, $varM;
+
+    private
+        $varO = true,
+        $varP = array( 'a' => 'a', 'b' => 'b' ),
+        $varQ = 'string',
+        $varR = 123;
+
+    // Intentionally missing a semi-colon for testing.
+    public
+        $varS,
+        $varT
+}
+
+// Issue #3188 - static as return type.
+public static function fCreate($attributes = ): static
+{
+    return static::factory()->create($attributes);
+}
+
+public static function fCreate($attributes = ): ?static
+{
+    return static::factory()->create($attributes);
+}
+
+// Also account for static used within union types.
+public function staticLast($attributes = ): object|static {}
+public function staticMiddle(): string|static|object {}
+public function staticFirst(): static|object {}
+
+// Ensure that static as a scope keyword when preceeded by a colon which is not for a type declaration is still handled.
+$callback = $cond ? get_fn_name() : static  function ($a) { return $a * 10; };
+
+class TypedProperties {
+    public
+        int $var;
+
+    protected string $stringA, $stringB;
+
+    private   bool
+        $boolA,
+        $boolB;
+}
+
+// PHP 8.0 constructor property promotion.
+class ConstructorPropertyPromotionTest {
+    public function __construct(
+        public    $x = 0.0,
+        protected $y = '',
+        private   $z = null,
+        $normalParam,
+    ) {}
+}
+
+class ConstructorPropertyPromotionWithTypesTest {
+    public function __construct(protected   float|int $x, public?string &$y = 'test', private mixed $z) {}
+}
+
+// PHP 8.1 readonly keywords.
+class ReadonlyTest {
+    public readonly int $publicReadonlyProperty;
+
+    protected    readonly    int $protectedReadonlyProperty;
+
+    readonly protected int $protectedReadonlyProperty;
+
+    readonly   private   int $privateReadonlyProperty;
+
+    public function __construct(readonly  protected  float|int $x, public readonly?string &$y = 'test') {}
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed Added

@@ -0,0 +1,135 @@
+<?php
+class MyClass
+{
+    public static $var = null;
+    protected $var = null;
+
+    public static $var = null;
+    protected $var = null;
+
+    private function myFunction() {}
+    public static function myFunction() {}
+
+    private function myFunction() {}
+    public static function myFunction() {}
+    private static function myFunction() {}
+
+    private static function myFunction() {}
+
+    public static function output()
+    {
+        // New in PHP 5.3
+        static::bar();
+    }
+
+    public static $var = null;
+
+    public static $var = null;
+}
+
+abstract class Foo
+{
+    public static function getInstance()
+    {
+        return new static();
+    }
+}
+
+if ($geometry instanceof static      || $geometry instanceof static) {
+    echo 'foo';
+}
+
+class MyClass1 {
+    use HelloWorld { sayHello as private; }
+}
+
+abstract class Foo
+{
+    public static function getInstance()
+    {
+        return new /* comment */   static();
+    }
+
+    public static function output()
+    {
+        static   /* comment */ :: bar();
+    }
+}
+
+class MyOtherClass
+{
+    public $varK = array( 'a', 'b' );
+
+    protected $varK,
+        $varL,
+        $varM;
+
+    protected static $varK, $varL, $varM;
+
+    private
+        $varO = true,
+        $varP = array( 'a' => 'a', 'b' => 'b' ),
+        $varQ = 'string',
+        $varR = 123;
+
+    // Intentionally missing a semi-colon for testing.
+    public
+        $varS,
+        $varT
+}
+
+// Issue #3188 - static as return type.
+public static function fCreate($attributes = ): static
+{
+    return static::factory()->create($attributes);
+}
+
+public static function fCreate($attributes = ): ?static
+{
+    return static::factory()->create($attributes);
+}
+
+// Also account for static used within union types.
+public function staticLast($attributes = ): object|static {}
+public function staticMiddle(): string|static|object {}
+public function staticFirst(): static|object {}
+
+// Ensure that static as a scope keyword when preceeded by a colon which is not for a type declaration is still handled.
+$callback = $cond ? get_fn_name() : static function ($a) { return $a * 10; };
+
+class TypedProperties {
+    public int $var;
+
+    protected string $stringA, $stringB;
+
+    private bool
+        $boolA,
+        $boolB;
+}
+
+// PHP 8.0 constructor property promotion.
+class ConstructorPropertyPromotionTest {
+    public function __construct(
+        public $x = 0.0,
+        protected $y = '',
+        private $z = null,
+        $normalParam,
+    ) {}
+}
+
+class ConstructorPropertyPromotionWithTypesTest {
+    public function __construct(protected float|int $x, public ?string &$y = 'test', private mixed $z) {}
+}
+
+// PHP 8.1 readonly keywords.
+class ReadonlyTest {
+    public readonly int $publicReadonlyProperty;
+
+    protected readonly int $protectedReadonlyProperty;
+
+    readonly protected int $protectedReadonlyProperty;
+
+    readonly private int $privateReadonlyProperty;
+
+    public function __construct(readonly protected float|int $x, public readonly ?string &$y = 'test') {}
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.2.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.3.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.3.inc.fixed Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.inc Deleted

@@ -1,141 +0,0 @@
-<?php
-class MyClass
-{
-    public static $var = null;
-    protected $var = null;
-
-    public   static  $var = null;
-    protected  $var = null;
-
-    private function myFunction() {}
-    public static function myFunction() {}
-
-    private   function myFunction() {}
-    public  static function myFunction() {}
-    private static   function myFunction() {}
-
-    private  static
-        function myFunction() {}
-
-    public static function output()
-    {
-        // New in PHP 5.3
-        static::bar();
-    }
-
-    public static$var = null;
-
-    public
-    static
-    $var = null;
-}
-
-abstract class Foo
-{
-    public static function getInstance()
-    {
-        return new static();
-    }
-}
-
-if ($geometry instanceof static      || $geometry instanceof static) {
-    echo 'foo';
-}
-
-class MyClass1 {
-    use HelloWorld { sayHello as private; }
-}
-
-abstract class Foo
-{
-    public static function getInstance()
-    {
-        return new /* comment */   static();
-    }
-
-    public static function output()
-    {
-        static   /* comment */ :: bar();
-    }
-}
-
-class MyOtherClass
-{
-    public
-        $varK = array( 'a', 'b' );
-
-    protected    $varK,
-        $varL,
-        $varM;
-
-    protected static
-        $varK, $varL, $varM;
-
-    private
-        $varO = true,
-        $varP = array( 'a' => 'a', 'b' => 'b' ),
-        $varQ = 'string',
-        $varR = 123;
-
-    // Intentionally missing a semi-colon for testing.
-    public
-        $varS,
-        $varT
-}
-
-// Issue #3188 - static as return type.
-public static function fCreate($attributes = ): static
-{
-    return static::factory()->create($attributes);
-}
-
-public static function fCreate($attributes = ): ?static
-{
-    return static::factory()->create($attributes);
-}
-
-// Also account for static used within union types.
-public function fCreate($attributes = ): object|static
-{
-}
-
-// Ensure that static as a scope keyword when preceeded by a colon which is not for a type declaration is still handled.
-$callback = $cond ? get_fn_name() : static  function ($a) { return $a * 10; };
-
-class TypedProperties {
-    public
-        int $var;
-
-    protected string $stringA, $stringB;
-
-    private   bool
-        $boolA,
-        $boolB;
-}
-
-// PHP 8.0 constructor property promotion.
-class ConstructorPropertyPromotionTest {
-    public function __construct(
-        public    $x = 0.0,
-        protected $y = '',
-        private   $z = null,
-        $normalParam,
-    ) {}
-}
-
-class ConstructorPropertyPromotionWithTypesTest {
-    public function __construct(protected   float|int $x, public?string &$y = 'test', private mixed $z) {}
-}
-
-// PHP 8.1 readonly keywords.
-class ReadonlyTest {
-    public readonly int $publicReadonlyProperty;
-
-    protected    readonly    int $protectedReadonlyProperty;
-
-    readonly protected int $protectedReadonlyProperty;
-
-    readonly   private   int $privateReadonlyProperty;
-
-    public function __construct(readonly  protected  float|int $x, public readonly?string &$y = 'test') {}
-}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.inc.fixed Deleted

@@ -1,135 +0,0 @@
-<?php
-class MyClass
-{
-    public static $var = null;
-    protected $var = null;
-
-    public static $var = null;
-    protected $var = null;
-
-    private function myFunction() {}
-    public static function myFunction() {}
-
-    private function myFunction() {}
-    public static function myFunction() {}
-    private static function myFunction() {}
-
-    private static function myFunction() {}
-
-    public static function output()
-    {
-        // New in PHP 5.3
-        static::bar();
-    }
-
-    public static $var = null;
-
-    public static $var = null;
-}
-
-abstract class Foo
-{
-    public static function getInstance()
-    {
-        return new static();
-    }
-}
-
-if ($geometry instanceof static      || $geometry instanceof static) {
-    echo 'foo';
-}
-
-class MyClass1 {
-    use HelloWorld { sayHello as private; }
-}
-
-abstract class Foo
-{
-    public static function getInstance()
-    {
-        return new /* comment */   static();
-    }
-
-    public static function output()
-    {
-        static   /* comment */ :: bar();
-    }
-}
-
-class MyOtherClass
-{
-    public $varK = array( 'a', 'b' );
-
-    protected $varK,
-        $varL,
-        $varM;
-
-    protected static $varK, $varL, $varM;
-
-    private
-        $varO = true,
-        $varP = array( 'a' => 'a', 'b' => 'b' ),
-        $varQ = 'string',
-        $varR = 123;
-
-    // Intentionally missing a semi-colon for testing.
-    public
-        $varS,
-        $varT
-}
-
-// Issue #3188 - static as return type.
-public static function fCreate($attributes = ): static
-{
-    return static::factory()->create($attributes);
-}
-
-public static function fCreate($attributes = ): ?static
-{
-    return static::factory()->create($attributes);
-}
-
-// Also account for static used within union types.
-public function fCreate($attributes = ): object|static
-{
-}
-
-// Ensure that static as a scope keyword when preceeded by a colon which is not for a type declaration is still handled.
-$callback = $cond ? get_fn_name() : static function ($a) { return $a * 10; };
-
-class TypedProperties {
-    public int $var;
-
-    protected string $stringA, $stringB;
-
-    private bool
-        $boolA,
-        $boolB;
-}
-
-// PHP 8.0 constructor property promotion.
-class ConstructorPropertyPromotionTest {
-    public function __construct(
-        public $x = 0.0,
-        protected $y = '',
-        private $z = null,
-        $normalParam,
-    ) {}
-}
-
-class ConstructorPropertyPromotionWithTypesTest {
-    public function __construct(protected float|int $x, public ?string &$y = 'test', private mixed $z) {}
-}
-
-// PHP 8.1 readonly keywords.
-class ReadonlyTest {
-    public readonly int $publicReadonlyProperty;
-
-    protected readonly int $protectedReadonlyProperty;
-
-    readonly protected int $protectedReadonlyProperty;
-
-    readonly private int $privateReadonlyProperty;
-
-    public function __construct(readonly protected float|int $x, public readonly ?string &$y = 'test') {}
-}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the ScopeKeywordSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ScopeKeywordSpacingSniff
+ */
 class ScopeKeywordSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -21,33 +26,44 @@
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the file being tested.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return 
-            7   => 2,
-            8   => 1,
-            13  => 1,
-            14  => 1,
-            15  => 1,
-            17  => 2,
-            26  => 1,
-            28  => 1,
-            29  => 1,
-            64  => 1,
-            67  => 1,
-            71  => 1,
-            103 => 1,
-            106 => 1,
-            111 => 1,
-            119 => 1,
-            121 => 1,
-            127 => 2,
-            134 => 2,
-            138 => 2,
-            140 => 3,
-        ;
+        switch ($testFile) {
+        case 'ScopeKeywordSpacingUnitTest.1.inc':
+            return 
+                7   => 2,
+                8   => 1,
+                13  => 1,
+                14  => 1,
+                15  => 1,
+                17  => 2,
+                26  => 1,
+                28  => 1,
+                29  => 1,
+                64  => 1,
+                67  => 1,
+                71  => 1,
+                103 => 1,
+                106 => 1,
+                111 => 1,
+                119 => 1,
+                121 => 1,
+                127 => 2,
+                134 => 2,
+                138 => 2,
+                140 => 3,
+            ;
+
+        case 'ScopeKeywordSpacingUnitTest.3.inc':
+            return 6 => 1;
+
+        default:
+            return ;
+        }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/SemicolonSpacingUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the SemicolonSpacing sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\SemicolonSpacingSniff
+ */
 class SemicolonSpacingUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='SemicolonSpacingUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'SemicolonSpacingUnitTest.inc':
@@ -43,7 +48,7 @@
                 30 => 2,
                 36 => 1,
             ;
-            break;
+
         case 'SemicolonSpacingUnitTest.js':
             return 
                 3  => 1,
@@ -56,10 +61,9 @@
                 22 => 1,
                 25 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.1.css Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.1.css.fixed Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/SuperfluousWhitespaceUnitTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Standards\Squiz\Tests\WhiteSpace;
 
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
+/**
+ * Unit test class for the SuperfluousWhitespace sniff.
+ *
+ * @covers \PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\SuperfluousWhitespaceSniff
+ */
 class SuperfluousWhitespaceUnitTest extends AbstractSniffUnitTest
 {
 
@@ -25,7 +30,7 @@
      *
      * @return array<int, int>
      */
-    public function getErrorList($testFile='SuperfluousWhitespaceUnitTest.inc')
+    public function getErrorList($testFile='')
     {
         switch ($testFile) {
         case 'SuperfluousWhitespaceUnitTest.1.inc':
@@ -44,26 +49,26 @@
                 65 => 1,
                 73 => 1,
             ;
-            break;
+
         case 'SuperfluousWhitespaceUnitTest.2.inc':
             return 
                 2 => 1,
                 8 => 1,
             ;
-            break;
+
         case 'SuperfluousWhitespaceUnitTest.3.inc':
             return 
                 6  => 1,
                 10 => 1,
             ;
-            break;
+
         case 'SuperfluousWhitespaceUnitTest.4.inc':
         case 'SuperfluousWhitespaceUnitTest.5.inc':
             return 
                 1 => 1,
                 4 => 1,
             ;
-            break;
+
         case 'SuperfluousWhitespaceUnitTest.1.js':
             return 
                 1  => 1,
@@ -77,19 +82,18 @@
                 38 => 1,
                 56 => 1,
             ;
-            break;
+
         case 'SuperfluousWhitespaceUnitTest.1.css':
             return 
                 1  => 1,
                 8  => 1,
                 9  => 1,
                 11 => 1,
-                25 => 1,
+                32 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Sniffs/Files/ClosingTagSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Tests/Debug/CodeAnalyzerUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Tests/Files/ClosingTagUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Zend/Tests/NamingConventions/ValidVariableNameUnitTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/CSS.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/Comment.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/JS.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tokenizers;
@@ -905,10 +905,10 @@
      *
      * If a regular expression is not found, NULL is returned.
      *
-     * @param string $char   The index of the possible regex start character.
+     * @param int    $char   The index of the possible regex start character.
      * @param string $string The complete content of the string being tokenized.
-     * @param string $chars  An array of characters being tokenized.
-     * @param string $tokens The current array of tokens found in the string.
+     * @param array  $chars  An array of characters being tokenized.
+     * @param array  $tokens The current array of tokens found in the string.
      *
      * @return array<string, string>|null
      */

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/PHP.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tokenizers;
@@ -306,7 +306,7 @@
     /**
      * Known lengths of tokens.
      *
-     * @var array<int, int>
+     * @var array<string|int, int>
      */
     public $knownLengths = 
         T_ABSTRACT                 => 8,
@@ -682,6 +682,36 @@
             }//end if
 
             /*
+                Special case for `static` used as a function name, i.e. `static()`.
+            */
+
+            if ($tokenIsArray === true
+                && $token0 === T_STATIC
+                && $finalTokens$lastNotEmptyToken'code' !== T_NEW
+            ) {
+                for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
+                    if (is_array($tokens$i) === true
+                        && isset(Util\Tokens::$emptyTokens$tokens$i0) === true
+                    ) {
+                        continue;
+                    }
+
+                    if ($tokens$i0 === '(') {
+                        $finalTokens$newStackPtr = 
+                            'code'    => T_STRING,
+                            'type'    => 'T_STRING',
+                            'content' => $token1,
+                        ;
+
+                        $newStackPtr++;
+                        continue 2;
+                    }
+
+                    break;
+                }
+            }//end if
+
+            /*
                 Parse doc blocks into something that can be easily iterated over.
             */
 
@@ -750,6 +780,7 @@
                 && (isset($tokens($stackPtr + 1)) === true
                 && is_array($tokens($stackPtr + 1)) === true
                 && $tokens($stackPtr + 1)0 === T_STRING
+                && isset($tokens($stackPtr + 1)10, $tokens($stackPtr + 1)11) === true
                 && strtolower($tokens($stackPtr + 1)10) === 'o'
                 && $tokens($stackPtr + 1)11 !== '_')
                 && preg_match('`^(o0-7+(?:_0-7+)?)(0-9_*)$`i', $tokens($stackPtr + 1)1, $matches) === 1
@@ -1282,23 +1313,89 @@
                 "readonly" keyword for PHP < 8.1
             */
 
-            if (PHP_VERSION_ID < 80100
-                && $tokenIsArray === true
+            if ($tokenIsArray === true
                 && strtolower($token1) === 'readonly'
                 && isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === false
             ) {
                 // Get the next non-whitespace token.
                 for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
                     if (is_array($tokens$i) === false
-                        || $tokens$i0 !== T_WHITESPACE
+                        || isset(Util\Tokens::$emptyTokens$tokens$i0) === false
                     ) {
                         break;
                     }
                 }
 
+                $isReadonlyKeyword = false;
+
                 if (isset($tokens$i) === false
                     || $tokens$i !== '('
                 ) {
+                    $isReadonlyKeyword = true;
+                } else if ($tokens$i === '(') {
+                    /*
+                     * Skip over tokens which can be used in type declarations.
+                     * At this point, the only token types which need to be taken into consideration
+                     * as potential type declarations are identifier names, T_ARRAY, T_CALLABLE and T_NS_SEPARATOR
+                     * and the union/intersection/dnf parentheses.
+                     */
+
+                    $foundDNFParens = 1;
+                    $foundDNFPipe   = 0;
+
+                    for (++$i; $i < $numTokens; $i++) {
+                        if (is_array($tokens$i) === true) {
+                            $tokenType = $tokens$i0;
+                        } else {
+                            $tokenType = $tokens$i;
+                        }
+
+                        if (isset(Util\Tokens::$emptyTokens$tokenType) === true) {
+                            continue;
+                        }
+
+                        if ($tokenType === '|') {
+                            ++$foundDNFPipe;
+                            continue;
+                        }
+
+                        if ($tokenType === ')') {
+                            ++$foundDNFParens;
+                            continue;
+                        }
+
+                        if ($tokenType === '(') {
+                            ++$foundDNFParens;
+                            continue;
+                        }
+
+                        if ($tokenType === T_STRING
+                            || $tokenType === T_NAME_FULLY_QUALIFIED
+                            || $tokenType === T_NAME_RELATIVE
+                            || $tokenType === T_NAME_QUALIFIED
+                            || $tokenType === T_ARRAY
+                            || $tokenType === T_NAMESPACE
+                            || $tokenType === T_NS_SEPARATOR
+                            || $tokenType === T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG // PHP 8.0+.
+                            || $tokenType === '&' // PHP < 8.0.
+                        ) {
+                            continue;
+                        }
+
+                        // Reached the next token after.
+                        if (($foundDNFParens % 2) === 0
+                            && $foundDNFPipe >= 1
+                            && ($tokenType === T_VARIABLE
+                            || $tokenType === T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG)
+                        ) {
+                            $isReadonlyKeyword = true;
+                        }
+
+                        break;
+                    }//end for
+                }//end if
+
+                if ($isReadonlyKeyword === true) {
                     $finalTokens$newStackPtr = 
                         'code'    => T_READONLY,
                         'type'    => 'T_READONLY',
@@ -1306,8 +1403,23 @@
                     ;
                     $newStackPtr++;
 
-                    continue;
-                }
+                    if (PHP_CODESNIFFER_VERBOSITY > 1 && $type !== T_READONLY) {
+                        echo "\t\t* token $stackPtr changed from $type to T_READONLY".PHP_EOL;
+                    }
+                } else {
+                    $finalTokens$newStackPtr = 
+                        'code'    => T_STRING,
+                        'type'    => 'T_STRING',
+                        'content' => $token1,
+                    ;
+                    $newStackPtr++;
+
+                    if (PHP_CODESNIFFER_VERBOSITY > 1 && $type !== T_STRING) {
+                        echo "\t\t* token $stackPtr changed from $type to T_STRING".PHP_EOL;
+                    }
+                }//end if
+
+                continue;
             }//end if
 
             /*
@@ -2103,38 +2215,60 @@
                 }
             } else {
                 // Some T_STRING tokens should remain that way due to their context.
-                if ($tokenIsArray === true
-                    && $token0 === T_STRING
-                    && isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true
-                ) {
-                    // Special case for syntax like: return new self/new parent
-                    // where self/parent should not be a string.
-                    $tokenContentLower = strtolower($token1);
-                    if ($finalTokens$lastNotEmptyToken'code' === T_NEW
-                        && ($tokenContentLower === 'self' || $tokenContentLower === 'parent')
-                    ) {
-                        $finalTokens$newStackPtr = 
-                            'content' => $token1,
-                        ;
-                        if ($tokenContentLower === 'self') {
-                            $finalTokens$newStackPtr'code' = T_SELF;
-                            $finalTokens$newStackPtr'type' = 'T_SELF';
+                if ($tokenIsArray === true && $token0 === T_STRING) {
+                    $preserveTstring = false;
+
+                    if (isset($this->tstringContexts$finalTokens$lastNotEmptyToken'code') === true) {
+                        $preserveTstring = true;
+
+                        // Special case for syntax like: return new self/new parent
+                        // where self/parent should not be a string.
+                        $tokenContentLower = strtolower($token1);
+                        if ($finalTokens$lastNotEmptyToken'code' === T_NEW
+                            && ($tokenContentLower === 'self' || $tokenContentLower === 'parent')
+                        ) {
+                            $preserveTstring = false;
                         }
+                    } else if ($finalTokens$lastNotEmptyToken'content' === '&') {
+                        // Function names for functions declared to return by reference.
+                        for ($i = ($lastNotEmptyToken - 1); $i >= 0; $i--) {
+                            if (isset(Util\Tokens::$emptyTokens$finalTokens$i'code') === true) {
+                                continue;
+                            }
+
+                            if ($finalTokens$i'code' === T_FUNCTION) {
+                                $preserveTstring = true;
+                            }
 
-                        if ($tokenContentLower === 'parent') {
-                            $finalTokens$newStackPtr'code' = T_PARENT;
-                            $finalTokens$newStackPtr'type' = 'T_PARENT';
+                            break;
                         }
                     } else {
+                        // Keywords with special PHPCS token when used as a function call.
+                        for ($i = ($stackPtr + 1); $i < $numTokens; $i++) {
+                            if (is_array($tokens$i) === true
+                                && isset(Util\Tokens::$emptyTokens$tokens$i0) === true
+                            ) {
+                                continue;
+                            }
+
+                            if ($tokens$i0 === '(') {
+                                $preserveTstring = true;
+                            }
+
+                            break;
+                        }
+                    }//end if
+
+                    if ($preserveTstring === true) {
                         $finalTokens$newStackPtr = 
-                            'content' => $token1,
                             'code'    => T_STRING,
                             'type'    => 'T_STRING',
+                            'content' => $token1,
                         ;
-                    }
 
-                    $newStackPtr++;
-                    continue;
+                        $newStackPtr++;
+                        continue;
+                    }
                 }//end if
 
                 $newToken = null;
@@ -2249,11 +2383,12 @@
 
                             if (is_array($tokens$i) === false
                                 && ($tokens$i === ';'
-                                || $tokens$i === '{')
+                                || $tokens$i === '{'
+                                || $tokens$i === '}')
                             ) {
                                 break;
                             }
-                        }
+                        }//end for
                     }//end if
 
                     if ($isInlineIf === true) {
@@ -2803,6 +2938,7 @@
                     T_PARENT       => T_PARENT,
                     T_STATIC       => T_STATIC,
                     T_FALSE        => T_FALSE,
+                    T_TRUE         => T_TRUE,
                     T_NULL         => T_NULL,
                     T_NAMESPACE    => T_NAMESPACE,
                     T_NS_SEPARATOR => T_NS_SEPARATOR,
@@ -2862,6 +2998,10 @@
                     continue;
                 }
 
+                if ($suspectedType === 'property or parameter') {
+                    unset($allowed\T_STATIC);
+                }
+
                 $typeTokenCount = 0;
                 $typeOperators  = $i;
                 $confirmed      = false;
@@ -2894,6 +3034,7 @@
                     if ($suspectedType === 'property or parameter'
                         && (isset(Util\Tokens::$scopeModifiers$this->tokens$x'code') === true
                         || $this->tokens$x'code' === T_VAR
+                        || $this->tokens$x'code' === T_STATIC
                         || $this->tokens$x'code' === T_READONLY)
                     ) {
                         // This will also confirm constructor property promotion parameters, but that's fine.
@@ -2995,14 +3136,16 @@
                 || $this->tokens$i'code' === T_FALSE
                 || $this->tokens$i'code' === T_NULL
             ) {
-                for ($x = ($i + 1); $i < $numTokens; $x++) {
+                for ($x = ($i + 1); $x < $numTokens; $x++) {
                     if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
                         // Non-whitespace content.
                         break;
                     }
                 }
 
-                if (isset($this->tstringContexts$this->tokens$x'code') === true) {
+                if ($x !== $numTokens
+                    && isset($this->tstringContexts$this->tokens$x'code') === true
+                ) {
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         $line = $this->tokens$i'line';
                         $type = $this->tokens$i'type';

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/Tokenizer.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Cache.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Common.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Standards.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Timing.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Util;
@@ -41,6 +41,51 @@
 
 
     /**
+     * Get the duration of the run up to "now".
+     *
+     * @return float Duration in microseconds.
+     */
+    public static function getDuration()
+    {
+        if (self::$startTime === null) {
+            // Timing was never started.
+            return 0;
+        }
+
+        return ((microtime(true) - self::$startTime) * 1000);
+
+    }//end getDuration()
+
+
+    /**
+     * Convert a duration in microseconds to a human readable duration string.
+     *
+     * @param float $duration Duration in microseconds.
+     *
+     * @return string
+     */
+    public static function getHumanReadableDuration($duration)
+    {
+        $timeString = '';
+        if ($duration > 60000) {
+            $mins       = floor($duration / 60000);
+            $secs       = round((fmod($duration, 60000) / 1000), 2);
+            $timeString = $mins.' mins';
+            if ($secs !== 0) {
+                $timeString .= ", $secs secs";
+            }
+        } else if ($duration > 1000) {
+            $timeString = round(($duration / 1000), 2).' secs';
+        } else {
+            $timeString = round($duration).'ms';
+        }
+
+        return $timeString;
+
+    }//end getHumanReadableDuration()
+
+
+    /**
      * Print information about the run.
      *
      * @param boolean $force If TRUE, prints the output even if it has
@@ -60,23 +105,11 @@
             return;
         }
 
-        $time = ((microtime(true) - self::$startTime) * 1000);
-
-        if ($time > 60000) {
-            $mins = floor($time / 60000);
-            $secs = round((fmod($time, 60000) / 1000), 2);
-            $time = $mins.' mins';
-            if ($secs !== 0) {
-                $time .= ", $secs secs";
-            }
-        } else if ($time > 1000) {
-            $time = round(($time / 1000), 2).' secs';
-        } else {
-            $time = round($time).'ms';
-        }
+        $duration = self::getDuration();
+        $duration = self::getHumanReadableDuration($duration);
 
         $mem = round((memory_get_peak_usage(true) / (1024 * 1024)), 2).'MB';
-        echo "Time: $time; Memory: $mem".PHP_EOL.PHP_EOL;
+        echo "Time: $duration; Memory: $mem".PHP_EOL.PHP_EOL;
 
         self::$printed = true;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Tokens.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/AllTests.php Changed

@@ -4,19 +4,13 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests;
 
-if ($GLOBALS'PHP_CODESNIFFER_PEAR' === false) {
-    include_once 'Core/AllTests.php';
-    include_once 'Standards/AllSniffs.php';
-} else {
-    include_once 'CodeSniffer/Core/AllTests.php';
-    include_once 'CodeSniffer/Standards/AllSniffs.php';
-    include_once 'FileList.php';
-}
+require_once 'Core/AllTests.php';
+require_once 'Standards/AllSniffs.php';
 
 // PHPUnit 7 made the TestSuite run() method incompatible with
 // older PHPUnit versions due to return type hints, so maintain
@@ -24,7 +18,7 @@
 $phpunit7 = false;
 if (class_exists('\PHPUnit\Runner\Version') === true) {
     $version = \PHPUnit\Runner\Version::id();
-    if ($version0 === '7') {
+    if (version_compare($version, '7.0', '>=') === true) {
         $phpunit7 = true;
     }
 }

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/AbstractMethodUnitTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2018-2019 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core;
@@ -13,6 +13,7 @@
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Files\DummyFile;
 use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
 
 abstract class AbstractMethodUnitTest extends TestCase
 {
@@ -28,6 +29,15 @@
     protected static $fileExtension = 'inc';
 
     /**
+     * The tab width setting to use when tokenizing the file.
+     *
+     * This allows for test case files to use a different tab width than the default.
+     *
+     * @var integer
+     */
+    protected static $tabWidth = 4;
+
+    /**
      * The \PHP_CodeSniffer\Files\File object containing the parsed contents of the test case file.
      *
      * @var \PHP_CodeSniffer\Files\File
@@ -41,12 +51,30 @@
      * The test case file for a unit test class has to be in the same directory
      * directory and use the same file name as the test class, using the .inc extension.
      *
+     * @beforeClass
+     *
      * @return void
      */
-    public static function setUpBeforeClass()
+    public static function initializeFile()
     {
-        $config            = new Config();
-        $config->standards = 'PSR1';
+        /*
+         * Set the static properties in the Config class to specific values for performance
+         * and to clear out values from other tests.
+         */
+
+        self::setStaticConfigProperty('executablePaths', );
+
+        // Set to a usable value to circumvent Config trying to find a phpcs.xml config file.
+        self::setStaticConfigProperty('overriddenDefaults', 'standards' => 'PSR1');
+
+        // Set to values which prevent the test-runner user's `CodeSniffer.conf` file
+        // from being read and influencing the tests. Also prevent an `exec()` call to stty.
+        self::setStaticConfigProperty('configData', 'report_width' => 80);
+        self::setStaticConfigProperty('configDataFile', '');
+
+        $config = new Config();
+        // Also set a tab-width to enable testing tab-replaced vs `orig_content`.
+        $config->tabWidth = static::$tabWidth;
 
         $ruleset = new Ruleset($config);
 
@@ -62,19 +90,45 @@
         self::$phpcsFile = new DummyFile($contents, $ruleset, $config);
         self::$phpcsFile->process();
 
-    }//end setUpBeforeClass()
+    }//end initializeFile()
 
 
     /**
      * Clean up after finished test.
      *
+     * @afterClass
+     *
      * @return void
      */
-    public static function tearDownAfterClass()
+    public static function resetFile()
     {
         self::$phpcsFile = null;
 
-    }//end tearDownAfterClass()
+        // Reset the static properties in the Config class to their defaults to prevent tests influencing each other.
+        self::setStaticConfigProperty('overriddenDefaults', );
+        self::setStaticConfigProperty('executablePaths', );
+        self::setStaticConfigProperty('configData', null);
+        self::setStaticConfigProperty('configDataFile', null);
+
+    }//end resetFile()
+
+
+    /**
+     * Helper function to set the value of a private static property on the Config class.
+     *
+     * @param string $name  The name of the property to set.
+     * @param mixed  $value The value to set the property to.
+     *
+     * @return void
+     */
+    public static function setStaticConfigProperty($name, $value)
+    {
+        $property = new ReflectionProperty('PHP_CodeSniffer\Config', $name);
+        $property->setAccessible(true);
+        $property->setValue(null, $value);
+        $property->setAccessible(false);
+
+    }//end setStaticConfigProperty()
 
 
     /**
@@ -137,4 +191,28 @@
     }//end getTargetToken()
 
 
+    /**
+     * Helper method to tell PHPUnit to expect a PHPCS RuntimeException in a PHPUnit cross-version
+     * compatible manner.
+     *
+     * @param string $message The expected exception message.
+     *
+     * @return void
+     */
+    public function expectRunTimeException($message)
+    {
+        $exception = 'PHP_CodeSniffer\Exceptions\RuntimeException';
+
+        if (method_exists($this, 'expectException') === true) {
+            // PHPUnit 5+.
+            $this->expectException($exception);
+            $this->expectExceptionMessage($message);
+        } else {
+            // PHPUnit 4.
+            $this->setExpectedException($exception, $message);
+        }
+
+    }//end expectRunTimeException()
+
+
 }//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/AllTests.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Autoloader/DetermineLoadedClassTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Autoloader;
@@ -12,6 +12,11 @@
 use PHP_CodeSniffer\Autoload;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Autoload::determineLoadedClass method.
+ *
+ * @covers \PHP_CodeSniffer\Autoload::determineLoadedClass
+ */
 class DetermineLoadedClassTest extends TestCase
 {
 
@@ -19,13 +24,15 @@
     /**
      * Load the test files.
      *
+     * @beforeClass
+     *
      * @return void
      */
-    public static function setUpBeforeClass()
+    public static function includeFixture()
     {
         include __DIR__.'/TestFiles/Sub/C.inc';
 
-    }//end setUpBeforeClass()
+    }//end includeFixture()
 
 
     /**

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Config Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Config/ReportWidthTest.php Added

@@ -0,0 +1,332 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Config reportWidth value.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2006-2023 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Config;
+
+use PHP_CodeSniffer\Config;
+use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Config reportWidth value.
+ *
+ * @covers \PHP_CodeSniffer\Config::__get
+ */
+class ReportWidthTest extends TestCase
+{
+
+
+    /**
+     * Set static properties in the Config class to prevent tests influencing each other.
+     *
+     * @before
+     *
+     * @return void
+     */
+    public static function cleanConfig()
+    {
+        // Set to the property's default value to clear out potentially set values from other tests.
+        self::setStaticProperty('executablePaths', );
+
+        // Set to a usable value to circumvent Config trying to find a phpcs.xml config file.
+        self::setStaticProperty('overriddenDefaults', 'standards' => 'PSR1');
+
+        // Set to values which prevent the test-runner user's `CodeSniffer.conf` file
+        // from being read and influencing the tests.
+        self::setStaticProperty('configData', );
+        self::setStaticProperty('configDataFile', '');
+
+    }//end cleanConfig()
+
+
+    /**
+     * Clean up after each finished test.
+     *
+     * @after
+     *
+     * @return void
+     */
+    public function resetConfig()
+    {
+        $_SERVER'argv' = ;
+
+    }//end resetConfig()
+
+
+    /**
+     * Reset the static properties in the Config class to their true defaults to prevent this class
+     * from influencing other tests.
+     *
+     * @afterClass
+     *
+     * @return void
+     */
+    public static function resetConfigToDefaults()
+    {
+        self::setStaticProperty('overriddenDefaults', );
+        self::setStaticProperty('executablePaths', );
+        self::setStaticProperty('configData', null);
+        self::setStaticProperty('configDataFile', null);
+        $_SERVER'argv' = ;
+
+    }//end resetConfigToDefaults()
+
+
+    /**
+     * Test that report width without overrules will always be set to a non-0 positive integer.
+     *
+     * @covers \PHP_CodeSniffer\Config::__set
+     * @covers \PHP_CodeSniffer\Config::restoreDefaults
+     *
+     * @return void
+     */
+    public function testReportWidthDefault()
+    {
+        $config = new Config();
+
+        // Can't test the exact value as "auto" will resolve differently depending on the machine running the tests.
+        $this->assertTrue(is_int($config->reportWidth), 'Report width is not an integer');
+        $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0');
+
+    }//end testReportWidthDefault()
+
+
+    /**
+     * Test that the report width will be set to a non-0 positive integer when not found in the CodeSniffer.conf file.
+     *
+     * @covers \PHP_CodeSniffer\Config::__set
+     * @covers \PHP_CodeSniffer\Config::restoreDefaults
+     *
+     * @return void
+     */
+    public function testReportWidthWillBeSetFromAutoWhenNotFoundInConfFile()
+    {
+        $phpCodeSnifferConfig = 
+            'default_standard' => 'PSR2',
+            'show_warnings'    => '0',
+        ;
+
+        $this->setStaticProperty('configData', $phpCodeSnifferConfig);
+
+        $config = new Config();
+
+        // Can't test the exact value as "auto" will resolve differently depending on the machine running the tests.
+        $this->assertTrue(is_int($config->reportWidth), 'Report width is not an integer');
+        $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0');
+
+    }//end testReportWidthWillBeSetFromAutoWhenNotFoundInConfFile()
+
+
+    /**
+     * Test that the report width will be set correctly when found in the CodeSniffer.conf file.
+     *
+     * @covers \PHP_CodeSniffer\Config::__set
+     * @covers \PHP_CodeSniffer\Config::getConfigData
+     * @covers \PHP_CodeSniffer\Config::restoreDefaults
+     *
+     * @return void
+     */
+    public function testReportWidthCanBeSetFromConfFile()
+    {
+        $phpCodeSnifferConfig = 
+            'default_standard' => 'PSR2',
+            'report_width'     => '120',
+        ;
+
+        $this->setStaticProperty('configData', $phpCodeSnifferConfig);
+
+        $config = new Config();
+        $this->assertSame(120, $config->reportWidth);
+
+    }//end testReportWidthCanBeSetFromConfFile()
+
+
+    /**
+     * Test that the report width will be set correctly when passed as a CLI argument.
+     *
+     * @covers \PHP_CodeSniffer\Config::__set
+     * @covers \PHP_CodeSniffer\Config::processLongArgument
+     *
+     * @return void
+     */
+    public function testReportWidthCanBeSetFromCLI()
+    {
+        $_SERVER'argv' = 
+            'phpcs',
+            '--report-width=100',
+        ;
+
+        $config = new Config();
+        $this->assertSame(100, $config->reportWidth);
+
+    }//end testReportWidthCanBeSetFromCLI()
+
+
+    /**
+     * Test that the report width will be set correctly when multiple report widths are passed on the CLI.
+     *
+     * @covers \PHP_CodeSniffer\Config::__set
+     * @covers \PHP_CodeSniffer\Config::processLongArgument
+     *
+     * @return void
+     */
+    public function testReportWidthWhenSetFromCLIFirstValuePrevails()
+    {
+        $_SERVER'argv' = 
+            'phpcs',
+            '--report-width=100',
+            '--report-width=200',
+        ;
+
+        $config = new Config();
+        $this->assertSame(100, $config->reportWidth);
+
+    }//end testReportWidthWhenSetFromCLIFirstValuePrevails()
+
+
+    /**
+     * Test that a report width passed as a CLI argument will overrule a report width set in a CodeSniffer.conf file.
+     *
+     * @covers \PHP_CodeSniffer\Config::__set
+     * @covers \PHP_CodeSniffer\Config::processLongArgument
+     * @covers \PHP_CodeSniffer\Config::getConfigData
+     *
+     * @return void
+     */
+    public function testReportWidthSetFromCLIOverrulesConfFile()
+    {
+        $phpCodeSnifferConfig = 
+            'default_standard' => 'PSR2',
+            'report_format'    => 'summary',
+            'show_warnings'    => '0',
+            'show_progress'    => '1',
+            'report_width'     => '120',
+        ;
+
+        $this->setStaticProperty('configData', $phpCodeSnifferConfig);
+
+        $cliArgs = 
+            'phpcs',
+            '--report-width=180',
+        ;
+
+        $config = new Config($cliArgs);
+        $this->assertSame(180, $config->reportWidth);
+
+    }//end testReportWidthSetFromCLIOverrulesConfFile()
+
+
+    /**
+     * Test that the report width will be set to a non-0 positive integer when set to "auto".
+     *
+     * @covers \PHP_CodeSniffer\Config::__set
+     *
+     * @return void
+     */
+    public function testReportWidthInputHandlingForAuto()
+    {
+        $config = new Config();
+        $config->reportWidth = 'auto';
+
+        // Can't test the exact value as "auto" will resolve differently depending on the machine running the tests.
+        $this->assertTrue(is_int($config->reportWidth), 'Report width is not an integer');
+        $this->assertGreaterThan(0, $config->reportWidth, 'Report width is not greater than 0');
+
+    }//end testReportWidthInputHandlingForAuto()
+
+
+    /**
+     * Test that the report width will be set correctly for various types of input.
+     *
+     * @param mixed $input    Input value received.
+     * @param int   $expected Expected report width.
+     *
+     * @dataProvider dataReportWidthInputHandling
+     * @covers       \PHP_CodeSniffer\Config::__set
+     *
+     * @return void
+     */
+    public function testReportWidthInputHandling($input, $expected)
+    {
+        $config = new Config();
+        $config->reportWidth = $input;
+
+        $this->assertSame($expected, $config->reportWidth);
+
+    }//end testReportWidthInputHandling()
+
+
+    /**
+     * Data provider.
+     *
+     * @return array
+     */
+    public function dataReportWidthInputHandling()
+    {
+        return 
+            'No value (empty string)'                                 => 
+                'value'    => '',
+                'expected' => Config::DEFAULT_REPORT_WIDTH,
+            ,
+            'Value: invalid input type null'                          => 
+                'value'    => null,
+                'expected' => Config::DEFAULT_REPORT_WIDTH,
+            ,
+            'Value: invalid input type false'                         => 
+                'value'    => false,
+                'expected' => Config::DEFAULT_REPORT_WIDTH,
+            ,
+            'Value: invalid input type float'                         => 
+                'value'    => 100.50,
+                'expected' => Config::DEFAULT_REPORT_WIDTH,
+            ,
+            'Value: invalid string value "invalid"'                   => 
+                'value'    => 'invalid',
+                'expected' => Config::DEFAULT_REPORT_WIDTH,
+            ,
+            'Value: invalid string value, non-integer string "50.25"' => 
+                'value'    => '50.25',
+                'expected' => Config::DEFAULT_REPORT_WIDTH,
+            ,
+            'Value: valid numeric string value'                       => 
+                'value'    => '250',
+                'expected' => 250,
+            ,
+            'Value: valid int value'                                  => 
+                'value'    => 220,
+                'expected' => 220,
+            ,
+            'Value: negative int value becomes positive int'          => 
+                'value'    => -180,
+                'expected' => 180,
+            ,
+        ;
+
+    }//end dataReportWidthInputHandling()
+
+
+    /**
+     * Helper function to set a static property on the Config class.
+     *
+     * @param string $name  The name of the property to set.
+     * @param mixed  $value The value to set the property to.
+     *
+     * @return void
+     */
+    public static function setStaticProperty($name, $value)
+    {
+        $property = new ReflectionProperty('PHP_CodeSniffer\Config', $name);
+        $property->setAccessible(true);
+        $property->setValue(null, $value);
+        $property->setAccessible(false);
+
+    }//end setStaticProperty()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/ErrorSuppressionTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindEndOfStatementTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindExtendedClassNameTest.inc Changed

@@ -1,27 +1,32 @@
 <?php
 
-namespace PHP_CodeSniffer\Tests\Core\File;
+/* testNotAClass */
+function notAClass() {}
 
-class testFECNClass {}
+/* testNonExtendedClass */
+class testFECNNonExtendedClass {}
 
-/* testExtendedClass */
+/* testExtendsUnqualifiedClass */
 class testFECNExtendedClass extends testFECNClass {}
 
-/* testNamespacedClass */
+/* testExtendsFullyQualifiedClass */
 class testFECNNamespacedClass extends \PHP_CodeSniffer\Tests\Core\File\testFECNClass {}
 
-/* testNonExtendedClass */
-class testFECNNonExtendedClass {}
+/* testExtendsPartiallyQualifiedClass */
+class testFECNQualifiedClass extends Core\File\RelativeClass {}
 
-/* testInterface */
+/* testNonExtendedInterface */
 interface testFECNInterface {}
 
-/* testInterfaceThatExtendsInterface */
+/* testInterfaceExtendsUnqualifiedInterface */
 interface testInterfaceThatExtendsInterface extends testFECNInterface{}
 
-/* testInterfaceThatExtendsFQCNInterface */
+/* testInterfaceExtendsFullyQualifiedInterface */
 interface testInterfaceThatExtendsFQCNInterface extends \PHP_CodeSniffer\Tests\Core\File\testFECNInterface{}
 
+/* testExtendedAnonClass */
+$anon = new class( $a, $b ) extends testFECNExtendedAnonClass {};
+
 /* testNestedExtendedClass */
 class testFECNNestedExtendedClass {
 	public function someMethod() {
@@ -35,3 +40,13 @@
 
 /* testClassThatImplementsAndExtends */
 class testFECNClassThatImplementsAndExtends implements InterfaceA, InterfaceB extends testFECNClass {}
+
+/* testInterfaceMultiExtends */
+interface Multi extends \Package\FooInterface, \BarInterface {};
+
+/* testMissingExtendsName */
+class testMissingExtendsName extends { /* missing classname */ } // Intentional parse error.
+
+// Intentional parse error. Has to be the last test in the file.
+/* testParseError */
+class testParseError extends testFECNClass

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindExtendedClassNameTest.php Changed

@@ -1,26 +1,58 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:findExtendedClassName method.
+ * Tests for the \PHP_CodeSniffer\Files\File::findExtendedClassName method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::findExtendedClassName method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::findExtendedClassName
+ */
 class FindExtendedClassNameTest extends AbstractMethodUnitTest
 {
 
 
     /**
+     * Test getting a `false` result when a non-existent token is passed.
+     *
+     * @return void
+     */
+    public function testNonExistentToken()
+    {
+        $result = self::$phpcsFile->findExtendedClassName(100000);
+        $this->assertFalse($result);
+
+    }//end testNonExistentToken()
+
+
+    /**
+     * Test getting a `false` result when a token other than one of the supported tokens is passed.
+     *
+     * @return void
+     */
+    public function testNotAClass()
+    {
+        $token  = $this->getTargetToken('/* testNotAClass */', T_FUNCTION);
+        $result = self::$phpcsFile->findExtendedClassName($token);
+        $this->assertFalse($result);
+
+    }//end testNotAClass()
+
+
+    /**
      * Test retrieving the name of the class being extended by another class
      * (or interface).
      *
-     * @param string $identifier Comment which precedes the test case.
-     * @param bool   $expected   Expected function output.
+     * @param string       $identifier Comment which precedes the test case.
+     * @param string|false $expected   Expected function output.
      *
      * @dataProvider dataExtendedClass
      *
@@ -40,50 +72,70 @@
      *
      * @see testFindExtendedClassName()
      *
-     * @return array
+     * @return array<string, array<string, string|false>>
      */
     public function dataExtendedClass()
     {
         return 
-            
-                '/* testExtendedClass */',
-                'testFECNClass',
+            'class does not extend'                                       => 
+                'identifier' => '/* testNonExtendedClass */',
+                'expected'   => false,
+            ,
+            'class extends unqualified class'                             => 
+                'identifier' => '/* testExtendsUnqualifiedClass */',
+                'expected'   => 'testFECNClass',
+            ,
+            'class extends fully qualified class'                         => 
+                'identifier' => '/* testExtendsFullyQualifiedClass */',
+                'expected'   => '\PHP_CodeSniffer\Tests\Core\File\testFECNClass',
+            ,
+            'class extends partially qualified class'                     => 
+                'identifier' => '/* testExtendsPartiallyQualifiedClass */',
+                'expected'   => 'Core\File\RelativeClass',
+            ,
+            'interface does not extend'                                   => 
+                'identifier' => '/* testNonExtendedInterface */',
+                'expected'   => false,
+            ,
+            'interface extends unqualified interface'                     => 
+                'identifier' => '/* testInterfaceExtendsUnqualifiedInterface */',
+                'expected'   => 'testFECNInterface',
             ,
-            
-                '/* testNamespacedClass */',
-                '\PHP_CodeSniffer\Tests\Core\File\testFECNClass',
+            'interface extends fully qualified interface'                 => 
+                'identifier' => '/* testInterfaceExtendsFullyQualifiedInterface */',
+                'expected'   => '\PHP_CodeSniffer\Tests\Core\File\testFECNInterface',
             ,
-            
-                '/* testNonExtendedClass */',
-                false,
+            'anon class extends unqualified class'                        => 
+                'identifier' => '/* testExtendedAnonClass */',
+                'expected'   => 'testFECNExtendedAnonClass',
             ,
-            
-                '/* testInterface */',
-                false,
+            'class does not extend but contains anon class which extends' => 
+                'identifier' => '/* testNestedExtendedClass */',
+                'expected'   => false,
             ,
-            
-                '/* testInterfaceThatExtendsInterface */',
-                'testFECNInterface',
+            'anon class extends, nested in non-extended class'            => 
+                'identifier' => '/* testNestedExtendedAnonClass */',
+                'expected'   => 'testFECNAnonClass',
             ,
-            
-                '/* testInterfaceThatExtendsFQCNInterface */',
-                '\PHP_CodeSniffer\Tests\Core\File\testFECNInterface',
+            'class extends and implements'                                => 
+                'identifier' => '/* testClassThatExtendsAndImplements */',
+                'expected'   => 'testFECNClass',
             ,
-            
-                '/* testNestedExtendedClass */',
-                false,
+            'class implements and extends'                                => 
+                'identifier' => '/* testClassThatImplementsAndExtends */',
+                'expected'   => 'testFECNClass',
             ,
-            
-                '/* testNestedExtendedAnonClass */',
-                'testFECNAnonClass',
+            'interface extends multiple interfaces (not supported)'       => 
+                'identifier' => '/* testInterfaceMultiExtends */',
+                'expected'   => '\Package\FooInterface',
             ,
-            
-                '/* testClassThatExtendsAndImplements */',
-                'testFECNClass',
+            'parse error - extends keyword, but no class name'            => 
+                'identifier' => '/* testMissingExtendsName */',
+                'expected'   => false,
             ,
-            
-                '/* testClassThatImplementsAndExtends */',
-                'testFECNClass',
+            'parse error - live coding - no curly braces'                 => 
+                'identifier' => '/* testParseError */',
+                'expected'   => false,
             ,
         ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindImplementedInterfaceNamesTest.inc Changed

@@ -1,23 +1,25 @@
 <?php
 
-namespace PHP_CodeSniffer\Tests\Core\File;
+/* testNotAClass */
+function notAClass() {}
 
-interface testFIINInterface2 {}
-
-/* testInterface */
+/* testPlainInterface */
 interface testFIINInterface {}
 
-/* testImplementedClass */
+/* testNonImplementedClass */
+class testFIINNonImplementedClass {}
+
+/* testClassImplementsSingle */
 class testFIINImplementedClass implements testFIINInterface {}
 
-/* testMultiImplementedClass */
+/* testClassImplementsMultiple */
 class testFIINMultiImplementedClass implements testFIINInterface, testFIINInterface2 {}
 
-/* testNamespacedClass */
+/* testImplementsFullyQualified */
 class testFIINNamespacedClass implements \PHP_CodeSniffer\Tests\Core\File\testFIINInterface {}
 
-/* testNonImplementedClass */
-class testFIINNonImplementedClass {}
+/* testImplementsPartiallyQualified */
+class testFIINQualifiedClass implements Core\File\RelativeInterface {}
 
 /* testClassThatExtendsAndImplements */
 class testFECNClassThatExtendsAndImplements extends testFECNClass implements InterfaceA, \NameSpaced\Cat\InterfaceB {}
@@ -28,8 +30,18 @@
 /* testBackedEnumWithoutImplements */
 enum Suit:string {}
 
-/* testEnumImplements */
+/* testEnumImplementsSingle */
 enum Suit implements Colorful {}
 
-/* testBackedEnumImplements */
+/* testBackedEnumImplementsMulti */
 enum Suit: string implements Colorful, \Deck {}
+
+/* testAnonClassImplementsSingle */
+$anon = class() implements testFIINInterface {}
+
+/* testMissingImplementsName */
+class testMissingExtendsName implements { /* missing interface name */  } // Intentional parse error.
+
+// Intentional parse error. Has to be the last test in the file.
+/* testParseError */
+class testParseError implements testInterface

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindImplementedInterfaceNamesTest.php Changed

@@ -1,25 +1,57 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:findImplementedInterfaceNames method.
+ * Tests for the \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::findImplementedInterfaceNames
+ */
 class FindImplementedInterfaceNamesTest extends AbstractMethodUnitTest
 {
 
 
     /**
+     * Test getting a `false` result when a non-existent token is passed.
+     *
+     * @return void
+     */
+    public function testNonExistentToken()
+    {
+        $result = self::$phpcsFile->findImplementedInterfaceNames(100000);
+        $this->assertFalse($result);
+
+    }//end testNonExistentToken()
+
+
+    /**
+     * Test getting a `false` result when a token other than one of the supported tokens is passed.
+     *
+     * @return void
+     */
+    public function testNotAClass()
+    {
+        $token  = $this->getTargetToken('/* testNotAClass */', T_FUNCTION);
+        $result = self::$phpcsFile->findImplementedInterfaceNames($token);
+        $this->assertFalse($result);
+
+    }//end testNotAClass()
+
+
+    /**
      * Test retrieving the name(s) of the interfaces being implemented by a class.
      *
-     * @param string $identifier Comment which precedes the test case.
-     * @param bool   $expected   Expected function output.
+     * @param string              $identifier Comment which precedes the test case.
+     * @param array<string>|false $expected   Expected function output.
      *
      * @dataProvider dataImplementedInterface
      *
@@ -39,63 +71,79 @@
      *
      * @see testFindImplementedInterfaceNames()
      *
-     * @return array
+     * @return array<string, array<string, string|array<string>>>
      */
     public function dataImplementedInterface()
     {
         return 
-            
-                '/* testImplementedClass */',
-                'testFIINInterface',
+            'interface declaration, no implements'                               => 
+                'identifier' => '/* testPlainInterface */',
+                'expected'   => false,
             ,
-            
-                '/* testMultiImplementedClass */',
-                
+            'class does not implement'                                           => 
+                'identifier' => '/* testNonImplementedClass */',
+                'expected'   => false,
+            ,
+            'class implements single interface, unqualified'                     => 
+                'identifier' => '/* testClassImplementsSingle */',
+                'expected'   => 'testFIINInterface',
+            ,
+            'class implements multiple interfaces'                               => 
+                'identifier' => '/* testClassImplementsMultiple */',
+                'expected'   => 
                     'testFIINInterface',
                     'testFIINInterface2',
                 ,
             ,
-            
-                '/* testNamespacedClass */',
-                '\PHP_CodeSniffer\Tests\Core\File\testFIINInterface',
-            ,
-            
-                '/* testNonImplementedClass */',
-                false,
+            'class implements single interface, fully qualified'                 => 
+                'identifier' => '/* testImplementsFullyQualified */',
+                'expected'   => '\PHP_CodeSniffer\Tests\Core\File\testFIINInterface',
             ,
-            
-                '/* testInterface */',
-                false,
+            'class implements single interface, partially qualified'             => 
+                'identifier' => '/* testImplementsPartiallyQualified */',
+                'expected'   => 'Core\File\RelativeInterface',
             ,
-            
-                '/* testClassThatExtendsAndImplements */',
-                
+            'class extends and implements'                                       => 
+                'identifier' => '/* testClassThatExtendsAndImplements */',
+                'expected'   => 
                     'InterfaceA',
                     '\NameSpaced\Cat\InterfaceB',
                 ,
             ,
-            
-                '/* testClassThatImplementsAndExtends */',
-                
+            'class implements and extends'                                       => 
+                'identifier' => '/* testClassThatImplementsAndExtends */',
+                'expected'   => 
                     '\InterfaceA',
                     'InterfaceB',
                 ,
             ,
-            
-                '/* testBackedEnumWithoutImplements */',
-                false,
+            'enum does not implement'                                            => 
+                'identifier' => '/* testBackedEnumWithoutImplements */',
+                'expected'   => false,
             ,
-            
-                '/* testEnumImplements */',
-                'Colorful',
+            'enum implements single interface, unqualified'                      => 
+                'identifier' => '/* testEnumImplementsSingle */',
+                'expected'   => 'Colorful',
             ,
-            
-                '/* testBackedEnumImplements */',
-                
+            'enum implements multiple interfaces, unqualified + fully qualified' => 
+                'identifier' => '/* testBackedEnumImplementsMulti */',
+                'expected'   => 
                     'Colorful',
                     '\Deck',
                 ,
             ,
+            'anon class implements single interface, unqualified'                => 
+                'identifier' => '/* testAnonClassImplementsSingle */',
+                'expected'   => 'testFIINInterface',
+            ,
+            'parse error - implements keyword, but no interface name'            => 
+                'identifier' => '/* testMissingImplementsName */',
+                'expected'   => false,
+            ,
+            'parse error - live coding - no curly braces'                        => 
+                'identifier' => '/* testParseError */',
+                'expected'   => false,
+            ,
         ;
 
     }//end dataImplementedInterface()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindStartOfStatementTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindStartOfStatementTest.php Changed

@@ -3,14 +3,21 @@
  * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @copyright 2019-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:findStartOfStatement method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::findStartOfStatement
+ */
 class FindStartOfStatementTest extends AbstractMethodUnitTest
 {
 
@@ -500,4 +507,134 @@
     }//end testOpenTagWithEcho()
 
 
+    /**
+     * Test object call on result of static function call with arrow function as parameter and wrapped within an array.
+     *
+     * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/2849
+     * @link https://github.com/squizlabs/PHP_CodeSniffer/commit/fbf67efc3fc0c2a355f5585d49f4f6fe160ff2f9
+     *
+     * @return void
+     */
+    public function testObjectCallPrecededByArrowFunctionAsFunctionCallParameterInArray()
+    {
+        $expected = $this->getTargetToken('/* testPrecededByArrowFunctionInArray - Expected */', T_STRING, 'Url');
+
+        $start = $this->getTargetToken('/* testPrecededByArrowFunctionInArray */', T_STRING, 'onlyOnDetail');
+        $found = self::$phpcsFile->findStartOfStatement($start);
+
+        $this->assertSame($expected, $found);
+
+    }//end testObjectCallPrecededByArrowFunctionAsFunctionCallParameterInArray()
+
+
+    /**
+     * Test finding the start of a statement inside a switch control structure case/default statement.
+     *
+     * @param string     $testMarker     The comment which prefaces the target token in the test file.
+     * @param int|string $targets        The token to search for after the test marker.
+     * @param string|int $expectedTarget Token code of the expected start of statement stack pointer.
+     *
+     * @link https://github.com/squizlabs/php_codesniffer/issues/3192
+     * @link https://github.com/squizlabs/PHP_CodeSniffer/pull/3186/commits/18a0e54735bb9b3850fec266e5f4c50dacf618ea
+     *
+     * @dataProvider dataFindStartInsideSwitchCaseDefaultStatements
+     *
+     * @return void
+     */
+    public function testFindStartInsideSwitchCaseDefaultStatements($testMarker, $targets, $expectedTarget)
+    {
+        $testToken = $this->getTargetToken($testMarker, $targets);
+        $expected  = $this->getTargetToken($testMarker, $expectedTarget);
+
+        $found = self::$phpcsFile->findStartOfStatement($testToken);
+
+        $this->assertSame($expected, $found);
+
+    }//end testFindStartInsideSwitchCaseDefaultStatements()
+
+
+    /**
+     * Data provider.
+     *
+     * @return array<string, array<string, int|string>>
+     */
+    public static function dataFindStartInsideSwitchCaseDefaultStatements()
+    {
+        return 
+            'Case keyword should be start of case statement - case itself'                            => 
+                'testMarker'     => '/* testCaseStatement */',
+                'targets'        => T_CASE,
+                'expectedTarget' => T_CASE,
+            ,
+            'Case keyword should be start of case statement - number (what\'s being compared)'        => 
+                'testMarker'     => '/* testCaseStatement */',
+                'targets'        => T_LNUMBER,
+                'expectedTarget' => T_CASE,
+            ,
+            'Variable should be start of arbitrary assignment statement - variable itself'            => 
+                'testMarker'     => '/* testInsideCaseStatement */',
+                'targets'        => T_VARIABLE,
+                'expectedTarget' => T_VARIABLE,
+            ,
+            'Variable should be start of arbitrary assignment statement - equal sign'                 => 
+                'testMarker'     => '/* testInsideCaseStatement */',
+                'targets'        => T_EQUAL,
+                'expectedTarget' => T_VARIABLE,
+            ,
+            'Variable should be start of arbitrary assignment statement - function call'              => 
+                'testMarker'     => '/* testInsideCaseStatement */',
+                'targets'        => T_STRING,
+                'expectedTarget' => T_VARIABLE,
+            ,
+            'Break should be start for contents of the break statement - contents'                    => 
+                'testMarker'     => '/* testInsideCaseBreakStatement */',
+                'targets'        => T_LNUMBER,
+                'expectedTarget' => T_BREAK,
+            ,
+            'Continue should be start for contents of the continue statement - contents'              => 
+                'testMarker'     => '/* testInsideCaseContinueStatement */',
+                'targets'        => T_LNUMBER,
+                'expectedTarget' => T_CONTINUE,
+            ,
+            'Return should be start for contents of the return statement - contents'                  => 
+                'testMarker'     => '/* testInsideCaseReturnStatement */',
+                'targets'        => T_FALSE,
+                'expectedTarget' => T_RETURN,
+            ,
+            'Exit should be start for contents of the exit statement - close parenthesis'             => 
+                // Note: not sure if this is actually correct - should this be the open parenthesis ?
+                'testMarker'     => '/* testInsideCaseExitStatement */',
+                'targets'        => T_CLOSE_PARENTHESIS,
+                'expectedTarget' => T_EXIT,
+            ,
+            'Throw should be start for contents of the throw statement - new keyword'                 => 
+                'testMarker'     => '/* testInsideCaseThrowStatement */',
+                'targets'        => T_NEW,
+                'expectedTarget' => T_THROW,
+            ,
+            'Throw should be start for contents of the throw statement - exception name'              => 
+                'testMarker'     => '/* testInsideCaseThrowStatement */',
+                'targets'        => T_STRING,
+                'expectedTarget' => T_THROW,
+            ,
+            'Throw should be start for contents of the throw statement - close parenthesis'           => 
+                'testMarker'     => '/* testInsideCaseThrowStatement */',
+                'targets'        => T_CLOSE_PARENTHESIS,
+                'expectedTarget' => T_THROW,
+            ,
+            'Default keyword should be start of default statement - default itself'                   => 
+                'testMarker'     => '/* testDefaultStatement */',
+                'targets'        => T_DEFAULT,
+                'expectedTarget' => T_DEFAULT,
+            ,
+            'Return should be start for contents of the return statement (inside default) - variable' => 
+                'testMarker'     => '/* testInsideDefaultContinueStatement */',
+                'targets'        => T_VARIABLE,
+                'expectedTarget' => T_CONTINUE,
+            ,
+        ;
+
+    }//end dataFindStartInsideSwitchCaseDefaultStatements()
+
+
 }//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetClassPropertiesTest.inc Added

@@ -0,0 +1,58 @@
+<?php
+
+/* testNotAClass */
+interface NotAClass {}
+
+/* testAnonClass */
+$anon = new class() {};
+
+/* testEnum */
+enum NotAClassEither {}
+
+/* testClassWithoutProperties */
+class ClassWithoutProperties {}
+
+/* testAbstractClass */
+abstract class AbstractClass {}
+
+/* testFinalClass */
+final class FinalClass {}
+
+/* testReadonlyClass */
+readonly class ReadOnlyClass {}
+
+/* testFinalReadonlyClass */
+final readonly class FinalReadOnlyClass extends Foo {}
+
+/* testReadonlyFinalClass */
+readonly /*comment*/ final class ReadOnlyFinalClass {}
+
+/* testAbstractReadonlyClass */
+abstract readonly class AbstractReadOnlyClass {}
+
+/* testReadonlyAbstractClass */
+readonly
+abstract
+class ReadOnlyAbstractClass {}
+
+/* testWithCommentsAndNewLines */
+abstract
+    /* comment */
+    class ClassWithCommentsAndNewLines {}
+
+/* testWithDocblockWithoutProperties */
+/**
+ * Class docblock.
+ *
+ * @package SomePackage
+ *
+ * @phpcs:disable Standard.Cat.SniffName -- Just because.
+ */
+class ClassWithDocblock {}
+
+/* testParseErrorAbstractFinal */
+final /* comment */
+
+    abstract // Intentional parse error, class cannot both be final and abstract.
+
+        class AbstractFinal {}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetClassPropertiesTest.php Added

@@ -0,0 +1,192 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:getClassProperties method.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2022 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\File;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:getClassProperties method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getClassProperties
+ */
+class GetClassPropertiesTest extends AbstractMethodUnitTest
+{
+
+
+    /**
+     * Test receiving an expected exception when a non class token is passed.
+     *
+     * @param string     $testMarker The comment which prefaces the target token in the test file.
+     * @param int|string $tokenType  The type of token to look for after the marker.
+     *
+     * @dataProvider dataNotAClassException
+     *
+     * @return void
+     */
+    public function testNotAClassException($testMarker, $tokenType)
+    {
+        $this->expectRunTimeException('$stackPtr must be of type T_CLASS');
+
+        $target = $this->getTargetToken($testMarker, $tokenType);
+        self::$phpcsFile->getClassProperties($target);
+
+    }//end testNotAClassException()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testNotAClassException() For the array format.
+     *
+     * @return array<string, array<string, string|int>>
+     */
+    public function dataNotAClassException()
+    {
+        return 
+            'interface'  => 
+                'testMarker' => '/* testNotAClass */',
+                'tokenType'  => \T_INTERFACE,
+            ,
+            'anon-class' => 
+                'testMarker' => '/* testAnonClass */',
+                'tokenType'  => \T_ANON_CLASS,
+            ,
+            'enum'       => 
+                'testMarker' => '/* testEnum */',
+                'tokenType'  => \T_ENUM,
+            ,
+        ;
+
+    }//end dataNotAClassException()
+
+
+    /**
+     * Test retrieving the properties for a class declaration.
+     *
+     * @param string              $testMarker The comment which prefaces the target token in the test file.
+     * @param array<string, bool> $expected   Expected function output.
+     *
+     * @dataProvider dataGetClassProperties
+     *
+     * @return void
+     */
+    public function testGetClassProperties($testMarker, $expected)
+    {
+        $class  = $this->getTargetToken($testMarker, \T_CLASS);
+        $result = self::$phpcsFile->getClassProperties($class);
+        $this->assertSame($expected, $result);
+
+    }//end testGetClassProperties()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testGetClassProperties() For the array format.
+     *
+     * @return array<string, array<string, string|array<string, bool|int>>>
+     */
+    public function dataGetClassProperties()
+    {
+        return 
+            'no-properties'               => 
+                'testMarker' => '/* testClassWithoutProperties */',
+                'expected'   => 
+                    'is_abstract' => false,
+                    'is_final'    => false,
+                    'is_readonly' => false,
+                ,
+            ,
+            'abstract'                    => 
+                'testMarker' => '/* testAbstractClass */',
+                'expected'   => 
+                    'is_abstract' => true,
+                    'is_final'    => false,
+                    'is_readonly' => false,
+                ,
+            ,
+            'final'                       => 
+                'testMarker' => '/* testFinalClass */',
+                'expected'   => 
+                    'is_abstract' => false,
+                    'is_final'    => true,
+                    'is_readonly' => false,
+                ,
+            ,
+            'readonly'                    => 
+                'testMarker' => '/* testReadonlyClass */',
+                'expected'   => 
+                    'is_abstract' => false,
+                    'is_final'    => false,
+                    'is_readonly' => true,
+                ,
+            ,
+            'final-readonly'              => 
+                'testMarker' => '/* testFinalReadonlyClass */',
+                'expected'   => 
+                    'is_abstract' => false,
+                    'is_final'    => true,
+                    'is_readonly' => true,
+                ,
+            ,
+            'readonly-final'              => 
+                'testMarker' => '/* testReadonlyFinalClass */',
+                'expected'   => 
+                    'is_abstract' => false,
+                    'is_final'    => true,
+                    'is_readonly' => true,
+                ,
+            ,
+            'abstract-readonly'           => 
+                'testMarker' => '/* testAbstractReadonlyClass */',
+                'expected'   => 
+                    'is_abstract' => true,
+                    'is_final'    => false,
+                    'is_readonly' => true,
+                ,
+            ,
+            'readonly-abstract'           => 
+                'testMarker' => '/* testReadonlyAbstractClass */',
+                'expected'   => 
+                    'is_abstract' => true,
+                    'is_final'    => false,
+                    'is_readonly' => true,
+                ,
+            ,
+            'comments-and-new-lines'      => 
+                'testMarker' => '/* testWithCommentsAndNewLines */',
+                'expected'   => 
+                    'is_abstract' => true,
+                    'is_final'    => false,
+                    'is_readonly' => false,
+                ,
+            ,
+            'no-properties-with-docblock' => 
+                'testMarker' => '/* testWithDocblockWithoutProperties */',
+                'expected'   => 
+                    'is_abstract' => false,
+                    'is_final'    => false,
+                    'is_readonly' => false,
+                ,
+            ,
+            'abstract-final-parse-error'  => 
+                'testMarker' => '/* testParseErrorAbstractFinal */',
+                'expected'   => 
+                    'is_abstract' => true,
+                    'is_final'    => true,
+                    'is_readonly' => false,
+                ,
+            ,
+        ;
+
+    }//end dataGetClassProperties()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetConditionTest.inc Added

@@ -0,0 +1,91 @@
+<?php
+
+/* testStartPoint */
+/* condition 0: namespace */
+namespace Conditions\HorribleCode {
+
+    /* condition 1: if */
+    if (!function_exists('letsGetSerious') ) {
+
+        /* condition 2: function */
+        function letsGetSerious() {
+
+            /* condition 3-1: if */
+            if (isset($loadthis)) {
+                doing_something();
+            /* condition 3-2: else */
+            } else {
+
+                /* condition 4: if */
+                if (!class_exists('SeriouslyNestedClass')) {
+
+                    /* condition 5: nested class */
+                    class SeriouslyNestedClass extends SomeOtherClass {
+
+                        /* condition 6: class method */
+                        public function SeriouslyNestedMethod(/* testSeriouslyNestedMethod */ $param) {
+
+                            /* condition 7: switch */
+                            switch ($param) {
+
+                                /* condition 8a: case */
+                                case 'testing':
+
+                                    /* condition 9: while */
+                                     while ($a < 10 ) {
+
+                                        /* condition 10-1: if */
+                                        if ($a === $b) {
+
+                                            /* condition 11-1: nested anonymous class */
+                                            return new class() {
+
+                                                /* condition 12: nested anonymous class method */
+                                                private function DidSomeoneSayNesting() {
+
+                                                    /* condition 13: closure */
+                                                    $c = function() {
+                                                        /* testDeepestNested */
+                                                        return 'closure';
+                                                    };
+                                                }
+                                            };
+                                        /* condition 10-2: elseif */
+                                        } elseif($bool) {
+                                            echo 'hello world';
+                                        }
+
+                                        /* condition 10-3: foreach */
+                                        foreach ($array as $k => $v) {
+
+                                            /* condition 11-2: try */
+                                            try {
+                                                --$k;
+
+                                            /* condition 11-3: catch */
+                                            } catch (Exception $e) {
+                                                /* testInException */
+                                                echo 'oh darn';
+                                            /* condition 11-4: finally */
+                                            } finally {
+                                                return true;
+                                            }
+                                        }
+
+                                        $a++;
+                                    }
+                                    break;
+
+                                /* condition 8b: default */
+                                default:
+                                    /* testInDefault */
+                                    $return = 'nada';
+                                    return $return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetConditionTest.php Added

@@ -0,0 +1,494 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:getCondition and \PHP_CodeSniffer\Files\File:hasCondition methods.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2022-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\File;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+use PHP_CodeSniffer\Util\Tokens;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:getCondition and \PHP_CodeSniffer\Files\File:hasCondition methods.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getCondition
+ * @covers \PHP_CodeSniffer\Files\File::hasCondition
+ */
+class GetConditionTest extends AbstractMethodUnitTest
+{
+
+    /**
+     * List of all the test markers with their target token in the test case file.
+     *
+     * - The startPoint token is left out as it is tested separately.
+     * - The key is the type of token to look for after the test marker.
+     *
+     * @var array<int|string, string>
+     */
+    protected static $testTargets = 
+        T_VARIABLE                 => '/* testSeriouslyNestedMethod */',
+        T_RETURN                   => '/* testDeepestNested */',
+        T_ECHO                     => '/* testInException */',
+        T_CONSTANT_ENCAPSED_STRING => '/* testInDefault */',
+    ;
+
+    /**
+     * List of all the condition markers in the test case file.
+     *
+     * @var array<string>
+     */
+    protected $conditionMarkers = 
+        '/* condition 0: namespace */',
+        '/* condition 1: if */',
+        '/* condition 2: function */',
+        '/* condition 3-1: if */',
+        '/* condition 3-2: else */',
+        '/* condition 4: if */',
+        '/* condition 5: nested class */',
+        '/* condition 6: class method */',
+        '/* condition 7: switch */',
+        '/* condition 8a: case */',
+        '/* condition 9: while */',
+        '/* condition 10-1: if */',
+        '/* condition 11-1: nested anonymous class */',
+        '/* condition 12: nested anonymous class method */',
+        '/* condition 13: closure */',
+        '/* condition 10-2: elseif */',
+        '/* condition 10-3: foreach */',
+        '/* condition 11-2: try */',
+        '/* condition 11-3: catch */',
+        '/* condition 11-4: finally */',
+        '/* condition 8b: default */',
+    ;
+
+    /**
+     * Base array with all the scope opening tokens.
+     *
+     * This array is merged with expected result arrays for various unit tests
+     * to make sure all possible conditions are tested.
+     *
+     * This array should be kept in sync with the Tokens::$scopeOpeners array.
+     * This array isn't auto-generated based on the array in Tokens as for these
+     * tests we want to have access to the token constant names, not just their values.
+     *
+     * @var array<string, bool>
+     */
+    protected $conditionDefaults = 
+        'T_CLASS'      => false,
+        'T_ANON_CLASS' => false,
+        'T_INTERFACE'  => false,
+        'T_TRAIT'      => false,
+        'T_NAMESPACE'  => false,
+        'T_FUNCTION'   => false,
+        'T_CLOSURE'    => false,
+        'T_IF'         => false,
+        'T_SWITCH'     => false,
+        'T_CASE'       => false,
+        'T_DECLARE'    => false,
+        'T_DEFAULT'    => false,
+        'T_WHILE'      => false,
+        'T_ELSE'       => false,
+        'T_ELSEIF'     => false,
+        'T_FOR'        => false,
+        'T_FOREACH'    => false,
+        'T_DO'         => false,
+        'T_TRY'        => false,
+        'T_CATCH'      => false,
+        'T_FINALLY'    => false,
+        'T_PROPERTY'   => false,
+        'T_OBJECT'     => false,
+        'T_USE'        => false,
+    ;
+
+    /**
+     * Cache for the test token stack pointers.
+     *
+     * @var array<string, int>
+     */
+    protected static $testTokens = ;
+
+    /**
+     * Cache for the marker token stack pointers.
+     *
+     * @var array<string, int>
+     */
+    protected static $markerTokens = ;
+
+
+    /**
+     * Set up the token position caches for the tests.
+     *
+     * Retrieves the test tokens and marker token stack pointer positions
+     * only once and caches them as they won't change between the tests anyway.
+     *
+     * @before
+     *
+     * @return void
+     */
+    protected function setUpCaches()
+    {
+        if (empty(self::$testTokens) === true) {
+            foreach (self::$testTargets as $targetToken => $marker) {
+                self::$testTokens$marker = $this->getTargetToken($marker, $targetToken);
+            }
+        }
+
+        if (empty(self::$markerTokens) === true) {
+            foreach ($this->conditionMarkers as $marker) {
+                self::$markerTokens$marker = $this->getTargetToken($marker, Tokens::$scopeOpeners);
+            }
+        }
+
+    }//end setUpCaches()
+
+
+    /**
+     * Test passing a non-existent token pointer.
+     *
+     * @return void
+     */
+    public function testNonExistentToken()
+    {
+        $result = self::$phpcsFile->getCondition(100000, Tokens::$ooScopeTokens);
+        $this->assertFalse($result);
+
+        $result = self::$phpcsFile->hasCondition(100000, T_IF);
+        $this->assertFalse($result);
+
+    }//end testNonExistentToken()
+
+
+    /**
+     * Test passing a non conditional token.
+     *
+     * @return void
+     */
+    public function testNonConditionalToken()
+    {
+        $targetType = T_STRING;
+        $stackPtr   = $this->getTargetToken('/* testStartPoint */', $targetType);
+
+        $result = self::$phpcsFile->getCondition($stackPtr, T_IF);
+        $this->assertFalse($result);
+
+        $result = self::$phpcsFile->hasCondition($stackPtr, Tokens::$ooScopeTokens);
+        $this->assertFalse($result);
+
+    }//end testNonConditionalToken()
+
+
+    /**
+     * Test retrieving a specific condition from a tokens "conditions" array.
+     *
+     * @param string                $testMarker      The comment which prefaces the target token in the test file.
+     * @param array<string, string> $expectedResults Array with the condition token type to search for as key
+     *                                               and the marker for the expected stack pointer result as a value.
+     *
+     * @dataProvider dataGetCondition
+     *
+     * @return void
+     */
+    public function testGetCondition($testMarker, $expectedResults)
+    {
+        $stackPtr = self::$testTokens$testMarker;
+
+        // Add expected results for all test markers not listed in the data provider.
+        $expectedResults += $this->conditionDefaults;
+
+        foreach ($expectedResults as $conditionType => $expected) {
+            if (is_string($expected) === true) {
+                $expected = self::$markerTokens$expected;
+            }
+
+            $result = self::$phpcsFile->getCondition($stackPtr, constant($conditionType));
+            $this->assertSame(
+                $expected,
+                $result,
+                "Assertion failed for test marker '{$testMarker}' with condition {$conditionType}"
+            );
+        }
+
+    }//end testGetCondition()
+
+
+    /**
+     * Data provider.
+     *
+     * Only the conditions which are expected to be *found* need to be listed here.
+     * All other potential conditions will automatically also be tested and will expect
+     * `false` as a result.
+     *
+     * @see testGetCondition() For the array format.
+     *
+     * @return array<string, array<string, string|array<string, string>>>
+     */
+    public static function dataGetCondition()
+    {
+        return 
+            'testSeriouslyNestedMethod' => 
+                'testMarker'      => '/* testSeriouslyNestedMethod */',
+                'expectedResults' => 
+                    'T_CLASS'     => '/* condition 5: nested class */',
+                    'T_NAMESPACE' => '/* condition 0: namespace */',
+                    'T_FUNCTION'  => '/* condition 2: function */',
+                    'T_IF'        => '/* condition 1: if */',
+                    'T_ELSE'      => '/* condition 3-2: else */',
+                ,
+            ,
+            'testDeepestNested'         => 
+                'testMarker'      => '/* testDeepestNested */',
+                'expectedResults' => 
+                    'T_CLASS'      => '/* condition 5: nested class */',
+                    'T_ANON_CLASS' => '/* condition 11-1: nested anonymous class */',
+                    'T_NAMESPACE'  => '/* condition 0: namespace */',
+                    'T_FUNCTION'   => '/* condition 2: function */',
+                    'T_CLOSURE'    => '/* condition 13: closure */',
+                    'T_IF'         => '/* condition 1: if */',
+                    'T_SWITCH'     => '/* condition 7: switch */',
+                    'T_CASE'       => '/* condition 8a: case */',
+                    'T_WHILE'      => '/* condition 9: while */',
+                    'T_ELSE'       => '/* condition 3-2: else */',
+                ,
+            ,
+            'testInException'           => 
+                'testMarker'      => '/* testInException */',
+                'expectedResults' => 
+                    'T_CLASS'     => '/* condition 5: nested class */',
+                    'T_NAMESPACE' => '/* condition 0: namespace */',
+                    'T_FUNCTION'  => '/* condition 2: function */',
+                    'T_IF'        => '/* condition 1: if */',
+                    'T_SWITCH'    => '/* condition 7: switch */',
+                    'T_CASE'      => '/* condition 8a: case */',
+                    'T_WHILE'     => '/* condition 9: while */',
+                    'T_ELSE'      => '/* condition 3-2: else */',
+                    'T_FOREACH'   => '/* condition 10-3: foreach */',
+                    'T_CATCH'     => '/* condition 11-3: catch */',
+                ,
+            ,
+            'testInDefault'             => 
+                'testMarker'      => '/* testInDefault */',
+                'expectedResults' => 
+                    'T_CLASS'     => '/* condition 5: nested class */',
+                    'T_NAMESPACE' => '/* condition 0: namespace */',
+                    'T_FUNCTION'  => '/* condition 2: function */',
+                    'T_IF'        => '/* condition 1: if */',
+                    'T_SWITCH'    => '/* condition 7: switch */',
+                    'T_DEFAULT'   => '/* condition 8b: default */',
+                    'T_ELSE'      => '/* condition 3-2: else */',
+                ,
+            ,
+        ;
+
+    }//end dataGetCondition()
+
+
+    /**
+     * Test retrieving a specific condition from a tokens "conditions" array.
+     *
+     * @param string                $testMarker      The comment which prefaces the target token in the test file.
+     * @param array<string, string> $expectedResults Array with the condition token type to search for as key
+     *                                               and the marker for the expected stack pointer result as a value.
+     *
+     * @dataProvider dataGetConditionReversed
+     *
+     * @return void
+     */
+    public function testGetConditionReversed($testMarker, $expectedResults)
+    {
+        $stackPtr = self::$testTokens$testMarker;
+
+        // Add expected results for all test markers not listed in the data provider.
+        $expectedResults += $this->conditionDefaults;
+
+        foreach ($expectedResults as $conditionType => $expected) {
+            if (is_string($expected) === true) {
+                $expected = self::$markerTokens$expected;
+            }
+
+            $result = self::$phpcsFile->getCondition($stackPtr, constant($conditionType), false);
+            $this->assertSame(
+                $expected,
+                $result,
+                "Assertion failed for test marker '{$testMarker}' with condition {$conditionType} (reversed)"
+            );
+        }
+
+    }//end testGetConditionReversed()
+
+
+    /**
+     * Data provider.
+     *
+     * Only the conditions which are expected to be *found* need to be listed here.
+     * All other potential conditions will automatically also be tested and will expect
+     * `false` as a result.
+     *
+     * @see testGetConditionReversed() For the array format.
+     *
+     * @return array<string, array<string, string|array<string, string>>>
+     */
+    public static function dataGetConditionReversed()
+    {
+        $data = self::dataGetCondition();
+
+        // Set up the data for the reversed results.
+        $data'testSeriouslyNestedMethod''expectedResults''T_IF' = '/* condition 4: if */';
+
+        $data'testDeepestNested''expectedResults''T_FUNCTION' = '/* condition 12: nested anonymous class method */';
+        $data'testDeepestNested''expectedResults''T_IF'       = '/* condition 10-1: if */';
+
+        $data'testInException''expectedResults''T_FUNCTION' = '/* condition 6: class method */';
+        $data'testInException''expectedResults''T_IF'       = '/* condition 4: if */';
+
+        $data'testInDefault''expectedResults''T_FUNCTION' = '/* condition 6: class method */';
+        $data'testInDefault''expectedResults''T_IF'       = '/* condition 4: if */';
+
+        return $data;
+
+    }//end dataGetConditionReversed()
+
+
+    /**
+     * Test whether a token has a condition of a certain type.
+     *
+     * @param string              $testMarker      The comment which prefaces the target token in the test file.
+     * @param array<string, bool> $expectedResults Array with the condition token type to search for as key
+     *                                             and the expected result as a value.
+     *
+     * @dataProvider dataHasCondition
+     *
+     * @return void
+     */
+    public function testHasCondition($testMarker, $expectedResults)
+    {
+        $stackPtr = self::$testTokens$testMarker;
+
+        // Add expected results for all test markers not listed in the data provider.
+        $expectedResults += $this->conditionDefaults;
+
+        foreach ($expectedResults as $conditionType => $expected) {
+            $result = self::$phpcsFile->hasCondition($stackPtr, constant($conditionType));
+            $this->assertSame(
+                $expected,
+                $result,
+                "Assertion failed for test marker '{$testMarker}' with condition {$conditionType}"
+            );
+        }
+
+    }//end testHasCondition()
+
+
+    /**
+     * Data Provider.
+     *
+     * Only list the "true" conditions in the $results array.
+     * All other potential conditions will automatically also be tested
+     * and will expect "false" as a result.
+     *
+     * @see testHasCondition() For the array format.
+     *
+     * @return array<string, array<string, string|array<string, bool>>>
+     */
+    public static function dataHasCondition()
+    {
+        return 
+            'testSeriouslyNestedMethod' => 
+                'testMarker'      => '/* testSeriouslyNestedMethod */',
+                'expectedResults' => 
+                    'T_CLASS'     => true,
+                    'T_NAMESPACE' => true,
+                    'T_FUNCTION'  => true,
+                    'T_IF'        => true,
+                    'T_ELSE'      => true,
+                ,
+            ,
+            'testDeepestNested'         => 
+                'testMarker'      => '/* testDeepestNested */',
+                'expectedResults' => 
+                    'T_CLASS'      => true,
+                    'T_ANON_CLASS' => true,
+                    'T_NAMESPACE'  => true,
+                    'T_FUNCTION'   => true,
+                    'T_CLOSURE'    => true,
+                    'T_IF'         => true,
+                    'T_SWITCH'     => true,
+                    'T_CASE'       => true,
+                    'T_WHILE'      => true,
+                    'T_ELSE'       => true,
+                ,
+            ,
+            'testInException'           => 
+                'testMarker'      => '/* testInException */',
+                'expectedResults' => 
+                    'T_CLASS'     => true,
+                    'T_NAMESPACE' => true,
+                    'T_FUNCTION'  => true,
+                    'T_IF'        => true,
+                    'T_SWITCH'    => true,
+                    'T_CASE'      => true,
+                    'T_WHILE'     => true,
+                    'T_ELSE'      => true,
+                    'T_FOREACH'   => true,
+                    'T_CATCH'     => true,
+                ,
+            ,
+            'testInDefault'             => 
+                'testMarker'      => '/* testInDefault */',
+                'expectedResults' => 
+                    'T_CLASS'     => true,
+                    'T_NAMESPACE' => true,
+                    'T_FUNCTION'  => true,
+                    'T_IF'        => true,
+                    'T_SWITCH'    => true,
+                    'T_DEFAULT'   => true,
+                    'T_ELSE'      => true,
+                ,
+            ,
+        ;
+
+    }//end dataHasCondition()
+
+
+    /**
+     * Test whether a token has a condition of a certain type, with multiple allowed possibilities.
+     *
+     * @return void
+     */
+    public function testHasConditionMultipleTypes()
+    {
+        $stackPtr = self::$testTokens'/* testInException */';
+
+        $result = self::$phpcsFile->hasCondition($stackPtr, T_TRY, T_FINALLY);
+        $this->assertFalse(
+            $result,
+            'Failed asserting that "testInException" does not have a "try" nor a "finally" condition'
+        );
+
+        $result = self::$phpcsFile->hasCondition($stackPtr, T_TRY, T_CATCH, T_FINALLY);
+        $this->assertTrue(
+            $result,
+            'Failed asserting that "testInException" has a "try", "catch" or "finally" condition'
+        );
+
+        $stackPtr = self::$testTokens'/* testSeriouslyNestedMethod */';
+
+        $result = self::$phpcsFile->hasCondition($stackPtr, T_ANON_CLASS, T_CLOSURE);
+        $this->assertFalse(
+            $result,
+            'Failed asserting that "testSeriouslyNestedMethod" does not have an anonymous class nor a closure condition'
+        );
+
+        $result = self::$phpcsFile->hasCondition($stackPtr, Tokens::$ooScopeTokens);
+        $this->assertTrue(
+            $result,
+            'Failed asserting that "testSeriouslyNestedMethod" has an OO Scope token condition'
+        );
+
+    }//end testHasConditionMultipleTypes()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetDeclarationNameJSTest.js Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetDeclarationNameJSTest.php Added

@@ -0,0 +1,158 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getDeclarationName method.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2022-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\File;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:getDeclarationName method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getDeclarationName
+ */
+class GetDeclarationNameJSTest extends AbstractMethodUnitTest
+{
+
+    /**
+     * The file extension of the test case file (without leading dot).
+     *
+     * @var string
+     */
+    protected static $fileExtension = 'js';
+
+
+    /**
+     * Test receiving an expected exception when a non-supported token is passed.
+     *
+     * @return void
+     */
+    public function testInvalidTokenPassed()
+    {
+        $this->expectRunTimeException('Token type "T_STRING" is not T_FUNCTION, T_CLASS, T_INTERFACE, T_TRAIT or T_ENUM');
+
+        $target = $this->getTargetToken('/* testInvalidTokenPassed */', T_STRING);
+        self::$phpcsFile->getDeclarationName($target);
+
+    }//end testInvalidTokenPassed()
+
+
+    /**
+     * Test receiving "null" when passed an anonymous construct or in case of a parse error.
+     *
+     * @param string     $testMarker The comment which prefaces the target token in the test file.
+     * @param int|string $targetType Token type of the token to get as stackPtr.
+     *
+     * @dataProvider dataGetDeclarationNameNull
+     *
+     * @return void
+     */
+    public function testGetDeclarationNameNull($testMarker, $targetType)
+    {
+        $target = $this->getTargetToken($testMarker, $targetType);
+        $result = self::$phpcsFile->getDeclarationName($target);
+        $this->assertNull($result);
+
+    }//end testGetDeclarationNameNull()
+
+
+    /**
+     * Data provider.
+     *
+     * @see GetDeclarationNameTest::testGetDeclarationNameNull()
+     *
+     * @return array<string, array<string, int|string>>
+     */
+    public static function dataGetDeclarationNameNull()
+    {
+        return 
+            'closure' => 
+                'testMarker' => '/* testClosure */',
+                'targetType' => T_CLOSURE,
+            ,
+        ;
+
+    }//end dataGetDeclarationNameNull()
+
+
+    /**
+     * Test retrieving the name of a function or OO structure.
+     *
+     * @param string                 $testMarker The comment which prefaces the target token in the test file.
+     * @param string                 $expected   Expected function output.
+     * @param array<int|string>|null $targetType Token type of the token to get as stackPtr.
+     *
+     * @dataProvider dataGetDeclarationName
+     *
+     * @return void
+     */
+    public function testGetDeclarationName($testMarker, $expected, $targetType=null)
+    {
+        if (isset($targetType) === false) {
+            $targetType = 
+                T_CLASS,
+                T_INTERFACE,
+                T_TRAIT,
+                T_ENUM,
+                T_FUNCTION,
+            ;
+        }
+
+        $target = $this->getTargetToken($testMarker, $targetType);
+        $result = self::$phpcsFile->getDeclarationName($target);
+        $this->assertSame($expected, $result);
+
+    }//end testGetDeclarationName()
+
+
+    /**
+     * Data provider.
+     *
+     * @see GetDeclarationNameTest::testGetDeclarationName()
+     *
+     * @return array<string, array<string, string|array<int|string>>>
+     */
+    public static function dataGetDeclarationName()
+    {
+        return 
+            'function'              => 
+                'testMarker' => '/* testFunction */',
+                'expected'   => 'functionName',
+            ,
+            'class'                 => 
+                'testMarker' => '/* testClass */',
+                'expected'   => 'ClassName',
+                'targetType' => 
+                    T_CLASS,
+                    T_STRING,
+                ,
+            ,
+            'function-unicode-name' => 
+                'testMarker' => '/* testFunctionUnicode */',
+                'expected'   => 'π',
+            ,
+        ;
+
+    }//end dataGetDeclarationName()
+
+
+    /**
+     * Test retrieving the name of JS ES6 class method.
+     *
+     * @return void
+     */
+    public function testGetDeclarationNameES6Method()
+    {
+        $target = $this->getTargetToken('/* testMethod */', T_CLASS, T_INTERFACE, T_TRAIT, T_FUNCTION);
+        $result = self::$phpcsFile->getDeclarationName($target);
+        $this->assertSame('methodName', $result);
+
+    }//end testGetDeclarationNameES6Method()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetDeclarationNameTest.inc Added

@@ -0,0 +1,102 @@
+<?php
+
+/* testInvalidTokenPassed */
+echo MY_CONSTANT;
+
+/* testClosure */
+$closure = function() {};
+
+/* testAnonClassWithParens */
+$anonClass = new class() {};
+
+/* testAnonClassWithParens2 */
+$class = new class() {
+    private $property = 'test';
+    public function test() {}
+};
+
+/* testAnonClassWithoutParens */
+$anonClass = new class {};
+
+/* testAnonClassExtendsWithoutParens */
+$class = new class extends SomeClass {
+    private $property = 'test';
+    public function test() {}
+};
+
+/* testFunction */
+function functionName() {}
+
+/* testFunctionReturnByRef */
+function & functionNameByRef() {}
+
+/* testClass */
+abstract class ClassName {
+    /* testMethod */
+    public function methodName() {}
+
+    /* testAbstractMethod */
+    abstract protected function abstractMethodName();
+
+    /* testMethodReturnByRef */
+    private function &MethodNameByRef();
+}
+
+/* testExtendedClass */
+class ExtendedClass extends Foo {}
+
+/* testInterface */
+interface InterfaceName {}
+
+/* testTrait */
+trait TraitName {
+    /* testFunctionEndingWithNumber */
+    function ValidNameEndingWithNumber5(){}
+}
+
+/* testClassWithNumber */
+class ClassWith1Number implements SomeInterface {}
+
+/* testInterfaceWithNumbers */
+interface InterfaceWith12345Numbers extends AnotherInterface {}
+
+/* testClassWithCommentsAndNewLines */
+class /* comment */
+
+// phpcs:ignore Standard.Cat.SniffName -- for reasons
+    ClassWithCommentsAndNewLines {}
+
+/* testFunctionFn */
+function fn() {}
+
+/* testPureEnum */
+enum Foo
+{
+    case SOME_CASE;
+}
+
+/* testBackedEnumSpaceBetweenNameAndColon */
+enum Hoo : string
+{
+    case ONE = 'one';
+    case TWO = 'two';
+}
+
+/* testBackedEnumNoSpaceBetweenNameAndColon */
+enum Suit: int implements Colorful, CardGame {}
+
+/* testFunctionReturnByRefWithReservedKeywordEach */
+function &each() {}
+
+/* testFunctionReturnByRefWithReservedKeywordParent */
+function &parent() {}
+
+/* testFunctionReturnByRefWithReservedKeywordSelf */
+function &self() {}
+
+/* testFunctionReturnByRefWithReservedKeywordStatic */
+function &static() {}
+
+/* testLiveCoding */
+// Intentional parse error. This has to be the last test in the file.
+function // Comment.

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetDeclarationNameTest.php Added

@@ -0,0 +1,225 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getDeclarationName method.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2022-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\File;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:getDeclarationName method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getDeclarationName
+ */
+class GetDeclarationNameTest extends AbstractMethodUnitTest
+{
+
+
+    /**
+     * Test receiving an expected exception when a non-supported token is passed.
+     *
+     * @return void
+     */
+    public function testInvalidTokenPassed()
+    {
+        $this->expectRunTimeException('Token type "T_STRING" is not T_FUNCTION, T_CLASS, T_INTERFACE, T_TRAIT or T_ENUM');
+
+        $target = $this->getTargetToken('/* testInvalidTokenPassed */', T_STRING);
+        self::$phpcsFile->getDeclarationName($target);
+
+    }//end testInvalidTokenPassed()
+
+
+    /**
+     * Test receiving "null" when passed an anonymous construct or in case of a parse error.
+     *
+     * @param string     $testMarker The comment which prefaces the target token in the test file.
+     * @param int|string $targetType Token type of the token to get as stackPtr.
+     *
+     * @dataProvider dataGetDeclarationNameNull
+     *
+     * @return void
+     */
+    public function testGetDeclarationNameNull($testMarker, $targetType)
+    {
+        $target = $this->getTargetToken($testMarker, $targetType);
+        $result = self::$phpcsFile->getDeclarationName($target);
+        $this->assertNull($result);
+
+    }//end testGetDeclarationNameNull()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testGetDeclarationNameNull() For the array format.
+     *
+     * @return array<string, array<string, int|string>>
+     */
+    public static function dataGetDeclarationNameNull()
+    {
+        return 
+            'closure'                                => 
+                'testMarker' => '/* testClosure */',
+                'targetType' => T_CLOSURE,
+            ,
+            'anon-class-with-parentheses'            => 
+                'testMarker' => '/* testAnonClassWithParens */',
+                'targetType' => T_ANON_CLASS,
+            ,
+            'anon-class-with-parentheses-2'          => 
+                'testMarker' => '/* testAnonClassWithParens2 */',
+                'targetType' => T_ANON_CLASS,
+            ,
+            'anon-class-without-parentheses'         => 
+                'testMarker' => '/* testAnonClassWithoutParens */',
+                'targetType' => T_ANON_CLASS,
+            ,
+            'anon-class-extends-without-parentheses' => 
+                'testMarker' => '/* testAnonClassExtendsWithoutParens */',
+                'targetType' => T_ANON_CLASS,
+            ,
+            'live-coding'                            => 
+                'testMarker' => '/* testLiveCoding */',
+                'targetType' => T_FUNCTION,
+            ,
+        ;
+
+    }//end dataGetDeclarationNameNull()
+
+
+    /**
+     * Test retrieving the name of a function or OO structure.
+     *
+     * @param string          $testMarker The comment which prefaces the target token in the test file.
+     * @param string          $expected   Expected function output.
+     * @param int|string|null $targetType Token type of the token to get as stackPtr.
+     *
+     * @dataProvider dataGetDeclarationName
+     *
+     * @return void
+     */
+    public function testGetDeclarationName($testMarker, $expected, $targetType=null)
+    {
+        if (isset($targetType) === false) {
+            $targetType = 
+                T_CLASS,
+                T_INTERFACE,
+                T_TRAIT,
+                T_ENUM,
+                T_FUNCTION,
+            ;
+        }
+
+        $target = $this->getTargetToken($testMarker, $targetType);
+        $result = self::$phpcsFile->getDeclarationName($target);
+        $this->assertSame($expected, $result);
+
+    }//end testGetDeclarationName()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testGetDeclarationName() For the array format.
+     *
+     * @return array<string, array<string, string>>
+     */
+    public static function dataGetDeclarationName()
+    {
+        return 
+            'function'                                                  => 
+                'testMarker' => '/* testFunction */',
+                'expected'   => 'functionName',
+            ,
+            'function-return-by-reference'                              => 
+                'testMarker' => '/* testFunctionReturnByRef */',
+                'expected'   => 'functionNameByRef',
+            ,
+            'class'                                                     => 
+                'testMarker' => '/* testClass */',
+                'expected'   => 'ClassName',
+            ,
+            'method'                                                    => 
+                'testMarker' => '/* testMethod */',
+                'expected'   => 'methodName',
+            ,
+            'abstract-method'                                           => 
+                'testMarker' => '/* testAbstractMethod */',
+                'expected'   => 'abstractMethodName',
+            ,
+            'method-return-by-reference'                                => 
+                'testMarker' => '/* testMethodReturnByRef */',
+                'expected'   => 'MethodNameByRef',
+            ,
+            'extended-class'                                            => 
+                'testMarker' => '/* testExtendedClass */',
+                'expected'   => 'ExtendedClass',
+            ,
+            'interface'                                                 => 
+                'testMarker' => '/* testInterface */',
+                'expected'   => 'InterfaceName',
+            ,
+            'trait'                                                     => 
+                'testMarker' => '/* testTrait */',
+                'expected'   => 'TraitName',
+            ,
+            'function-name-ends-with-number'                            => 
+                'testMarker' => '/* testFunctionEndingWithNumber */',
+                'expected'   => 'ValidNameEndingWithNumber5',
+            ,
+            'class-with-numbers-in-name'                                => 
+                'testMarker' => '/* testClassWithNumber */',
+                'expected'   => 'ClassWith1Number',
+            ,
+            'interface-with-numbers-in-name'                            => 
+                'testMarker' => '/* testInterfaceWithNumbers */',
+                'expected'   => 'InterfaceWith12345Numbers',
+            ,
+            'class-with-comments-and-new-lines'                         => 
+                'testMarker' => '/* testClassWithCommentsAndNewLines */',
+                'expected'   => 'ClassWithCommentsAndNewLines',
+            ,
+            'function-named-fn'                                         => 
+                'testMarker' => '/* testFunctionFn */',
+                'expected'   => 'fn',
+            ,
+            'enum-pure'                                                 => 
+                'testMarker' => '/* testPureEnum */',
+                'expected'   => 'Foo',
+            ,
+            'enum-backed-space-between-name-and-colon'                  => 
+                'testMarker' => '/* testBackedEnumSpaceBetweenNameAndColon */',
+                'expected'   => 'Hoo',
+            ,
+            'enum-backed-no-space-between-name-and-colon'               => 
+                'testMarker' => '/* testBackedEnumNoSpaceBetweenNameAndColon */',
+                'expected'   => 'Suit',
+            ,
+            'function-return-by-reference-with-reserved-keyword-each'   => 
+                'testMarker' => '/* testFunctionReturnByRefWithReservedKeywordEach */',
+                'expected'   => 'each',
+            ,
+            'function-return-by-reference-with-reserved-keyword-parent' => 
+                'testMarker' => '/* testFunctionReturnByRefWithReservedKeywordParent */',
+                'expected'   => 'parent',
+            ,
+            'function-return-by-reference-with-reserved-keyword-self'   => 
+                'testMarker' => '/* testFunctionReturnByRefWithReservedKeywordSelf */',
+                'expected'   => 'self',
+            ,
+            'function-return-by-reference-with-reserved-keyword-static' => 
+                'testMarker' => '/* testFunctionReturnByRefWithReservedKeywordStatic */',
+                'expected'   => 'static',
+            ,
+        ;
+
+    }//end dataGetDeclarationName()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMemberPropertiesTest.inc Changed

@@ -39,7 +39,10 @@
     var static $varG = true;
 
     /* testPublicStatic */
-    public static $varH = true;
+    public // comment
+    // phpcs:ignore Stnd.Cat.Sniff -- For reasons.
+    static
+    $varH = true;
 
     /* testProtectedStatic */
     static protected $varI = true;
@@ -210,18 +213,19 @@
 
     /* testPHP8UnionTypesIllegalTypes */
     // Intentional fatal error - types which are not allowed for properties, but that's not the concern of the method.
-    public callable|static|void $unionTypesIllegalTypes;
+    // Note: static is also not allowed as a type, but using static for a property type is not supported by the tokenizer.
+    public callable|void $unionTypesIllegalTypes;
 
     /* testPHP8UnionTypesNullable */
     // Intentional fatal error - nullability is not allowed with union types, but that's not the concern of the method.
     public ?int|float $unionTypesNullable;
 
     /* testPHP8PseudoTypeNull */
-    // Intentional fatal error - null pseudotype is only allowed in union types, but that's not the concern of the method.
+    // PHP 8.0 - 8.1: Intentional fatal error - null pseudotype is only allowed in union types, but that's not the concern of the method.
     public null $pseudoTypeNull;
 
     /* testPHP8PseudoTypeFalse */
-    // Intentional fatal error - false pseudotype is only allowed in union types, but that's not the concern of the method.
+    // PHP 8.0 - 8.1: Intentional fatal error - false pseudotype is only allowed in union types, but that's not the concern of the method.
     public false $pseudoTypeFalse;
 
     /* testPHP8PseudoTypeFalseAndBool */
@@ -244,7 +248,7 @@
     public readonly int $readonly;
 
     /* testPHP81ReadonlyWithNullableType */
-    public readonly ?array $array;
+    public readonly ?array $readonlyWithNullableType;
 
     /* testPHP81ReadonlyWithUnionType */
     public readonly string|int $readonlyWithUnionType;
@@ -254,6 +258,16 @@
 
     /* testPHP81OnlyReadonlyWithUnionType */
     readonly string|int $onlyReadonly;
+
+    /* testPHP81OnlyReadonlyWithUnionTypeMultiple */
+    readonly \InterfaceA|\Sub\InterfaceB|false
+        $onlyReadonly;
+
+    /* testPHP81ReadonlyAndStatic */
+    readonly private static ?string $readonlyAndStatic;
+
+    /* testPHP81ReadonlyMixedCase */
+    public ReadONLY static $readonlyMixedCase;
 };
 
 $anon = class {
@@ -298,7 +312,30 @@
     // Intentional fatal error - types which are not allowed for intersection type, but that's not the concern of the method.
     public int&string $illegalIntersectionType;
 
-    /* testPHP81NulltableIntersectionType */
+    /* testPHP81NullableIntersectionType */
     // Intentional fatal error - nullability is not allowed with intersection type, but that's not the concern of the method.
     public ?Foo&Bar $nullableIntersectionType;
 };
+
+$anon = class() {
+    /* testPHP82PseudoTypeTrue */
+    public true $pseudoTypeTrue;
+
+    /* testPHP82NullablePseudoTypeTrue */
+    static protected ?true $pseudoTypeNullableTrue;
+
+    /* testPHP82PseudoTypeTrueInUnion */
+    private int|string|true $pseudoTypeTrueInUnion;
+
+    /* testPHP82PseudoTypeFalseAndTrue */
+    // Intentional fatal error - Type contains both true and false, bool should be used instead, but that's not the concern of the method.
+    readonly true|FALSE $pseudoTypeFalseAndTrue;
+};
+
+class WhitespaceAndCommentsInTypes {
+    /* testUnionTypeWithWhitespaceAndComment */
+    public int | /*comment*/ string $hasWhitespaceAndComment;
+
+    /* testIntersectionTypeWithWhitespaceAndComment */
+    public \Foo /*comment*/ & Bar $hasWhitespaceAndComment;
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMemberPropertiesTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getMemberProperties method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getMemberProperties
+ */
 class GetMemberPropertiesTest extends AbstractMethodUnitTest
 {
 
@@ -18,8 +23,8 @@
     /**
      * Test the getMemberProperties() method.
      *
-     * @param string $identifier Comment which precedes the test case.
-     * @param bool   $expected   Expected function output.
+     * @param string                         $identifier Comment which precedes the test case.
+     * @param array<string, string|int|bool> $expected   Expected function output.
      *
      * @dataProvider dataGetMemberProperties
      *
@@ -30,7 +35,16 @@
         $variable = $this->getTargetToken($identifier, T_VARIABLE);
         $result   = self::$phpcsFile->getMemberProperties($variable);
 
-        $this->assertArraySubset($expected, $result, true);
+        // Convert offsets to absolute positions in the token stream.
+        if (isset($expected'type_token') === true && is_int($expected'type_token') === true) {
+            $expected'type_token' += $variable;
+        }
+
+        if (isset($expected'type_end_token') === true && is_int($expected'type_end_token') === true) {
+            $expected'type_end_token' += $variable;
+        }
+
+        $this->assertSame($expected, $result);
 
     }//end testGetMemberProperties()
 
@@ -38,766 +52,1029 @@
     /**
      * Data provider for the GetMemberProperties test.
      *
+     * Note: the `expected - type_token` and `expected - type_end_token` indexes should
+     * contain either `false` (no type) or the _offset_ of the type start/end token in
+     * relation to the `T_VARIABLE` token which is passed to the getMemberProperties() method.
+     *
      * @see testGetMemberProperties()
      *
-     * @return array
+     * @return array<string, array<string|array<string, string|int|bool>>>
      */
     public function dataGetMemberProperties()
     {
         return 
-            
-                '/* testVar */',
-                
+            'var-modifier'                                                 => 
+                'identifier' => '/* testVar */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testVarType */',
-                
+            'var-modifier-and-type'                                        => 
+                'identifier' => '/* testVarType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?int',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testPublic */',
-                
+            'public-modifier'                                              => 
+                'identifier' => '/* testPublic */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPublicType */',
-                
+            'public-modifier-and-type'                                     => 
+                'identifier' => '/* testPublicType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'string',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testProtected */',
-                
+            'protected-modifier'                                           => 
+                'identifier' => '/* testProtected */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testProtectedType */',
-                
+            'protected-modifier-and-type'                                  => 
+                'identifier' => '/* testProtectedType */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'bool',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPrivate */',
-                
+            'private-modifier'                                             => 
+                'identifier' => '/* testPrivate */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPrivateType */',
-                
+            'private-modifier-and-type'                                    => 
+                'identifier' => '/* testPrivateType */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'array',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testStatic */',
-                
+            'static-modifier'                                              => 
+                'identifier' => '/* testStatic */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testStaticType */',
-                
+            'static-modifier-and-type'                                     => 
+                'identifier' => '/* testStaticType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '?string',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testStaticVar */',
-                
+            'static-and-var-modifier'                                      => 
+                'identifier' => '/* testStaticVar */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testVarStatic */',
-                
+            'var-and-static-modifier'                                      => 
+                'identifier' => '/* testVarStatic */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPublicStatic */',
-                
+            'public-static-modifiers'                                      => 
+                'identifier' => '/* testPublicStatic */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testProtectedStatic */',
-                
+            'protected-static-modifiers'                                   => 
+                'identifier' => '/* testProtectedStatic */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPrivateStatic */',
-                
+            'private-static-modifiers'                                     => 
+                'identifier' => '/* testPrivateStatic */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testNoPrefix */',
-                
+            'no-modifier'                                                  => 
+                'identifier' => '/* testNoPrefix */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPublicStaticWithDocblock */',
-                
+            'public-and-static-modifier-with-docblock'                     => 
+                'identifier' => '/* testPublicStaticWithDocblock */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testProtectedStaticWithDocblock */',
-                
+            'protected-and-static-modifier-with-docblock'                  => 
+                'identifier' => '/* testProtectedStaticWithDocblock */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPrivateStaticWithDocblock */',
-                
+            'private-and-static-modifier-with-docblock'                    => 
+                'identifier' => '/* testPrivateStaticWithDocblock */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupType 1 */',
-                
+            'property-group-simple-type-prop-1'                            => 
+                'identifier' => '/* testGroupType 1 */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'float',
+                    'type_token'      => -6,
+                    'type_end_token'  => -6,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupType 2 */',
-                
+            'property-group-simple-type-prop-2'                            => 
+                'identifier' => '/* testGroupType 2 */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'float',
+                    'type_token'      => -13,
+                    'type_end_token'  => -13,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupNullableType 1 */',
-                
+            'property-group-nullable-type-prop-1'                          => 
+                'identifier' => '/* testGroupNullableType 1 */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '?string',
+                    'type_token'      => -6,
+                    'type_end_token'  => -6,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testGroupNullableType 2 */',
-                
+            'property-group-nullable-type-prop-2'                          => 
+                'identifier' => '/* testGroupNullableType 2 */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '?string',
+                    'type_token'      => -17,
+                    'type_end_token'  => -17,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testGroupProtectedStatic 1 */',
-                
+            'property-group-protected-static-prop-1'                       => 
+                'identifier' => '/* testGroupProtectedStatic 1 */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupProtectedStatic 2 */',
-                
+            'property-group-protected-static-prop-2'                       => 
+                'identifier' => '/* testGroupProtectedStatic 2 */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupProtectedStatic 3 */',
-                
+            'property-group-protected-static-prop-3'                       => 
+                'identifier' => '/* testGroupProtectedStatic 3 */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupPrivate 1 */',
-                
+            'property-group-private-prop-1'                                => 
+                'identifier' => '/* testGroupPrivate 1 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupPrivate 2 */',
-                
+            'property-group-private-prop-2'                                => 
+                'identifier' => '/* testGroupPrivate 2 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupPrivate 3 */',
-                
+            'property-group-private-prop-3'                                => 
+                'identifier' => '/* testGroupPrivate 3 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupPrivate 4 */',
-                
+            'property-group-private-prop-4'                                => 
+                'identifier' => '/* testGroupPrivate 4 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupPrivate 5 */',
-                
+            'property-group-private-prop-5'                                => 
+                'identifier' => '/* testGroupPrivate 5 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupPrivate 6 */',
-                
+            'property-group-private-prop-6'                                => 
+                'identifier' => '/* testGroupPrivate 6 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testGroupPrivate 7 */',
-                
+            'property-group-private-prop-7'                                => 
+                'identifier' => '/* testGroupPrivate 7 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testMessyNullableType */',
-                
+            'messy-nullable-type'                                          => 
+                'identifier' => '/* testMessyNullableType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?array',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testNamespaceType */',
-                
+            'fqn-type'                                                     => 
+                'identifier' => '/* testNamespaceType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '\MyNamespace\MyClass',
+                    'type_token'      => -5,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testNullableNamespaceType 1 */',
-                
+            'nullable-classname-type'                                      => 
+                'identifier' => '/* testNullableNamespaceType 1 */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?ClassName',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testNullableNamespaceType 2 */',
-                
+            'nullable-namespace-relative-class-type'                       => 
+                'identifier' => '/* testNullableNamespaceType 2 */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?Folder\ClassName',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testMultilineNamespaceType */',
-                
+            'multiline-namespaced-type'                                    => 
+                'identifier' => '/* testMultilineNamespaceType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '\MyNamespace\MyClass\Foo',
+                    'type_token'      => -18,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPropertyAfterMethod */',
-                
+            'property-after-method'                                        => 
+                'identifier' => '/* testPropertyAfterMethod */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testInterfaceProperty */',
-                ,
+            'invalid-property-in-interface'                                => 
+                'identifier' => '/* testInterfaceProperty */',
+                'expected'   => ,
             ,
-            
-                '/* testNestedProperty 1 */',
-                
+            'property-in-nested-class-1'                                   => 
+                'identifier' => '/* testNestedProperty 1 */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testNestedProperty 2 */',
-                
+            'property-in-nested-class-2'                                   => 
+                'identifier' => '/* testNestedProperty 2 */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8MixedTypeHint */',
-                
+            'php8-mixed-type'                                              => 
+                'identifier' => '/* testPHP8MixedTypeHint */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => true,
                     'is_readonly'     => false,
                     'type'            => 'miXed',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8MixedTypeHintNullable */',
-                
+            'php8-nullable-mixed-type'                                     => 
+                'identifier' => '/* testPHP8MixedTypeHintNullable */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?mixed',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testNamespaceOperatorTypeHint */',
-                
+            'namespace-operator-type-declaration'                          => 
+                'identifier' => '/* testNamespaceOperatorTypeHint */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?namespace\Name',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testPHP8UnionTypesSimple */',
-                
+            'php8-union-types-simple'                                      => 
+                'identifier' => '/* testPHP8UnionTypesSimple */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'int|float',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8UnionTypesTwoClasses */',
-                
+            'php8-union-types-two-classes'                                 => 
+                'identifier' => '/* testPHP8UnionTypesTwoClasses */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'MyClassA|\Package\MyClassB',
+                    'type_token'      => -7,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8UnionTypesAllBaseTypes */',
-                
+            'php8-union-types-all-base-types'                              => 
+                'identifier' => '/* testPHP8UnionTypesAllBaseTypes */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'array|bool|int|float|NULL|object|string',
+                    'type_token'      => -14,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8UnionTypesAllPseudoTypes */',
-                
+            'php8-union-types-all-pseudo-types'                            => 
+                'identifier' => '/* testPHP8UnionTypesAllPseudoTypes */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'false|mixed|self|parent|iterable|Resource',
+                    'type_token'      => -12,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8UnionTypesIllegalTypes */',
-                
+            'php8-union-types-illegal-types'                               => 
+                'identifier' => '/* testPHP8UnionTypesIllegalTypes */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     // Missing static, but that's OK as not an allowed syntax.
-                    'type'            => 'callable||void',
+                    'type'            => 'callable|void',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8UnionTypesNullable */',
-                
+            'php8-union-types-nullable'                                    => 
+                'identifier' => '/* testPHP8UnionTypesNullable */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?int|float',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testPHP8PseudoTypeNull */',
-                
+            'php8-union-types-pseudo-type-null'                            => 
+                'identifier' => '/* testPHP8PseudoTypeNull */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'null',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8PseudoTypeFalse */',
-                
+            'php8-union-types-pseudo-type-false'                           => 
+                'identifier' => '/* testPHP8PseudoTypeFalse */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'false',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8PseudoTypeFalseAndBool */',
-                
+            'php8-union-types-pseudo-type-false-and-bool'                  => 
+                'identifier' => '/* testPHP8PseudoTypeFalseAndBool */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'bool|FALSE',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8ObjectAndClass */',
-                
+            'php8-union-types-object-and-class'                            => 
+                'identifier' => '/* testPHP8ObjectAndClass */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'object|ClassName',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8PseudoTypeIterableAndArray */',
-                
+            'php8-union-types-pseudo-type-iterable-and-array'              => 
+                'identifier' => '/* testPHP8PseudoTypeIterableAndArray */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'iterable|array|Traversable',
+                    'type_token'      => -6,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8DuplicateTypeInUnionWhitespaceAndComment */',
-                
+            'php8-union-types-duplicate-type-with-whitespace-and-comments' => 
+                'identifier' => '/* testPHP8DuplicateTypeInUnionWhitespaceAndComment */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'int|string|INT',
+                    'type_token'      => -10,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP81Readonly */',
-                
+            'php8.1-readonly-property'                                     => 
+                'identifier' => '/* testPHP81Readonly */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => true,
                     'type'            => 'int',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP81ReadonlyWithNullableType */',
-                
+            'php8.1-readonly-property-with-nullable-type'                  => 
+                'identifier' => '/* testPHP81ReadonlyWithNullableType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => true,
                     'type'            => '?array',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testPHP81ReadonlyWithUnionType */',
-                
+            'php8.1-readonly-property-with-union-type'                     => 
+                'identifier' => '/* testPHP81ReadonlyWithUnionType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => true,
                     'type'            => 'string|int',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP81ReadonlyWithUnionTypeWithNull */',
-                
+            'php8.1-readonly-property-with-union-type-with-null'           => 
+                'identifier' => '/* testPHP81ReadonlyWithUnionTypeWithNull */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => true,
                     'type'            => 'string|null',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP81OnlyReadonlyWithUnionType */',
-                
+            'php8.1-readonly-property-with-union-type-no-visibility'       => 
+                'identifier' => '/* testPHP81OnlyReadonlyWithUnionType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => false,
                     'is_static'       => false,
                     'is_readonly'     => true,
                     'type'            => 'string|int',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => false,
+                ,
+            ,
+            'php8.1-readonly-property-with-multi-union-type-no-visibility' => 
+                'identifier' => '/* testPHP81OnlyReadonlyWithUnionTypeMultiple */',
+                'expected'   => 
+                    'scope'           => 'public',
+                    'scope_specified' => false,
+                    'is_static'       => false,
+                    'is_readonly'     => true,
+                    'type'            => '\InterfaceA|\Sub\InterfaceB|false',
+                    'type_token'      => -11,
+                    'type_end_token'  => -3,
+                    'nullable_type'   => false,
+                ,
+            ,
+            'php8.1-readonly-and-static-property'                          => 
+                'identifier' => '/* testPHP81ReadonlyAndStatic */',
+                'expected'   => 
+                    'scope'           => 'private',
+                    'scope_specified' => true,
+                    'is_static'       => true,
+                    'is_readonly'     => true,
+                    'type'            => '?string',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => true,
+                ,
+            ,
+            'php8.1-readonly-mixed-case-keyword'                           => 
+                'identifier' => '/* testPHP81ReadonlyMixedCase */',
+                'expected'   => 
+                    'scope'           => 'public',
+                    'scope_specified' => true,
+                    'is_static'       => true,
+                    'is_readonly'     => true,
+                    'type'            => '',
+                    'type_token'      => false,
+                    'type_end_token'  => false,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8PropertySingleAttribute */',
-                
+            'php8-property-with-single-attribute'                          => 
+                'identifier' => '/* testPHP8PropertySingleAttribute */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'string',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP8PropertyMultipleAttributes */',
-                
+            'php8-property-with-multiple-attributes'                       => 
+                'identifier' => '/* testPHP8PropertyMultipleAttributes */',
+                'expected'   => 
                     'scope'           => 'protected',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => '?int|float',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
-            
-                '/* testPHP8PropertyMultilineAttribute */',
-                
+            'php8-property-with-multiline-attribute'                       => 
+                'identifier' => '/* testPHP8PropertyMultilineAttribute */',
+                'expected'   => 
                     'scope'           => 'private',
                     'scope_specified' => true,
                     'is_static'       => false,
                     'is_readonly'     => false,
                     'type'            => 'mixed',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testEnumProperty */',
-                ,
+            'invalid-property-in-enum'                                     => 
+                'identifier' => '/* testEnumProperty */',
+                'expected'   => ,
             ,
-            
-                '/* testPHP81IntersectionTypes */',
-                
+            'php8.1-single-intersection-type'                              => 
+                'identifier' => '/* testPHP81IntersectionTypes */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
+                    'is_readonly'     => false,
                     'type'            => 'Foo&Bar',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP81MoreIntersectionTypes */',
-                
+            'php8.1-multi-intersection-type'                               => 
+                'identifier' => '/* testPHP81MoreIntersectionTypes */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
+                    'is_readonly'     => false,
                     'type'            => 'Foo&Bar&Baz',
+                    'type_token'      => -6,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP81IllegalIntersectionTypes */',
-                
+            'php8.1-illegal-intersection-type'                             => 
+                'identifier' => '/* testPHP81IllegalIntersectionTypes */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
+                    'is_readonly'     => false,
                     'type'            => 'int&string',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => false,
                 ,
             ,
-            
-                '/* testPHP81NulltableIntersectionType */',
-                
+            'php8.1-nullable-intersection-type'                            => 
+                'identifier' => '/* testPHP81NullableIntersectionType */',
+                'expected'   => 
                     'scope'           => 'public',
                     'scope_specified' => true,
                     'is_static'       => false,
+                    'is_readonly'     => false,
                     'type'            => '?Foo&Bar',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
                     'nullable_type'   => true,
                 ,
             ,
+
+            'php8.0-union-type-with-whitespace-and-comment'                => 
+                'identifier' => '/* testUnionTypeWithWhitespaceAndComment */',
+                'expected'   => 
+                    'scope'           => 'public',
+                    'scope_specified' => true,
+                    'is_static'       => false,
+                    'is_readonly'     => false,
+                    'type'            => 'int|string',
+                    'type_token'      => -8,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => false,
+                ,
+            ,
+            'php8.1-intersection-type-with-whitespace-and-comment'         => 
+                'identifier' => '/* testIntersectionTypeWithWhitespaceAndComment */',
+                'expected'   => 
+                    'scope'           => 'public',
+                    'scope_specified' => true,
+                    'is_static'       => false,
+                    'is_readonly'     => false,
+                    'type'            => '\Foo&Bar',
+                    'type_token'      => -9,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => false,
+                ,
+            ,
+            'php8.2-pseudo-type-true'                                      => 
+                'identifier' => '/* testPHP82PseudoTypeTrue */',
+                'expected'   => 
+                    'scope'           => 'public',
+                    'scope_specified' => true,
+                    'is_static'       => false,
+                    'is_readonly'     => false,
+                    'type'            => 'true',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => false,
+                ,
+            ,
+            'php8.2-pseudo-type-true-nullable'                             => 
+                'identifier' => '/* testPHP82NullablePseudoTypeTrue */',
+                'expected'   => 
+                    'scope'           => 'protected',
+                    'scope_specified' => true,
+                    'is_static'       => true,
+                    'is_readonly'     => false,
+                    'type'            => '?true',
+                    'type_token'      => -2,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => true,
+                ,
+            ,
+            'php8.2-pseudo-type-true-in-union'                             => 
+                'identifier' => '/* testPHP82PseudoTypeTrueInUnion */',
+                'expected'   => 
+                    'scope'           => 'private',
+                    'scope_specified' => true,
+                    'is_static'       => false,
+                    'is_readonly'     => false,
+                    'type'            => 'int|string|true',
+                    'type_token'      => -6,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => false,
+                ,
+            ,
+            'php8.2-pseudo-type-invalid-true-false-union'                  => 
+                'identifier' => '/* testPHP82PseudoTypeFalseAndTrue */',
+                'expected'   => 
+                    'scope'           => 'public',
+                    'scope_specified' => false,
+                    'is_static'       => false,
+                    'is_readonly'     => true,
+                    'type'            => 'true|FALSE',
+                    'type_token'      => -4,
+                    'type_end_token'  => -2,
+                    'nullable_type'   => false,
+                ,
+            ,
+
         ;
 
     }//end dataGetMemberProperties()
@@ -808,15 +1085,14 @@
      *
      * @param string $identifier Comment which precedes the test case.
      *
-     * @expectedException        PHP_CodeSniffer\Exceptions\RuntimeException
-     * @expectedExceptionMessage $stackPtr is not a class member var
-     *
      * @dataProvider dataNotClassProperty
      *
      * @return void
      */
     public function testNotClassPropertyException($identifier)
     {
+        $this->expectRunTimeException('$stackPtr is not a class member var');
+
         $variable = $this->getTargetToken($identifier, T_VARIABLE);
         $result   = self::$phpcsFile->getMemberProperties($variable);
 
@@ -828,18 +1104,18 @@
      *
      * @see testNotClassPropertyException()
      *
-     * @return array
+     * @return array<string, array<string>>
      */
     public function dataNotClassProperty()
     {
         return 
-            '/* testMethodParam */',
-            '/* testImportedGlobal */',
-            '/* testLocalVariable */',
-            '/* testGlobalVariable */',
-            '/* testNestedMethodParam 1 */',
-            '/* testNestedMethodParam 2 */',
-            '/* testEnumMethodParamNotProperty */',
+            'method parameter'                                       => '/* testMethodParam */',
+            'variable import using global keyword'                   => '/* testImportedGlobal */',
+            'function local variable'                                => '/* testLocalVariable */',
+            'global variable'                                        => '/* testGlobalVariable */',
+            'method parameter in anon class nested in ternary'       => '/* testNestedMethodParam 1 */',
+            'method parameter in anon class nested in function call' => '/* testNestedMethodParam 2 */',
+            'method parameter in enum'                               => '/* testEnumMethodParamNotProperty */',
         ;
 
     }//end dataNotClassProperty()
@@ -848,13 +1124,12 @@
     /**
      * Test receiving an expected exception when a non variable is passed.
      *
-     * @expectedException        PHP_CodeSniffer\Exceptions\RuntimeException
-     * @expectedExceptionMessage $stackPtr must be of type T_VARIABLE
-     *
      * @return void
      */
     public function testNotAVariableException()
     {
+        $this->expectRunTimeException('$stackPtr must be of type T_VARIABLE');
+
         $next   = $this->getTargetToken('/* testNotAVariable */', T_RETURN);
         $result = self::$phpcsFile->getMemberProperties($next);

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersParseError1Test.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersParseError1Test.php Added

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2019-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\File;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getMethodParameters
+ */
+class GetMethodParametersParseError1Test extends AbstractMethodUnitTest
+{
+
+
+    /**
+     * Test receiving an empty array when encountering a specific parse error.
+     *
+     * @return void
+     */
+    public function testParseError()
+    {
+        $target = $this->getTargetToken('/* testParseError */', T_FUNCTION, T_CLOSURE, T_FN);
+        $result = self::$phpcsFile->getMethodParameters($target);
+
+        $this->assertSame(, $result);
+
+    }//end testParseError()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersParseError2Test.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersParseError2Test.php Added

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2019-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\File;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getMethodParameters
+ */
+class GetMethodParametersParseError2Test extends AbstractMethodUnitTest
+{
+
+
+    /**
+     * Test receiving an empty array when encountering a specific parse error.
+     *
+     * @return void
+     */
+    public function testParseError()
+    {
+        $target = $this->getTargetToken('/* testParseError */', T_FUNCTION, T_CLOSURE, T_FN);
+        $result = self::$phpcsFile->getMethodParameters($target);
+
+        $this->assertSame(, $result);
+
+    }//end testParseError()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersTest.inc Changed

@@ -1,5 +1,29 @@
 <?php
 
+/* testImportUse */
+use Vendor\Package\Sub as Alias;
+
+/* testImportGroupUse */
+use Vendor\Package\Sub\{
+    ClassA,
+    ClassB as BAlias,
+};
+
+if ($foo) {}
+
+/* testTraitUse */
+class TraitUse {
+    use ImportedTrait;
+
+    function methodName() {}
+}
+
+/* testNotAFunction */
+interface NotAFunction {};
+
+/* testFunctionNoParams */
+function noParams() {}
+
 /* testPassByReference */
 function passByReference(&$var) {}
 
@@ -32,6 +56,75 @@
 /* testArrowFunction */
 fn(int $a, ...$b) => $b;
 
+/* testArrowFunctionReturnByRef */
+fn&(?string $a) => $b;
+
+/* testArrayDefaultValues */
+function arrayDefaultValues($var1 = , $var2 = array(1, 2, 3) ) {}
+
+/* testConstantDefaultValueSecondParam */
+function constantDefaultValueSecondParam($var1, $var2 = M_PI) {}
+
+/* testScalarTernaryExpressionInDefault */
+function ternayInDefault( $a = FOO ? 'bar' : 10, ? bool $b ) {}
+
+/* testVariadicFunction */
+function variadicFunction( int ... $a ) {}
+
+/* testVariadicByRefFunction */
+function variadicByRefFunction( &...$a ) {}
+
+/* testVariadicFunctionClassType */
+function variableLengthArgument($unit, DateInterval ...$intervals) {}
+
+/* testNameSpacedTypeDeclaration */
+function namespacedClassType( \Package\Sub\ClassName $a, ?Sub\AnotherClass $b ) {}
+
+/* testWithAllTypes */
+class testAllTypes {
+    function allTypes(
+        ?ClassName $a,
+        self $b,
+        parent $c,
+        object $d,
+        ?int $e,
+        string &$f,
+        iterable $g,
+        bool $h = true,
+        callable $i = 'is_null',
+        float $j = 1.1,
+        array ...$k
+    ) {}
+}
+
+/* testArrowFunctionWithAllTypes */
+$fn = fn(
+    ?ClassName $a,
+    self $b,
+    parent $c,
+    object $d,
+    ?int $e,
+    string &$f,
+    iterable $g,
+    bool $h = true,
+    callable $i = 'is_null',
+    float $j = 1.1,
+    array ...$k
+) => $something;
+
+/* testMessyDeclaration */
+function messyDeclaration(
+    // comment
+    ?\MyNS /* comment */
+        \ SubCat // phpcs:ignore Standard.Cat.Sniff -- for reasons.
+            \  MyClass $a,
+    $b /* test */ = /* test */ 'default' /* test*/,
+    // phpcs:ignore Stnd.Cat.Sniff -- For reasons.
+    ? /*comment*/
+        bool // phpcs:disable Stnd.Cat.Sniff -- For reasons.
+        & /*test*/ ... /* phpcs:ignore */ $c
+) {}
+
 /* testPHP8MixedTypeHint */
 function mixedTypeHint(mixed &...$var1) {}
 
@@ -46,7 +139,7 @@
 function unionTypeSimple(int|float $number, self|parent &...$obj) {}
 
 /* testPHP8UnionTypesWithSpreadOperatorAndReference */
-function globalFunctionWithSpreadAndReference(float|null &$paramA, string|int ...$paramB) {}
+function globalFunctionWithSpreadAndReference(float|null &$paramA, string|int ...$paramB ) {}
 
 /* testPHP8UnionTypesSimpleWithBitwiseOrInDefault */
 $fn = fn(int|float $var = CONSTANT_A | CONSTANT_B) => $var;
@@ -66,11 +159,11 @@
 $closure = function (?int|float $number) {};
 
 /* testPHP8PseudoTypeNull */
-// Intentional fatal error - null pseudotype is only allowed in union types, but that's not the concern of the method.
+// PHP 8.0 - 8.1: Intentional fatal error - null pseudotype is only allowed in union types, but that's not the concern of the method.
 function pseudoTypeNull(null $var = null) {}
 
 /* testPHP8PseudoTypeFalse */
-// Intentional fatal error - false pseudotype is only allowed in union types, but that's not the concern of the method.
+// PHP 8.0 - 8.1: Intentional fatal error - false pseudotype is only allowed in union types, but that's not the concern of the method.
 function pseudoTypeFalse(false $var = false) {}
 
 /* testPHP8PseudoTypeFalseAndBool */
@@ -110,7 +203,18 @@
 
 class ConstructorPropertyPromotionWithReadOnly {
     /* testPHP81ConstructorPropertyPromotionWithReadOnly */
-    public function __construct(public readonly ?int $promotedProp, readonly private string|bool &$promotedToo) {}
+    public function __construct(public readonly ?int $promotedProp, ReadOnly private string|bool &$promotedToo) {}
+}
+
+class ConstructorPropertyPromotionWithReadOnlyNoTypeDeclaration {
+    /* testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclaration */
+    // Intentional fatal error. Readonly properties MUST be typed.
+    public function __construct(public readonly $promotedProp, ReadOnly private &$promotedToo) {}
+}
+
+class ConstructorPropertyPromotionWithOnlyReadOnly {
+    /* testPHP81ConstructorPropertyPromotionWithOnlyReadOnly */
+    public function __construct(readonly Foo&Bar $promotedProp, readonly ?bool $promotedToo,) {}
 }
 
 /* testPHP8ConstructorPropertyPromotionGlobalFunction */
@@ -162,3 +266,56 @@
 /* testPHP81NullableIntersectionTypes */
 // Intentional fatal error - nullability is not allowed with intersection types, but that's not the concern of the method.
 $closure = function (?Foo&Bar $object) {};
+
+/* testPHP82PseudoTypeTrue */
+function pseudoTypeTrue(?true $var = true) {}
+
+/* testPHP82PseudoTypeFalseAndTrue */
+// Intentional fatal error - Type contains both true and false, bool should be used instead, but that's not the concern of the method.
+function pseudoTypeFalseAndTrue(true|false $var = true) {}
+
+/* testPHP81NewInInitializers */
+function newInInitializers(
+    TypeA $new = new TypeA(self::CONST_VALUE),
+    \Package\TypeB $newToo = new \Package\TypeB(10, 'string'),
+) {}
+
+/* testFunctionCallFnPHPCS353-354 */
+$value = $obj->fn(true);
+
+/* testClosureNoParams */
+function() {};
+
+/* testClosure */
+function( $a = 'test' ) {};
+
+/* testClosureUseNoParams */
+function() use() {};
+
+/* testClosureUse */
+function() use( $foo, $bar ) {};
+
+/* testFunctionParamListWithTrailingComma */
+function trailingComma(
+    ?string $foo  /*comment*/ ,
+    $bar = 0,
+) {}
+
+/* testClosureParamListWithTrailingComma */
+function(
+    $foo,
+    $bar,
+) {};
+
+/* testArrowFunctionParamListWithTrailingComma */
+$fn = fn( ?int $a , ...$b, ) => $b;
+
+/* testClosureUseWithTrailingComma */
+function() use(
+    $foo  /*comment*/ ,
+    $bar,
+) {};
+
+/* testArrowFunctionLiveCoding */
+// Intentional parse error. This has to be the last test in the file.
+$fn = fn

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersTest.php Changed

@@ -1,36 +1,182 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:getMethodParameters method.
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @copyright 2019-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodParameters method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getMethodParameters
+ */
 class GetMethodParametersTest extends AbstractMethodUnitTest
 {
 
 
     /**
+     * Test receiving an expected exception when a non function/use token is passed.
+     *
+     * @param string                       $commentString   The comment which preceeds the test.
+     * @param int|string|array<int|string> $targetTokenType The token type to search for after $commentString.
+     *
+     * @dataProvider dataUnexpectedTokenException
+     *
+     * @return void
+     */
+    public function testUnexpectedTokenException($commentString, $targetTokenType)
+    {
+        $this->expectRunTimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or T_USE or T_FN');
+
+        $target = $this->getTargetToken($commentString, $targetTokenType);
+        self::$phpcsFile->getMethodParameters($target);
+
+    }//end testUnexpectedTokenException()
+
+
+    /**
+     * Data Provider.
+     *
+     * @see testUnexpectedTokenException() For the array format.
+     *
+     * @return array<string, array<string, int|string|array<int|string>>>
+     */
+    public static function dataUnexpectedTokenException()
+    {
+        return 
+            'interface'                          => 
+                'commentString'   => '/* testNotAFunction */',
+                'targetTokenType' => T_INTERFACE,
+            ,
+            'function-call-fn-phpcs-3.5.3-3.5.4' => 
+                'commentString'   => '/* testFunctionCallFnPHPCS353-354 */',
+                'targetTokenType' => 
+                    T_FN,
+                    T_STRING,
+                ,
+            ,
+            'fn-live-coding'                     => 
+                'commentString'   => '/* testArrowFunctionLiveCoding */',
+                'targetTokenType' => 
+                    T_FN,
+                    T_STRING,
+                ,
+            ,
+        ;
+
+    }//end dataUnexpectedTokenException()
+
+
+    /**
+     * Test receiving an expected exception when a non-closure use token is passed.
+     *
+     * @param string $identifier The comment which preceeds the test.
+     *
+     * @dataProvider dataInvalidUse
+     *
+     * @return void
+     */
+    public function testInvalidUse($identifier)
+    {
+        $this->expectRunTimeException('$stackPtr was not a valid T_USE');
+
+        $use = $this->getTargetToken($identifier, T_USE);
+        self::$phpcsFile->getMethodParameters($use);
+
+    }//end testInvalidUse()
+
+
+    /**
+     * Data Provider.
+     *
+     * @see testInvalidUse() For the array format.
+     *
+     * @return array<string, array<string>>
+     */
+    public static function dataInvalidUse()
+    {
+        return 
+            'ImportUse'      => '/* testImportUse */',
+            'ImportGroupUse' => '/* testImportGroupUse */',
+            'TraitUse'       => '/* testTraitUse */',
+        ;
+
+    }//end dataInvalidUse()
+
+
+    /**
+     * Test receiving an empty array when there are no parameters.
+     *
+     * @param string                       $commentString   The comment which preceeds the test.
+     * @param int|string|array<int|string> $targetTokenType Optional. The token type to search for after $commentString.
+     *                                                      Defaults to the function/closure/arrow tokens.
+     *
+     * @dataProvider dataNoParams
+     *
+     * @return void
+     */
+    public function testNoParams($commentString, $targetTokenType=T_FUNCTION, T_CLOSURE, T_FN)
+    {
+        $target = $this->getTargetToken($commentString, $targetTokenType);
+        $result = self::$phpcsFile->getMethodParameters($target);
+
+        $this->assertSame(, $result);
+
+    }//end testNoParams()
+
+
+    /**
+     * Data Provider.
+     *
+     * @see testNoParams() For the array format.
+     *
+     * @return array<string, array<int|string|array<int|string>>>
+     */
+    public static function dataNoParams()
+    {
+        return 
+            'FunctionNoParams'   => '/* testFunctionNoParams */',
+            'ClosureNoParams'    => '/* testClosureNoParams */',
+            'ClosureUseNoParams' => 
+                '/* testClosureUseNoParams */',
+                T_USE,
+            ,
+        ;
+
+    }//end dataNoParams()
+
+
+    /**
      * Verify pass-by-reference parsing.
      *
      * @return void
      */
     public function testPassByReference()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => '&$var',
-            'has_attributes'    => false,
-            'pass_by_reference' => true,
-            'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'token'               => 5,
+            'name'                => '$var',
+            'content'             => '&$var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 4,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -45,15 +191,22 @@
      */
     public function testArrayHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'array $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'array',
-            'nullable_type'     => false,
+            'token'               => 6,
+            'name'                => '$var',
+            'content'             => 'array $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'array',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -68,15 +221,22 @@
      */
     public function testVariable()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => '$var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'token'               => 4,
+            'name'                => '$var',
+            'content'             => '$var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -91,16 +251,25 @@
      */
     public function testSingleDefaultValue()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => '$var1=self::CONSTANT',
-            'has_attributes'    => false,
-            'default'           => 'self::CONSTANT',
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'token'               => 4,
+            'name'                => '$var1',
+            'content'             => '$var1=self::CONSTANT',
+            'default'             => 'self::CONSTANT',
+            'default_token'       => 6,
+            'default_equal_token' => 5,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -115,26 +284,43 @@
      */
     public function testDefaultValues()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => '$var1=1',
-            'has_attributes'    => false,
-            'default'           => '1',
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
-        ;
-        $expected1 = 
-            'name'              => '$var2',
-            'content'           => "\$var2='value'",
-            'has_attributes'    => false,
-            'default'           => "'value'",
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'token'               => 4,
+            'name'                => '$var1',
+            'content'             => '$var1=1',
+            'default'             => '1',
+            'default_token'       => 6,
+            'default_equal_token' => 5,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 7,
+        ;
+        $expected1 = 
+            'token'               => 9,
+            'name'                => '$var2',
+            'content'             => "\$var2='value'",
+            'default'             => "'value'",
+            'default_token'       => 11,
+            'default_equal_token' => 10,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -149,25 +335,38 @@
      */
     public function testTypeHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => 'foo $var1',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'foo',
-            'nullable_type'     => false,
+            'token'               => 6,
+            'name'                => '$var1',
+            'content'             => 'foo $var1',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'foo',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => false,
+            'comma_token'         => 7,
         ;
 
         $expected1 = 
-            'name'              => '$var2',
-            'content'           => 'bar $var2',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'bar',
-            'nullable_type'     => false,
+            'token'               => 11,
+            'name'                => '$var2',
+            'content'             => 'bar $var2',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'bar',
+            'type_hint_token'     => 9,
+            'type_hint_end_token' => 9,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -182,15 +381,22 @@
      */
     public function testSelfTypeHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'self $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'self',
-            'nullable_type'     => false,
+            'token'               => 6,
+            'name'                => '$var',
+            'content'             => 'self $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'self',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -205,25 +411,38 @@
      */
     public function testNullableTypeHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => '?int $var1',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?int',
-            'nullable_type'     => true,
+            'token'               => 7,
+            'name'                => '$var1',
+            'content'             => '?int $var1',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 5,
+            'nullable_type'       => true,
+            'comma_token'         => 8,
         ;
 
         $expected1 = 
-            'name'              => '$var2',
-            'content'           => '?\bar $var2',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?\bar',
-            'nullable_type'     => true,
+            'token'               => 14,
+            'name'                => '$var2',
+            'content'             => '?\bar $var2',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?\bar',
+            'type_hint_token'     => 11,
+            'type_hint_end_token' => 12,
+            'nullable_type'       => true,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -238,16 +457,25 @@
      */
     public function testBitwiseAndConstantExpressionDefaultValue()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$a',
-            'content'           => '$a = 10 & 20',
-            'default'           => '10 & 20',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'token'               => 4,
+            'name'                => '$a',
+            'content'             => '$a = 10 & 20',
+            'default'             => '10 & 20',
+            'default_token'       => 8,
+            'default_equal_token' => 6,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -262,25 +490,38 @@
      */
     public function testArrowFunction()
     {
+        // Offsets are relative to the T_FN token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$a',
-            'content'           => 'int $a',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'int',
-            'nullable_type'     => false,
+            'token'               => 4,
+            'name'                => '$a',
+            'content'             => 'int $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'int',
+            'type_hint_token'     => 2,
+            'type_hint_end_token' => 2,
+            'nullable_type'       => false,
+            'comma_token'         => 5,
         ;
 
         $expected1 = 
-            'name'              => '$b',
-            'content'           => '...$b',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => true,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'token'               => 8,
+            'name'                => '$b',
+            'content'             => '...$b',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 7,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -289,21 +530,802 @@
 
 
     /**
+     * Verify that arrow functions are supported.
+     *
+     * @return void
+     */
+    public function testArrowFunctionReturnByRef()
+    {
+        // Offsets are relative to the T_FN token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 6,
+            'name'                => '$a',
+            'content'             => '?string $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?string',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => true,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testArrowFunctionReturnByRef()
+
+
+    /**
+     * Verify default value parsing with array values.
+     *
+     * @return void
+     */
+    public function testArrayDefaultValues()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 4,
+            'name'                => '$var1',
+            'content'             => '$var1 = ',
+            'default'             => '',
+            'default_token'       => 8,
+            'default_equal_token' => 6,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 10,
+        ;
+        $expected1 = 
+            'token'               => 12,
+            'name'                => '$var2',
+            'content'             => '$var2 = array(1, 2, 3)',
+            'default'             => 'array(1, 2, 3)',
+            'default_token'       => 16,
+            'default_equal_token' => 14,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testArrayDefaultValues()
+
+
+    /**
+     * Verify having a T_STRING constant as a default value for the second parameter.
+     *
+     * @return void
+     */
+    public function testConstantDefaultValueSecondParam()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 4,
+            'name'                => '$var1',
+            'content'             => '$var1',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 5,
+        ;
+        $expected1 = 
+            'token'               => 7,
+            'name'                => '$var2',
+            'content'             => '$var2 = M_PI',
+            'default'             => 'M_PI',
+            'default_token'       => 11,
+            'default_equal_token' => 9,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testConstantDefaultValueSecondParam()
+
+
+    /**
+     * Verify distinquishing between a nullable type and a ternary within a default expression.
+     *
+     * @return void
+     */
+    public function testScalarTernaryExpressionInDefault()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 5,
+            'name'                => '$a',
+            'content'             => '$a = FOO ? \'bar\' : 10',
+            'default'             => 'FOO ? \'bar\' : 10',
+            'default_token'       => 9,
+            'default_equal_token' => 7,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 18,
+        ;
+        $expected1 = 
+            'token'               => 24,
+            'name'                => '$b',
+            'content'             => '? bool $b',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?bool',
+            'type_hint_token'     => 22,
+            'type_hint_end_token' => 22,
+            'nullable_type'       => true,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testScalarTernaryExpressionInDefault()
+
+
+    /**
+     * Verify a variadic parameter being recognized correctly.
+     *
+     * @return void
+     */
+    public function testVariadicFunction()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 9,
+            'name'                => '$a',
+            'content'             => 'int ... $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 7,
+            'type_hint'           => 'int',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 5,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testVariadicFunction()
+
+
+    /**
+     * Verify a variadic parameter passed by reference being recognized correctly.
+     *
+     * @return void
+     */
+    public function testVariadicByRefFunction()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 7,
+            'name'                => '$a',
+            'content'             => '&...$a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 5,
+            'variable_length'     => true,
+            'variadic_token'      => 6,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testVariadicByRefFunction()
+
+
+    /**
+     * Verify handling of a variadic parameter with a class based type declaration.
+     *
+     * @return void
+     */
+    public function testVariadicFunctionClassType()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 4,
+            'name'                => '$unit',
+            'content'             => '$unit',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 5,
+        ;
+        $expected1 = 
+            'token'               => 10,
+            'name'                => '$intervals',
+            'content'             => 'DateInterval ...$intervals',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 9,
+            'type_hint'           => 'DateInterval',
+            'type_hint_token'     => 7,
+            'type_hint_end_token' => 7,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testVariadicFunctionClassType()
+
+
+    /**
+     * Verify distinquishing between a nullable type and a ternary within a default expression.
+     *
+     * @return void
+     */
+    public function testNameSpacedTypeDeclaration()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 12,
+            'name'                => '$a',
+            'content'             => '\Package\Sub\ClassName $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '\Package\Sub\ClassName',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 10,
+            'nullable_type'       => false,
+            'comma_token'         => 13,
+        ;
+        $expected1 = 
+            'token'               => 20,
+            'name'                => '$b',
+            'content'             => '?Sub\AnotherClass $b',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?Sub\AnotherClass',
+            'type_hint_token'     => 16,
+            'type_hint_end_token' => 18,
+            'nullable_type'       => true,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testNameSpacedTypeDeclaration()
+
+
+    /**
+     * Verify correctly recognizing all type declarations supported by PHP.
+     *
+     * @return void
+     */
+    public function testWithAllTypes()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected     = ;
+        $expected0  = 
+            'token'               => 9,
+            'name'                => '$a',
+            'content'             => '?ClassName $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?ClassName',
+            'type_hint_token'     => 7,
+            'type_hint_end_token' => 7,
+            'nullable_type'       => true,
+            'comma_token'         => 10,
+        ;
+        $expected1  = 
+            'token'               => 15,
+            'name'                => '$b',
+            'content'             => 'self $b',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'self',
+            'type_hint_token'     => 13,
+            'type_hint_end_token' => 13,
+            'nullable_type'       => false,
+            'comma_token'         => 16,
+        ;
+        $expected2  = 
+            'token'               => 21,
+            'name'                => '$c',
+            'content'             => 'parent $c',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'parent',
+            'type_hint_token'     => 19,
+            'type_hint_end_token' => 19,
+            'nullable_type'       => false,
+            'comma_token'         => 22,
+        ;
+        $expected3  = 
+            'token'               => 27,
+            'name'                => '$d',
+            'content'             => 'object $d',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'object',
+            'type_hint_token'     => 25,
+            'type_hint_end_token' => 25,
+            'nullable_type'       => false,
+            'comma_token'         => 28,
+        ;
+        $expected4  = 
+            'token'               => 34,
+            'name'                => '$e',
+            'content'             => '?int $e',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int',
+            'type_hint_token'     => 32,
+            'type_hint_end_token' => 32,
+            'nullable_type'       => true,
+            'comma_token'         => 35,
+        ;
+        $expected5  = 
+            'token'               => 41,
+            'name'                => '$f',
+            'content'             => 'string &$f',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 40,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'string',
+            'type_hint_token'     => 38,
+            'type_hint_end_token' => 38,
+            'nullable_type'       => false,
+            'comma_token'         => 42,
+        ;
+        $expected6  = 
+            'token'               => 47,
+            'name'                => '$g',
+            'content'             => 'iterable $g',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'iterable',
+            'type_hint_token'     => 45,
+            'type_hint_end_token' => 45,
+            'nullable_type'       => false,
+            'comma_token'         => 48,
+        ;
+        $expected7  = 
+            'token'               => 53,
+            'name'                => '$h',
+            'content'             => 'bool $h = true',
+            'default'             => 'true',
+            'default_token'       => 57,
+            'default_equal_token' => 55,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'bool',
+            'type_hint_token'     => 51,
+            'type_hint_end_token' => 51,
+            'nullable_type'       => false,
+            'comma_token'         => 58,
+        ;
+        $expected8  = 
+            'token'               => 63,
+            'name'                => '$i',
+            'content'             => 'callable $i = \'is_null\'',
+            'default'             => "'is_null'",
+            'default_token'       => 67,
+            'default_equal_token' => 65,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'callable',
+            'type_hint_token'     => 61,
+            'type_hint_end_token' => 61,
+            'nullable_type'       => false,
+            'comma_token'         => 68,
+        ;
+        $expected9  = 
+            'token'               => 73,
+            'name'                => '$j',
+            'content'             => 'float $j = 1.1',
+            'default'             => '1.1',
+            'default_token'       => 77,
+            'default_equal_token' => 75,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'float',
+            'type_hint_token'     => 71,
+            'type_hint_end_token' => 71,
+            'nullable_type'       => false,
+            'comma_token'         => 78,
+        ;
+        $expected10 = 
+            'token'               => 84,
+            'name'                => '$k',
+            'content'             => 'array ...$k',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 83,
+            'type_hint'           => 'array',
+            'type_hint_token'     => 81,
+            'type_hint_end_token' => 81,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testWithAllTypes()
+
+
+    /**
+     * Verify correctly recognizing all type declarations supported by PHP when used with an arrow function.
+     *
+     * @return void
+     */
+    public function testArrowFunctionWithAllTypes()
+    {
+        // Offsets are relative to the T_FN token.
+        $expected     = ;
+        $expected0  = 
+            'token'               => 7,
+            'name'                => '$a',
+            'content'             => '?ClassName $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?ClassName',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 5,
+            'nullable_type'       => true,
+            'comma_token'         => 8,
+        ;
+        $expected1  = 
+            'token'               => 13,
+            'name'                => '$b',
+            'content'             => 'self $b',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'self',
+            'type_hint_token'     => 11,
+            'type_hint_end_token' => 11,
+            'nullable_type'       => false,
+            'comma_token'         => 14,
+        ;
+        $expected2  = 
+            'token'               => 19,
+            'name'                => '$c',
+            'content'             => 'parent $c',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'parent',
+            'type_hint_token'     => 17,
+            'type_hint_end_token' => 17,
+            'nullable_type'       => false,
+            'comma_token'         => 20,
+        ;
+        $expected3  = 
+            'token'               => 25,
+            'name'                => '$d',
+            'content'             => 'object $d',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'object',
+            'type_hint_token'     => 23,
+            'type_hint_end_token' => 23,
+            'nullable_type'       => false,
+            'comma_token'         => 26,
+        ;
+        $expected4  = 
+            'token'               => 32,
+            'name'                => '$e',
+            'content'             => '?int $e',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int',
+            'type_hint_token'     => 30,
+            'type_hint_end_token' => 30,
+            'nullable_type'       => true,
+            'comma_token'         => 33,
+        ;
+        $expected5  = 
+            'token'               => 39,
+            'name'                => '$f',
+            'content'             => 'string &$f',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 38,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'string',
+            'type_hint_token'     => 36,
+            'type_hint_end_token' => 36,
+            'nullable_type'       => false,
+            'comma_token'         => 40,
+        ;
+        $expected6  = 
+            'token'               => 45,
+            'name'                => '$g',
+            'content'             => 'iterable $g',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'iterable',
+            'type_hint_token'     => 43,
+            'type_hint_end_token' => 43,
+            'nullable_type'       => false,
+            'comma_token'         => 46,
+        ;
+        $expected7  = 
+            'token'               => 51,
+            'name'                => '$h',
+            'content'             => 'bool $h = true',
+            'default'             => 'true',
+            'default_token'       => 55,
+            'default_equal_token' => 53,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'bool',
+            'type_hint_token'     => 49,
+            'type_hint_end_token' => 49,
+            'nullable_type'       => false,
+            'comma_token'         => 56,
+        ;
+        $expected8  = 
+            'token'               => 61,
+            'name'                => '$i',
+            'content'             => 'callable $i = \'is_null\'',
+            'default'             => "'is_null'",
+            'default_token'       => 65,
+            'default_equal_token' => 63,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'callable',
+            'type_hint_token'     => 59,
+            'type_hint_end_token' => 59,
+            'nullable_type'       => false,
+            'comma_token'         => 66,
+        ;
+        $expected9  = 
+            'token'               => 71,
+            'name'                => '$j',
+            'content'             => 'float $j = 1.1',
+            'default'             => '1.1',
+            'default_token'       => 75,
+            'default_equal_token' => 73,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'float',
+            'type_hint_token'     => 69,
+            'type_hint_end_token' => 69,
+            'nullable_type'       => false,
+            'comma_token'         => 76,
+        ;
+        $expected10 = 
+            'token'               => 82,
+            'name'                => '$k',
+            'content'             => 'array ...$k',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 81,
+            'type_hint'           => 'array',
+            'type_hint_token'     => 79,
+            'type_hint_end_token' => 79,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testArrowFunctionWithAllTypes()
+
+
+    /**
+     * Verify handling of a declaration interlaced with whitespace and comments.
+     *
+     * @return void
+     */
+    public function testMessyDeclaration()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 25,
+            'name'                => '$a',
+            'content'             => '// comment
+    ?\MyNS /* comment */
+        \ SubCat // phpcs:ignore Standard.Cat.Sniff -- for reasons.
+            \  MyClass $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?\MyNS\SubCat\MyClass',
+            'type_hint_token'     => 9,
+            'type_hint_end_token' => 23,
+            'nullable_type'       => true,
+            'comma_token'         => 26,
+        ;
+        $expected1 = 
+            'token'               => 29,
+            'name'                => '$b',
+            'content'             => "\$b /* test */ = /* test */ 'default' /* test*/",
+            'default'             => "'default' /* test*/",
+            'default_token'       => 37,
+            'default_equal_token' => 33,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 40,
+        ;
+        $expected2 = 
+            'token'               => 62,
+            'name'                => '$c',
+            'content'             => '// phpcs:ignore Stnd.Cat.Sniff -- For reasons.
+    ? /*comment*/
+        bool // phpcs:disable Stnd.Cat.Sniff -- For reasons.
+        & /*test*/ ... /* phpcs:ignore */ $c',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 54,
+            'variable_length'     => true,
+            'variadic_token'      => 58,
+            'type_hint'           => '?bool',
+            'type_hint_token'     => 50,
+            'type_hint_end_token' => 50,
+            'nullable_type'       => true,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testMessyDeclaration()
+
+
+    /**
      * Verify recognition of PHP8 mixed type declaration.
      *
      * @return void
      */
     public function testPHP8MixedTypeHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => 'mixed &...$var1',
-            'has_attributes'    => false,
-            'pass_by_reference' => true,
-            'variable_length'   => true,
-            'type_hint'         => 'mixed',
-            'nullable_type'     => false,
+            'token'               => 8,
+            'name'                => '$var1',
+            'content'             => 'mixed &...$var1',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 6,
+            'variable_length'     => true,
+            'variadic_token'      => 7,
+            'type_hint'           => 'mixed',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -318,15 +1340,22 @@
      */
     public function testPHP8MixedTypeHintNullable()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => '?Mixed $var1',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?Mixed',
-            'nullable_type'     => true,
+            'token'               => 7,
+            'name'                => '$var1',
+            'content'             => '?Mixed $var1',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?Mixed',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 5,
+            'nullable_type'       => true,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -341,15 +1370,22 @@
      */
     public function testNamespaceOperatorTypeHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => '?namespace\Name $var1',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?namespace\Name',
-            'nullable_type'     => true,
+            'token'               => 9,
+            'name'                => '$var1',
+            'content'             => '?namespace\Name $var1',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?namespace\Name',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 7,
+            'nullable_type'       => true,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -364,24 +1400,37 @@
      */
     public function testPHP8UnionTypesSimple()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$number',
-            'content'           => 'int|float $number',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'int|float',
-            'nullable_type'     => false,
-        ;
-        $expected1 = 
-            'name'              => '$obj',
-            'content'           => 'self|parent &...$obj',
-            'has_attributes'    => false,
-            'pass_by_reference' => true,
-            'variable_length'   => true,
-            'type_hint'         => 'self|parent',
-            'nullable_type'     => false,
+            'token'               => 8,
+            'name'                => '$number',
+            'content'             => 'int|float $number',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'int|float',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => 9,
+        ;
+        $expected1 = 
+            'token'               => 17,
+            'name'                => '$obj',
+            'content'             => 'self|parent &...$obj',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 15,
+            'variable_length'     => true,
+            'variadic_token'      => 16,
+            'type_hint'           => 'self|parent',
+            'type_hint_token'     => 11,
+            'type_hint_end_token' => 13,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -396,24 +1445,37 @@
      */
     public function testPHP8UnionTypesWithSpreadOperatorAndReference()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$paramA',
-            'content'           => 'float|null &$paramA',
-            'has_attributes'    => false,
-            'pass_by_reference' => true,
-            'variable_length'   => false,
-            'type_hint'         => 'float|null',
-            'nullable_type'     => false,
-        ;
-        $expected1 = 
-            'name'              => '$paramB',
-            'content'           => 'string|int ...$paramB',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => true,
-            'type_hint'         => 'string|int',
-            'nullable_type'     => false,
+            'token'               => 9,
+            'name'                => '$paramA',
+            'content'             => 'float|null &$paramA',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 8,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'float|null',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => 10,
+        ;
+        $expected1 = 
+            'token'               => 17,
+            'name'                => '$paramB',
+            'content'             => 'string|int ...$paramB',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 16,
+            'type_hint'           => 'string|int',
+            'type_hint_token'     => 12,
+            'type_hint_end_token' => 14,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -428,16 +1490,25 @@
      */
     public function testPHP8UnionTypesSimpleWithBitwiseOrInDefault()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'int|float $var = CONSTANT_A | CONSTANT_B',
-            'default'           => 'CONSTANT_A | CONSTANT_B',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'int|float',
-            'nullable_type'     => false,
+            'token'               => 6,
+            'name'                => '$var',
+            'content'             => 'int|float $var = CONSTANT_A | CONSTANT_B',
+            'default'             => 'CONSTANT_A | CONSTANT_B',
+            'default_token'       => 10,
+            'default_equal_token' => 8,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'int|float',
+            'type_hint_token'     => 2,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -452,15 +1523,22 @@
      */
     public function testPHP8UnionTypesTwoClasses()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'MyClassA|\Package\MyClassB $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'MyClassA|\Package\MyClassB',
-            'nullable_type'     => false,
+            'token'               => 11,
+            'name'                => '$var',
+            'content'             => 'MyClassA|\Package\MyClassB $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'MyClassA|\Package\MyClassB',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 9,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -475,15 +1553,22 @@
      */
     public function testPHP8UnionTypesAllBaseTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'array|bool|callable|int|float|null|object|string $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'array|bool|callable|int|float|null|object|string',
-            'nullable_type'     => false,
+            'token'               => 20,
+            'name'                => '$var',
+            'content'             => 'array|bool|callable|int|float|null|object|string $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'array|bool|callable|int|float|null|object|string',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 18,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -494,19 +1579,28 @@
     /**
      * Verify recognition of PHP8 union type declaration with all pseudo types.
      *
+     * Note: "Resource" is not a type, but seen as a class name.
+     *
      * @return void
      */
     public function testPHP8UnionTypesAllPseudoTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'false|mixed|self|parent|iterable|Resource $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'false|mixed|self|parent|iterable|Resource',
-            'nullable_type'     => false,
+            'token'               => 16,
+            'name'                => '$var',
+            'content'             => 'false|mixed|self|parent|iterable|Resource $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'false|mixed|self|parent|iterable|Resource',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 14,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -521,15 +1615,22 @@
      */
     public function testPHP8UnionTypesNullable()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$number',
-            'content'           => '?int|float $number',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?int|float',
-            'nullable_type'     => true,
+            'token'               => 8,
+            'name'                => '$number',
+            'content'             => '?int|float $number',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int|float',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => true,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -544,16 +1645,25 @@
      */
     public function testPHP8PseudoTypeNull()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'null $var = null',
-            'default'           => 'null',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'null',
-            'nullable_type'     => false,
+            'token'               => 6,
+            'name'                => '$var',
+            'content'             => 'null $var = null',
+            'default'             => 'null',
+            'default_token'       => 10,
+            'default_equal_token' => 8,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'null',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -568,16 +1678,25 @@
      */
     public function testPHP8PseudoTypeFalse()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'false $var = false',
-            'default'           => 'false',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'false',
-            'nullable_type'     => false,
+            'token'               => 6,
+            'name'                => '$var',
+            'content'             => 'false $var = false',
+            'default'             => 'false',
+            'default_token'       => 10,
+            'default_equal_token' => 8,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'false',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -592,16 +1711,25 @@
      */
     public function testPHP8PseudoTypeFalseAndBool()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'bool|false $var = false',
-            'default'           => 'false',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'bool|false',
-            'nullable_type'     => false,
+            'token'               => 8,
+            'name'                => '$var',
+            'content'             => 'bool|false $var = false',
+            'default'             => 'false',
+            'default_token'       => 12,
+            'default_equal_token' => 10,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'bool|false',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -616,15 +1744,22 @@
      */
     public function testPHP8ObjectAndClass()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'object|ClassName $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'object|ClassName',
-            'nullable_type'     => false,
+            'token'               => 8,
+            'name'                => '$var',
+            'content'             => 'object|ClassName $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'object|ClassName',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -639,15 +1774,22 @@
      */
     public function testPHP8PseudoTypeIterableAndArray()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'iterable|array|Traversable $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'iterable|array|Traversable',
-            'nullable_type'     => false,
+            'token'               => 10,
+            'name'                => '$var',
+            'content'             => 'iterable|array|Traversable $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'iterable|array|Traversable',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 8,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -662,15 +1804,22 @@
      */
     public function testPHP8DuplicateTypeInUnionWhitespaceAndComment()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'int | string /*comment*/ | INT $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'int|string|INT',
-            'nullable_type'     => false,
+            'token'               => 17,
+            'name'                => '$var',
+            'content'             => 'int | string /*comment*/ | INT $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'int|string|INT',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 15,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -685,42 +1834,70 @@
      */
     public function testPHP8ConstructorPropertyPromotionNoTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
+            'token'               => 8,
             'name'                => '$x',
             'content'             => 'public $x = 0.0',
             'default'             => '0.0',
+            'default_token'       => 12,
+            'default_equal_token' => 10,
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
             'nullable_type'       => false,
             'property_visibility' => 'public',
+            'visibility_token'    => 6,
             'property_readonly'   => false,
+            'comma_token'         => 13,
         ;
         $expected1 = 
+            'token'               => 18,
             'name'                => '$y',
             'content'             => 'protected $y = \'\'',
             'default'             => "''",
+            'default_token'       => 22,
+            'default_equal_token' => 20,
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
             'nullable_type'       => false,
             'property_visibility' => 'protected',
+            'visibility_token'    => 16,
             'property_readonly'   => false,
+            'comma_token'         => 23,
         ;
         $expected2 = 
+            'token'               => 28,
             'name'                => '$z',
             'content'             => 'private $z = null',
             'default'             => 'null',
+            'default_token'       => 32,
+            'default_equal_token' => 30,
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
             'nullable_type'       => false,
             'property_visibility' => 'private',
+            'visibility_token'    => 26,
             'property_readonly'   => false,
+            'comma_token'         => 33,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -735,40 +1912,64 @@
      */
     public function testPHP8ConstructorPropertyPromotionWithTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
+            'token'               => 10,
             'name'                => '$x',
             'content'             => 'protected float|int $x',
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => 'float|int',
+            'type_hint_token'     => 6,
+            'type_hint_end_token' => 8,
             'nullable_type'       => false,
             'property_visibility' => 'protected',
+            'visibility_token'    => 4,
             'property_readonly'   => false,
+            'comma_token'         => 11,
         ;
         $expected1 = 
+            'token'               => 19,
             'name'                => '$y',
             'content'             => 'public ?string &$y = \'test\'',
             'default'             => "'test'",
+            'default_token'       => 23,
+            'default_equal_token' => 21,
             'has_attributes'      => false,
             'pass_by_reference'   => true,
+            'reference_token'     => 18,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => '?string',
+            'type_hint_token'     => 16,
+            'type_hint_end_token' => 16,
             'nullable_type'       => true,
             'property_visibility' => 'public',
+            'visibility_token'    => 13,
             'property_readonly'   => false,
+            'comma_token'         => 24,
         ;
         $expected2 = 
+            'token'               => 30,
             'name'                => '$z',
             'content'             => 'private mixed $z',
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => 'mixed',
+            'type_hint_token'     => 28,
+            'type_hint_end_token' => 28,
             'nullable_type'       => false,
             'property_visibility' => 'private',
+            'visibility_token'    => 26,
             'property_readonly'   => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -783,26 +1984,40 @@
      */
     public function testPHP8ConstructorPropertyPromotionAndNormalParam()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
+            'token'               => 8,
             'name'                => '$promotedProp',
             'content'             => 'public int $promotedProp',
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => 'int',
+            'type_hint_token'     => 6,
+            'type_hint_end_token' => 6,
             'nullable_type'       => false,
             'property_visibility' => 'public',
+            'visibility_token'    => 4,
             'property_readonly'   => false,
+            'comma_token'         => 9,
         ;
         $expected1 = 
-            'name'              => '$normalArg',
-            'content'           => '?int $normalArg',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?int',
-            'nullable_type'     => true,
+            'token'               => 14,
+            'name'                => '$normalArg',
+            'content'             => '?int $normalArg',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int',
+            'type_hint_token'     => 12,
+            'type_hint_end_token' => 12,
+            'nullable_type'       => true,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -817,28 +2032,45 @@
      */
     public function testPHP81ConstructorPropertyPromotionWithReadOnly()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
+            'token'               => 11,
             'name'                => '$promotedProp',
             'content'             => 'public readonly ?int $promotedProp',
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => '?int',
+            'type_hint_token'     => 9,
+            'type_hint_end_token' => 9,
             'nullable_type'       => true,
             'property_visibility' => 'public',
+            'visibility_token'    => 4,
             'property_readonly'   => true,
+            'readonly_token'      => 6,
+            'comma_token'         => 12,
         ;
         $expected1 = 
+            'token'               => 23,
             'name'                => '$promotedToo',
-            'content'             => 'readonly private string|bool &$promotedToo',
+            'content'             => 'ReadOnly private string|bool &$promotedToo',
             'has_attributes'      => false,
             'pass_by_reference'   => true,
+            'reference_token'     => 22,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => 'string|bool',
+            'type_hint_token'     => 18,
+            'type_hint_end_token' => 20,
             'nullable_type'       => false,
             'property_visibility' => 'private',
+            'visibility_token'    => 16,
             'property_readonly'   => true,
+            'readonly_token'      => 14,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -847,22 +2079,139 @@
 
 
     /**
+     * Verify recognition of PHP8 constructor with property promotion using PHP 8.1 readonly keyword
+     * without a property type.
+     *
+     * @return void
+     */
+    public function testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclaration()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 8,
+            'name'                => '$promotedProp',
+            'content'             => 'public readonly $promotedProp',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'property_visibility' => 'public',
+            'visibility_token'    => 4,
+            'property_readonly'   => true,
+            'readonly_token'      => 6,
+            'comma_token'         => 9,
+        ;
+        $expected1 = 
+            'token'               => 16,
+            'name'                => '$promotedToo',
+            'content'             => 'ReadOnly private &$promotedToo',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 15,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'property_visibility' => 'private',
+            'visibility_token'    => 13,
+            'property_readonly'   => true,
+            'readonly_token'      => 11,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPHP81ConstructorPropertyPromotionWithReadOnlyNoTypeDeclaration()
+
+
+    /**
+     * Verify recognition of PHP8 constructor with property promotion using PHP 8.1 readonly
+     * keyword without explicit visibility.
+     *
+     * @return void
+     */
+    public function testPHP81ConstructorPropertyPromotionWithOnlyReadOnly()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 10,
+            'name'                => '$promotedProp',
+            'content'             => 'readonly Foo&Bar $promotedProp',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'Foo&Bar',
+            'type_hint_token'     => 6,
+            'type_hint_end_token' => 8,
+            'nullable_type'       => false,
+            'property_visibility' => 'public',
+            'visibility_token'    => false,
+            'property_readonly'   => true,
+            'readonly_token'      => 4,
+            'comma_token'         => 11,
+        ;
+        $expected1 = 
+            'token'               => 18,
+            'name'                => '$promotedToo',
+            'content'             => 'readonly ?bool $promotedToo',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?bool',
+            'type_hint_token'     => 16,
+            'type_hint_end_token' => 16,
+            'nullable_type'       => true,
+            'property_visibility' => 'public',
+            'visibility_token'    => false,
+            'property_readonly'   => true,
+            'readonly_token'      => 13,
+            'comma_token'         => 19,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPHP81ConstructorPropertyPromotionWithOnlyReadOnly()
+
+
+    /**
      * Verify behaviour when a non-constructor function uses PHP 8 property promotion syntax.
      *
      * @return void
      */
     public function testPHP8ConstructorPropertyPromotionGlobalFunction()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
+            'token'               => 6,
             'name'                => '$x',
             'content'             => 'private $x',
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
             'nullable_type'       => false,
             'property_visibility' => 'private',
+            'visibility_token'    => 4,
+            'property_readonly'   => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -877,26 +2226,43 @@
      */
     public function testPHP8ConstructorPropertyPromotionAbstractMethod()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
+            'token'               => 8,
             'name'                => '$y',
             'content'             => 'public callable $y',
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => 'callable',
+            'type_hint_token'     => 6,
+            'type_hint_end_token' => 6,
             'nullable_type'       => false,
             'property_visibility' => 'public',
+            'visibility_token'    => 4,
+            'property_readonly'   => false,
+            'comma_token'         => 9,
         ;
         $expected1 = 
+            'token'               => 14,
             'name'                => '$x',
             'content'             => 'private ...$x',
             'has_attributes'      => false,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => true,
+            'variadic_token'      => 13,
             'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
             'nullable_type'       => false,
             'property_visibility' => 'private',
+            'visibility_token'    => 11,
+            'property_readonly'   => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -911,16 +2277,26 @@
      */
     public function testCommentsInParameter()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$param',
-            'content'           => '// Leading comment.
+            'token'               => 19,
+            'name'                => '$param',
+            'content'             => '// Leading comment.
     ?MyClass /*-*/ & /*-*/.../*-*/ $param /*-*/ = /*-*/ \'default value\' . /*-*/ \'second part\' // Trailing comment.',
-            'has_attributes'    => false,
-            'pass_by_reference' => true,
-            'variable_length'   => true,
-            'type_hint'         => '?MyClass',
-            'nullable_type'     => true,
+            'default'             => '\'default value\' . /*-*/ \'second part\' // Trailing comment.',
+            'default_token'       => 27,
+            'default_equal_token' => 23,
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 13,
+            'variable_length'     => true,
+            'variadic_token'      => 16,
+            'type_hint'           => '?MyClass',
+            'type_hint_token'     => 9,
+            'type_hint_end_token' => 9,
+            'nullable_type'       => true,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -935,55 +2311,88 @@
      */
     public function testParameterAttributesInFunctionDeclaration()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
+            'token'               => 17,
             'name'                => '$constructorPropPromTypedParamSingleAttribute',
             'content'             => '#\MyExample\MyAttribute private string $constructorPropPromTypedParamSingleAttribute',
             'has_attributes'      => true,
             'pass_by_reference'   => false,
+            'reference_token'     => false,
             'variable_length'     => false,
+            'variadic_token'      => false,
             'type_hint'           => 'string',
+            'type_hint_token'     => 15,
+            'type_hint_end_token' => 15,
             'nullable_type'       => false,
             'property_visibility' => 'private',
+            'visibility_token'    => 13,
+            'property_readonly'   => false,
+            'comma_token'         => 18,
         ;
         $expected1 = 
-            'name'              => '$typedParamSingleAttribute',
-            'content'           => '#MyAttr(1, 2)
+            'token'               => 39,
+            'name'                => '$typedParamSingleAttribute',
+            'content'             => '#MyAttr(1, 2)
         Type|false
         $typedParamSingleAttribute',
-            'has_attributes'    => true,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'Type|false',
-            'nullable_type'     => false,
+            'has_attributes'      => true,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'Type|false',
+            'type_hint_token'     => 34,
+            'type_hint_end_token' => 36,
+            'nullable_type'       => false,
+            'comma_token'         => 40,
         ;
         $expected2 = 
-            'name'              => '$nullableTypedParamMultiAttribute',
-            'content'           => '#MyAttribute(1234), MyAttribute(5678) ?int $nullableTypedParamMultiAttribute',
-            'has_attributes'    => true,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?int',
-            'nullable_type'     => true,
+            'token'               => 59,
+            'name'                => '$nullableTypedParamMultiAttribute',
+            'content'             => '#MyAttribute(1234), MyAttribute(5678) ?int $nullableTypedParamMultiAttribute',
+            'has_attributes'      => true,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int',
+            'type_hint_token'     => 57,
+            'type_hint_end_token' => 57,
+            'nullable_type'       => true,
+            'comma_token'         => 60,
         ;
         $expected3 = 
-            'name'              => '$nonTypedParamTwoAttributes',
-            'content'           => '#WithoutArgument #SingleArgument(0) $nonTypedParamTwoAttributes',
-            'has_attributes'    => true,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'token'               => 74,
+            'name'                => '$nonTypedParamTwoAttributes',
+            'content'             => '#WithoutArgument #SingleArgument(0) $nonTypedParamTwoAttributes',
+            'has_attributes'      => true,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 75,
         ;
         $expected4 = 
-            'name'              => '$otherParam',
-            'content'           => '#MyAttribute(array("key" => "value"))
+            'token'               => 95,
+            'name'                => '$otherParam',
+            'content'             => '#MyAttribute(array("key" => "value"))
         &...$otherParam',
-            'has_attributes'    => true,
-            'pass_by_reference' => true,
-            'variable_length'   => true,
-            'type_hint'         => '',
-            'nullable_type'     => false,
+            'has_attributes'      => true,
+            'pass_by_reference'   => true,
+            'reference_token'     => 93,
+            'variable_length'     => true,
+            'variadic_token'      => 94,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 96,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -998,24 +2407,37 @@
      */
     public function testPHP8IntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$obj1',
-            'content'           => 'Foo&Bar $obj1',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'Foo&Bar',
-            'nullable_type'     => false,
-        ;
-        $expected1 = 
-            'name'              => '$obj2',
-            'content'           => 'Boo&Bar $obj2',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'Boo&Bar',
-            'nullable_type'     => false,
+            'token'               => 8,
+            'name'                => '$obj1',
+            'content'             => 'Foo&Bar $obj1',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'Foo&Bar',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => 9,
+        ;
+        $expected1 = 
+            'token'               => 15,
+            'name'                => '$obj2',
+            'content'             => 'Boo&Bar $obj2',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'Boo&Bar',
+            'type_hint_token'     => 11,
+            'type_hint_end_token' => 13,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -1024,30 +2446,44 @@
 
 
     /**
-     * Verify recognition of PHP8 intersection type declaration when the variable has either a spread operator or a reference.
+     * Verify recognition of PHP8 intersection type declaration when the variable
+     * has either a spread operator or a reference.
      *
      * @return void
      */
     public function testPHP81IntersectionTypesWithSpreadOperatorAndReference()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$paramA',
-            'content'           => 'Boo&Bar &$paramA',
-            'has_attributes'    => false,
-            'pass_by_reference' => true,
-            'variable_length'   => false,
-            'type_hint'         => 'Boo&Bar',
-            'nullable_type'     => false,
-        ;
-        $expected1 = 
-            'name'              => '$paramB',
-            'content'           => 'Foo&Bar ...$paramB',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => true,
-            'type_hint'         => 'Foo&Bar',
-            'nullable_type'     => false,
+            'token'               => 9,
+            'name'                => '$paramA',
+            'content'             => 'Boo&Bar &$paramA',
+            'has_attributes'      => false,
+            'pass_by_reference'   => true,
+            'reference_token'     => 8,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'Boo&Bar',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => 10,
+        ;
+        $expected1 = 
+            'token'               => 17,
+            'name'                => '$paramB',
+            'content'             => 'Foo&Bar ...$paramB',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 16,
+            'type_hint'           => 'Foo&Bar',
+            'type_hint_token'     => 12,
+            'type_hint_end_token' => 14,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -1062,15 +2498,22 @@
      */
     public function testPHP81MoreIntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'MyClassA&\Package\MyClassB&\Package\MyClassC $var',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'MyClassA&\Package\MyClassB&\Package\MyClassC',
-            'nullable_type'     => false,
+            'token'               => 16,
+            'name'                => '$var',
+            'content'             => 'MyClassA&\Package\MyClassB&\Package\MyClassC $var',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'MyClassA&\Package\MyClassB&\Package\MyClassC',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 14,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -1085,15 +2528,22 @@
      */
     public function testPHP81IllegalIntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$numeric_string',
-            'content'           => 'string&int $numeric_string',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'string&int',
-            'nullable_type'     => false,
+            'token'               => 7,
+            'name'                => '$numeric_string',
+            'content'             => 'string&int $numeric_string',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'string&int',
+            'type_hint_token'     => 3,
+            'type_hint_end_token' => 5,
+            'nullable_type'       => false,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -1108,15 +2558,22 @@
      */
     public function testPHP81NullableIntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected    = ;
         $expected0 = 
-            'name'              => '$object',
-            'content'           => '?Foo&Bar $object',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => '?Foo&Bar',
-            'nullable_type'     => true,
+            'token'               => 8,
+            'name'                => '$object',
+            'content'             => '?Foo&Bar $object',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?Foo&Bar',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => true,
+            'comma_token'         => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -1125,19 +2582,440 @@
 
 
     /**
+     * Verify recognition of PHP 8.2 stand-alone `true` type.
+     *
+     * @return void
+     */
+    public function testPHP82PseudoTypeTrue()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 7,
+            'name'                => '$var',
+            'content'             => '?true $var = true',
+            'default'             => 'true',
+            'default_token'       => 11,
+            'default_equal_token' => 9,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?true',
+            'type_hint_token'     => 5,
+            'type_hint_end_token' => 5,
+            'nullable_type'       => true,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPHP82PseudoTypeTrue()
+
+
+    /**
+     * Verify recognition of PHP 8.2 type declaration with (illegal) type false combined with type true.
+     *
+     * @return void
+     */
+    public function testPHP82PseudoTypeFalseAndTrue()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 8,
+            'name'                => '$var',
+            'content'             => 'true|false $var = true',
+            'default'             => 'true',
+            'default_token'       => 12,
+            'default_equal_token' => 10,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'true|false',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPHP82PseudoTypeFalseAndTrue()
+
+
+    /**
+     * Verify behaviour when the default value uses the "new" keyword, as is allowed per PHP 8.1.
+     *
+     * @return void
+     */
+    public function testPHP81NewInInitializers()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 8,
+            'name'                => '$new',
+            'content'             => 'TypeA $new = new TypeA(self::CONST_VALUE)',
+            'default'             => 'new TypeA(self::CONST_VALUE)',
+            'default_token'       => 12,
+            'default_equal_token' => 10,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'TypeA',
+            'type_hint_token'     => 6,
+            'type_hint_end_token' => 6,
+            'nullable_type'       => false,
+            'comma_token'         => 20,
+        ;
+        $expected1 = 
+            'token'               => 28,
+            'name'                => '$newToo',
+            'content'             => '\Package\TypeB $newToo = new \Package\TypeB(10, \'string\')',
+            'default'             => "new \Package\TypeB(10, 'string')",
+            'default_token'       => 32,
+            'default_equal_token' => 30,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '\Package\TypeB',
+            'type_hint_token'     => 23,
+            'type_hint_end_token' => 26,
+            'nullable_type'       => false,
+            'comma_token'         => 44,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPHP81NewInInitializers()
+
+
+    /**
+     * Verify handling of a closure.
+     *
+     * @return void
+     */
+    public function testClosure()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 3,
+            'name'                => '$a',
+            'content'             => '$a = \'test\'',
+            'default'             => "'test'",
+            'default_token'       => 7,
+            'default_equal_token' => 5,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testClosure()
+
+
+    /**
+     * Verify handling of a closure T_USE token correctly.
+     *
+     * @return void
+     */
+    public function testClosureUse()
+    {
+        // Offsets are relative to the T_USE token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 3,
+            'name'                => '$foo',
+            'content'             => '$foo',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 4,
+        ;
+        $expected1 = 
+            'token'               => 6,
+            'name'                => '$bar',
+            'content'             => '$bar',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => false,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected, T_USE);
+
+    }//end testClosureUse()
+
+
+    /**
+     * Verify function declarations with trailing commas are handled correctly.
+     *
+     * @return void
+     */
+    public function testFunctionParamListWithTrailingComma()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 9,
+            'name'                => '$foo',
+            'content'             => '?string $foo  /*comment*/',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?string',
+            'type_hint_token'     => 7,
+            'type_hint_end_token' => 7,
+            'nullable_type'       => true,
+            'comma_token'         => 13,
+        ;
+        $expected1 = 
+            'token'               => 16,
+            'name'                => '$bar',
+            'content'             => '$bar = 0',
+            'default'             => '0',
+            'default_token'       => 20,
+            'default_equal_token' => 18,
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 21,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testFunctionParamListWithTrailingComma()
+
+
+    /**
+     * Verify closure declarations with trailing commas are handled correctly.
+     *
+     * @return void
+     */
+    public function testClosureParamListWithTrailingComma()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 4,
+            'name'                => '$foo',
+            'content'             => '$foo',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 5,
+        ;
+        $expected1 = 
+            'token'               => 8,
+            'name'                => '$bar',
+            'content'             => '$bar',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 9,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testClosureParamListWithTrailingComma()
+
+
+    /**
+     * Verify arrow function declarations with trailing commas are handled correctly.
+     *
+     * @return void
+     */
+    public function testArrowFunctionParamListWithTrailingComma()
+    {
+        // Offsets are relative to the T_FN token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 6,
+            'name'                => '$a',
+            'content'             => '?int $a',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int',
+            'type_hint_token'     => 4,
+            'type_hint_end_token' => 4,
+            'nullable_type'       => true,
+            'comma_token'         => 8,
+        ;
+        $expected1 = 
+            'token'               => 11,
+            'name'                => '$b',
+            'content'             => '...$b',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 10,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 12,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testArrowFunctionParamListWithTrailingComma()
+
+
+    /**
+     * Verify closure T_USE statements with trailing commas are handled correctly.
+     *
+     * @return void
+     */
+    public function testClosureUseWithTrailingComma()
+    {
+        // Offsets are relative to the T_USE token.
+        $expected    = ;
+        $expected0 = 
+            'token'               => 4,
+            'name'                => '$foo',
+            'content'             => '$foo  /*comment*/',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 8,
+        ;
+        $expected1 = 
+            'token'               => 11,
+            'name'                => '$bar',
+            'content'             => '$bar',
+            'has_attributes'      => false,
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'comma_token'         => 12,
+        ;
+
+        $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected, T_USE);
+
+    }//end testClosureUseWithTrailingComma()
+
+
+    /**
      * Test helper.
      *
-     * @param string $commentString The comment which preceeds the test.
-     * @param array  $expected      The expected function output.
+     * @param string                                     $commentString The comment which preceeds the test.
+     * @param array<int, array<string, int|string|bool>> $expected      The expected function output.
+     * @param int|string|array<int|string>               $targetType    Optional. The token type to search for after $marker.
+     *                                                                  Defaults to the function/closure/arrow tokens.
      *
      * @return void
      */
-    private function getMethodParametersTestHelper($commentString, $expected)
+    private function getMethodParametersTestHelper($commentString, $expected, $targetType=T_FUNCTION, T_CLOSURE, T_FN)
     {
-        $function = $this->getTargetToken($commentString, T_FUNCTION, T_CLOSURE, T_FN);
-        $found    = self::$phpcsFile->getMethodParameters($function);
+        $target = $this->getTargetToken($commentString, $targetType);
+        $found  = self::$phpcsFile->getMethodParameters($target);
+
+        // Convert offsets to absolute positions in the token stream.
+        foreach ($expected as $key => $param) {
+            $expected$key'token' += $target;
+
+            if (is_int($param'reference_token') === true) {
+                $expected$key'reference_token' += $target;
+            }
+
+            if (is_int($param'variadic_token') === true) {
+                $expected$key'variadic_token' += $target;
+            }
+
+            if (is_int($param'type_hint_token') === true) {
+                $expected$key'type_hint_token' += $target;
+            }
+
+            if (is_int($param'type_hint_end_token') === true) {
+                $expected$key'type_hint_end_token' += $target;
+            }
+
+            if (is_int($param'comma_token') === true) {
+                $expected$key'comma_token' += $target;
+            }
+
+            if (isset($param'default_token') === true) {
+                $expected$key'default_token' += $target;
+            }
+
+            if (isset($param'default_equal_token') === true) {
+                $expected$key'default_equal_token' += $target;
+            }
+
+            if (isset($param'visibility_token') === true && is_int($param'visibility_token') === true) {
+                $expected$key'visibility_token' += $target;
+            }
+
+            if (isset($param'readonly_token') === true) {
+                $expected$key'readonly_token' += $target;
+            }
+        }//end foreach
 
-        $this->assertArraySubset($expected, $found, true);
+        $this->assertSame($expected, $found);
 
     }//end getMethodParametersTestHelper()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodPropertiesTest.inc Changed

@@ -34,16 +34,23 @@
     /* testMessyNullableReturnMethod */
     public function myFunction() /* comment
         */ :
-        /* comment */ ? //comment
+        /* comment */ ? // phpcs:ignore Stnd.Cat.Sniff -- For reasons.
         array {}
 
     /* testReturnNamespace */
     function myFunction(): \MyNamespace\MyClass {}
 
     /* testReturnMultilineNamespace */
+    // Parse error in PHP 8.0.
     function myFunction(): \MyNamespace /** comment *\/ comment */
                            \MyClass /* comment */
                            \Foo {}
+
+    /* testReturnUnqualifiedName */
+    private function myFunction(): ?MyClass {}
+
+    /* testReturnPartiallyQualifiedName */
+    function myFunction(): Sub\Level\MyClass {}
 }
 
 abstract class MyClass
@@ -102,11 +109,11 @@
 $closure = function () use($a) :?int|float {};
 
 /* testPHP8PseudoTypeNull */
-// Intentional fatal error - null pseudotype is only allowed in union types, but that's not the concern of the method.
+// PHP 8.0 - 8.1: Intentional fatal error - null pseudotype is only allowed in union types, but that's not the concern of the method.
 function pseudoTypeNull(): null {}
 
 /* testPHP8PseudoTypeFalse */
-// Intentional fatal error - false pseudotype is only allowed in union types, but that's not the concern of the method.
+// PHP 8.0 - 8.1: Intentional fatal error - false pseudotype is only allowed in union types, but that's not the concern of the method.
 function pseudoTypeFalse(): false {}
 
 /* testPHP8PseudoTypeFalseAndBool */
@@ -150,3 +157,34 @@
 /* testPHP81NullableIntersectionTypes */
 // Intentional fatal error - nullability is not allowed with intersection types, but that's not the concern of the method.
 $closure = function (): ?Foo&Bar {};
+
+/* testPHP82PseudoTypeTrue */
+function pseudoTypeTrue(): ?true {}
+
+/* testPHP82PseudoTypeFalseAndTrue */
+// Intentional fatal error - Type contains both true and false, bool should be used instead, but that's not the concern of the method.
+function pseudoTypeFalseAndTrue(): true|false {}
+
+/* testNotAFunction */
+return true;
+
+/* testPhpcsIssue1264 */
+function foo() : array {
+    echo $foo;
+}
+
+/* testArrowFunctionArrayReturnValue */
+$fn = fn(): array => a($a, $b);
+
+/* testArrowFunctionReturnByRef */
+fn&(?string $a) : ?string => $b;
+
+/* testFunctionCallFnPHPCS353-354 */
+$value = $obj->fn(true);
+
+/* testFunctionDeclarationNestedInTernaryPHPCS2975 */
+return (!$a ?  new class { public function b(): c {} }  : );
+
+/* testArrowFunctionLiveCoding */
+// Intentional parse error. This has to be the last test in the file.
+$fn = fn

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodPropertiesTest.php Changed

@@ -1,21 +1,79 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:getMethodProperties method.
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodProperties method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getMethodProperties method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getMethodProperties
+ */
 class GetMethodPropertiesTest extends AbstractMethodUnitTest
 {
 
 
     /**
+     * Test receiving an expected exception when a non function token is passed.
+     *
+     * @param string                       $commentString   The comment which preceeds the test.
+     * @param string|int|array<int|string> $targetTokenType The token type to search for after $commentString.
+     *
+     * @dataProvider dataNotAFunctionException
+     *
+     * @return void
+     */
+    public function testNotAFunctionException($commentString, $targetTokenType)
+    {
+        $this->expectRunTimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or T_FN');
+
+        $next = $this->getTargetToken($commentString, $targetTokenType);
+        self::$phpcsFile->getMethodProperties($next);
+
+    }//end testNotAFunctionException()
+
+
+    /**
+     * Data Provider.
+     *
+     * @see testNotAFunctionException() For the array format.
+     *
+     * @return array<string, array<string, string|int|array<int|string>>>
+     */
+    public static function dataNotAFunctionException()
+    {
+        return 
+            'return'                             => 
+                'commentString'   => '/* testNotAFunction */',
+                'targetTokenType' => T_RETURN,
+            ,
+            'function-call-fn-phpcs-3.5.3-3.5.4' => 
+                'commentString'   => '/* testFunctionCallFnPHPCS353-354 */',
+                'targetTokenType' => 
+                    T_FN,
+                    T_STRING,
+                ,
+            ,
+            'fn-live-coding'                     => 
+                'commentString'   => '/* testArrowFunctionLiveCoding */',
+                'targetTokenType' => 
+                    T_FN,
+                    T_STRING,
+                ,
+            ,
+        ;
+
+    }//end dataNotAFunctionException()
+
+
+    /**
      * Test a basic function.
      *
      * @return void
@@ -23,14 +81,16 @@
     public function testBasicFunction()
     {
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -45,15 +105,18 @@
      */
     public function testReturnFunction()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'array',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'array',
+            'return_type_token'     => 11,
+            'return_type_end_token' => 11,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -68,15 +131,18 @@
      */
     public function testNestedClosure()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'int',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'int',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -92,14 +158,16 @@
     public function testBasicMethod()
     {
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -115,14 +183,16 @@
     public function testPrivateStaticMethod()
     {
         $expected = 
-            'scope'                => 'private',
-            'scope_specified'      => true,
-            'return_type'          => '',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => true,
-            'has_body'             => true,
+            'scope'                 => 'private',
+            'scope_specified'       => true,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => true,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -138,14 +208,16 @@
     public function testFinalMethod()
     {
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => true,
-            'return_type'          => '',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => true,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => true,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => true,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -160,15 +232,18 @@
      */
     public function testProtectedReturnMethod()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'protected',
-            'scope_specified'      => true,
-            'return_type'          => 'int',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'protected',
+            'scope_specified'       => true,
+            'return_type'           => 'int',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -183,15 +258,18 @@
      */
     public function testPublicReturnMethod()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => true,
-            'return_type'          => 'array',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => true,
+            'return_type'           => 'array',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -206,15 +284,18 @@
      */
     public function testNullableReturnMethod()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => true,
-            'return_type'          => '?array',
-            'nullable_return_type' => true,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => true,
+            'return_type'           => '?array',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -229,15 +310,18 @@
      */
     public function testMessyNullableReturnMethod()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => true,
-            'return_type'          => '?array',
-            'nullable_return_type' => true,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => true,
+            'return_type'           => '?array',
+            'return_type_token'     => 18,
+            'return_type_end_token' => 18,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -252,15 +336,18 @@
      */
     public function testReturnNamespace()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '\MyNamespace\MyClass',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '\MyNamespace\MyClass',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 10,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -275,15 +362,18 @@
      */
     public function testReturnMultilineNamespace()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '\MyNamespace\MyClass\Foo',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '\MyNamespace\MyClass\Foo',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 23,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -292,6 +382,58 @@
 
 
     /**
+     * Test a method with an unqualified named return type.
+     *
+     * @return void
+     */
+    public function testReturnUnqualifiedName()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected = 
+            'scope'                 => 'private',
+            'scope_specified'       => true,
+            'return_type'           => '?MyClass',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testReturnUnqualifiedName()
+
+
+    /**
+     * Test a method with a partially qualified namespaced return type.
+     *
+     * @return void
+     */
+    public function testReturnPartiallyQualifiedName()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'Sub\Level\MyClass',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 11,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testReturnPartiallyQualifiedName()
+
+
+    /**
      * Test a basic abstract method.
      *
      * @return void
@@ -299,14 +441,16 @@
     public function testAbstractMethod()
     {
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '',
-            'nullable_return_type' => false,
-            'is_abstract'          => true,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => false,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => true,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => false,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -321,15 +465,18 @@
      */
     public function testAbstractReturnMethod()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'protected',
-            'scope_specified'      => true,
-            'return_type'          => 'bool',
-            'nullable_return_type' => false,
-            'is_abstract'          => true,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => false,
+            'scope'                 => 'protected',
+            'scope_specified'       => true,
+            'return_type'           => 'bool',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => true,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => false,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -345,14 +492,16 @@
     public function testInterfaceMethod()
     {
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => false,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '',
+            'return_type_token'     => false,
+            'return_type_end_token' => false,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => false,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -367,15 +516,18 @@
      */
     public function testArrowFunction()
     {
+        // Offsets are relative to the T_FN token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'int',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => true,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'int',
+            'return_type_token'     => 9,
+            'return_type_end_token' => 9,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => true,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -390,15 +542,18 @@
      */
     public function testReturnTypeStatic()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'private',
-            'scope_specified'      => true,
-            'return_type'          => 'static',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'private',
+            'scope_specified'       => true,
+            'return_type'           => 'static',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -413,15 +568,18 @@
      */
     public function testPHP8MixedTypeHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'mixed',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'mixed',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -436,15 +594,18 @@
      */
     public function testPHP8MixedTypeHintNullable()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '?mixed',
-            'nullable_return_type' => true,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?mixed',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -459,15 +620,18 @@
      */
     public function testNamespaceOperatorTypeHint()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '?namespace\Name',
-            'nullable_return_type' => true,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?namespace\Name',
+            'return_type_token'     => 9,
+            'return_type_end_token' => 11,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -482,15 +646,18 @@
      */
     public function testPHP8UnionTypesSimple()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'int|float',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'int|float',
+            'return_type_token'     => 9,
+            'return_type_end_token' => 11,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -505,15 +672,18 @@
      */
     public function testPHP8UnionTypesTwoClasses()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'MyClassA|\Package\MyClassB',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'MyClassA|\Package\MyClassB',
+            'return_type_token'     => 6,
+            'return_type_end_token' => 11,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -528,15 +698,18 @@
      */
     public function testPHP8UnionTypesAllBaseTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'array|bool|callable|int|float|null|Object|string',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'array|bool|callable|int|float|null|Object|string',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 22,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -547,19 +720,24 @@
     /**
      * Verify recognition of PHP8 union type declaration with all pseudo types.
      *
+     * Note: "Resource" is not a type, but seen as a class name.
+     *
      * @return void
      */
     public function testPHP8UnionTypesAllPseudoTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'false|MIXED|self|parent|static|iterable|Resource|void',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'false|MIXED|self|parent|static|iterable|Resource|void',
+            'return_type_token'     => 9,
+            'return_type_end_token' => 23,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -574,15 +752,18 @@
      */
     public function testPHP8UnionTypesNullable()
     {
+        // Offsets are relative to the T_CLOSURE token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '?int|float',
-            'nullable_return_type' => true,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?int|float',
+            'return_type_token'     => 12,
+            'return_type_end_token' => 14,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -597,15 +778,18 @@
      */
     public function testPHP8PseudoTypeNull()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'null',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'null',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -620,15 +804,18 @@
      */
     public function testPHP8PseudoTypeFalse()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'false',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'false',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -643,15 +830,18 @@
      */
     public function testPHP8PseudoTypeFalseAndBool()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'bool|false',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'bool|false',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 9,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -666,15 +856,18 @@
      */
     public function testPHP8ObjectAndClass()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'object|ClassName',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'object|ClassName',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 9,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -689,15 +882,18 @@
      */
     public function testPHP8PseudoTypeIterableAndArray()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => true,
-            'return_type'          => 'iterable|array|Traversable',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => false,
+            'scope'                 => 'public',
+            'scope_specified'       => true,
+            'return_type'           => 'iterable|array|Traversable',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 11,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => false,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -712,15 +908,18 @@
      */
     public function testPHP8DuplicateTypeInUnionWhitespaceAndComment()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'int|string|INT',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'int|string|INT',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 17,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -735,15 +934,18 @@
      */
     public function testPHP81NeverType()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'never',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'never',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -758,15 +960,18 @@
      */
     public function testPHP81NullableNeverType()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '?never',
-            'nullable_return_type' => true,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?never',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -781,15 +986,18 @@
      */
     public function testPHP8IntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'Foo&Bar',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'Foo&Bar',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 9,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -804,15 +1012,18 @@
      */
     public function testPHP81MoreIntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'MyClassA&\Package\MyClassB&\Package\MyClassC',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'MyClassA&\Package\MyClassB&\Package\MyClassC',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 17,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -827,15 +1038,18 @@
      */
     public function testPHP81IntersectionArrowFunction()
     {
+        // Offsets are relative to the T_FN token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'MyClassA&\Package\MyClassB',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'MyClassA&\Package\MyClassB',
+            'return_type_token'     => 6,
+            'return_type_end_token' => 11,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -850,15 +1064,18 @@
      */
     public function testPHP81IllegalIntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => 'string&int',
-            'nullable_return_type' => false,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'string&int',
+            'return_type_token'     => 6,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -873,15 +1090,18 @@
      */
     public function testPHP81NullableIntersectionTypes()
     {
+        // Offsets are relative to the T_FUNCTION token.
         $expected = 
-            'scope'                => 'public',
-            'scope_specified'      => false,
-            'return_type'          => '?Foo&Bar',
-            'nullable_return_type' => true,
-            'is_abstract'          => false,
-            'is_final'             => false,
-            'is_static'            => false,
-            'has_body'             => true,
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?Foo&Bar',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 9,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
         ;
 
         $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
@@ -890,10 +1110,172 @@
 
 
     /**
+     * Verify recognition of PHP 8.2 stand-alone `true` type.
+     *
+     * @return void
+     */
+    public function testPHP82PseudoTypeTrue()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?true',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPHP82PseudoTypeTrue()
+
+
+    /**
+     * Verify recognition of PHP 8.2 type declaration with (illegal) type false combined with type true.
+     *
+     * @return void
+     */
+    public function testPHP82PseudoTypeFalseAndTrue()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'true|false',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 9,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPHP82PseudoTypeFalseAndTrue()
+
+
+    /**
+     * Test for incorrect tokenization of array return type declarations in PHPCS < 2.8.0.
+     *
+     * @link https://github.com/squizlabs/PHP_CodeSniffer/pull/1264
+     *
+     * @return void
+     */
+    public function testPhpcsIssue1264()
+    {
+        // Offsets are relative to the T_FUNCTION token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'array',
+            'return_type_token'     => 8,
+            'return_type_end_token' => 8,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testPhpcsIssue1264()
+
+
+    /**
+     * Test handling of incorrect tokenization of array return type declarations for arrow functions
+     * in a very specific code sample in PHPCS < 3.5.4.
+     *
+     * @link https://github.com/squizlabs/PHP_CodeSniffer/issues/2773
+     *
+     * @return void
+     */
+    public function testArrowFunctionArrayReturnValue()
+    {
+        // Offsets are relative to the T_FN token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => 'array',
+            'return_type_token'     => 5,
+            'return_type_end_token' => 5,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testArrowFunctionArrayReturnValue()
+
+
+    /**
+     * Test handling of an arrow function returning by reference.
+     *
+     * @return void
+     */
+    public function testArrowFunctionReturnByRef()
+    {
+        // Offsets are relative to the T_FN token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => false,
+            'return_type'           => '?string',
+            'return_type_token'     => 12,
+            'return_type_end_token' => 12,
+            'nullable_return_type'  => true,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testArrowFunctionReturnByRef()
+
+
+    /**
+     * Test handling of function declaration nested in a ternary, where the colon for the
+     * return type was incorrectly tokenized as T_INLINE_ELSE prior to PHPCS 3.5.7.
+     *
+     * @return void
+     */
+    public function testFunctionDeclarationNestedInTernaryPHPCS2975()
+    {
+        // Offsets are relative to the T_FN token.
+        $expected = 
+            'scope'                 => 'public',
+            'scope_specified'       => true,
+            'return_type'           => 'c',
+            'return_type_token'     => 7,
+            'return_type_end_token' => 7,
+            'nullable_return_type'  => false,
+            'is_abstract'           => false,
+            'is_final'              => false,
+            'is_static'             => false,
+            'has_body'              => true,
+        ;
+
+        $this->getMethodPropertiesTestHelper('/* '.__FUNCTION__.' */', $expected);
+
+    }//end testFunctionDeclarationNestedInTernaryPHPCS2975()
+
+
+    /**
      * Test helper.
      *
-     * @param string $commentString The comment which preceeds the test.
-     * @param array  $expected      The expected function output.
+     * @param string                         $commentString The comment which preceeds the test.
+     * @param array<string, string|int|bool> $expected      The expected function output.
      *
      * @return void
      */
@@ -902,7 +1284,16 @@
         $function = $this->getTargetToken($commentString, T_FUNCTION, T_CLOSURE, T_FN);
         $found    = self::$phpcsFile->getMethodProperties($function);
 
-        $this->assertArraySubset($expected, $found, true);
+        // Convert offsets to absolute positions in the token stream.
+        if (is_int($expected'return_type_token') === true) {
+            $expected'return_type_token' += $function;
+        }
+
+        if (is_int($expected'return_type_end_token') === true) {
+            $expected'return_type_end_token' += $function;
+        }
+
+        $this->assertSame($expected, $found);
 
     }//end getMethodPropertiesTestHelper()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetTokensAsStringTest.inc Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetTokensAsStringTest.php Added

@@ -0,0 +1,334 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::getTokensAsString method.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2022-2024 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\File;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File:getTokensAsString method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::getTokensAsString
+ */
+class GetTokensAsStringTest extends AbstractMethodUnitTest
+{
+
+
+    /**
+     * Test passing a non-existent token pointer.
+     *
+     * @return void
+     */
+    public function testNonExistentToken()
+    {
+        $this->expectRunTimeException('The $start position for getTokensAsString() must exist in the token stack');
+
+        self::$phpcsFile->getTokensAsString(100000, 10);
+
+    }//end testNonExistentToken()
+
+
+    /**
+     * Test passing a non integer `$start`, like the result of a failed $phpcsFile->findNext().
+     *
+     * @return void
+     */
+    public function testNonIntegerStart()
+    {
+        $this->expectRunTimeException('The $start position for getTokensAsString() must exist in the token stack');
+
+        self::$phpcsFile->getTokensAsString(false, 10);
+
+    }//end testNonIntegerStart()
+
+
+    /**
+     * Test passing a non integer `$length`.
+     *
+     * @return void
+     */
+    public function testNonIntegerLength()
+    {
+        $result = self::$phpcsFile->getTokensAsString(10, false);
+        $this->assertSame('', $result);
+
+        $result = self::$phpcsFile->getTokensAsString(10, 1.5);
+        $this->assertSame('', $result);
+
+    }//end testNonIntegerLength()
+
+
+    /**
+     * Test passing a zero or negative `$length`.
+     *
+     * @return void
+     */
+    public function testLengthEqualToOrLessThanZero()
+    {
+        $result = self::$phpcsFile->getTokensAsString(10, -10);
+        $this->assertSame('', $result);
+
+        $result = self::$phpcsFile->getTokensAsString(10, 0);
+        $this->assertSame('', $result);
+
+    }//end testLengthEqualToOrLessThanZero()
+
+
+    /**
+     * Test passing a `$length` beyond the end of the file.
+     *
+     * @return void
+     */
+    public function testLengthBeyondEndOfFile()
+    {
+        $semicolon = $this->getTargetToken('/* testEndOfFile */', T_SEMICOLON);
+        $result    = self::$phpcsFile->getTokensAsString($semicolon, 20);
+        $this->assertSame(
+            ';
+',
+            $result
+        );
+
+    }//end testLengthBeyondEndOfFile()
+
+
+    /**
+     * Test getting a token set as a string.
+     *
+     * @param string     $testMarker     The comment which prefaces the target token in the test file.
+     * @param int|string $startTokenType The type of token(s) to look for for the start of the string.
+     * @param int        $length         Token length to get.
+     * @param string     $expected       The expected function return value.
+     *
+     * @dataProvider dataGetTokensAsString()
+     *
+     * @return void
+     */
+    public function testGetTokensAsString($testMarker, $startTokenType, $length, $expected)
+    {
+        $start  = $this->getTargetToken($testMarker, $startTokenType);
+        $result = self::$phpcsFile->getTokensAsString($start, $length);
+        $this->assertSame($expected, $result);
+
+    }//end testGetTokensAsString()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testGetTokensAsString() For the array format.
+     *
+     * @return array<string, array<string, string|int>>
+     */
+    public static function dataGetTokensAsString()
+    {
+        return 
+            'length-0'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 0,
+                'expected'       => '',
+            ,
+            'length-1'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 1,
+                'expected'       => '1',
+            ,
+            'length-2'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 2,
+                'expected'       => '1 ',
+            ,
+            'length-3'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 3,
+                'expected'       => '1 +',
+            ,
+            'length-4'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 4,
+                'expected'       => '1 + ',
+            ,
+            'length-5'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 5,
+                'expected'       => '1 + 2',
+            ,
+            'length-6'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 6,
+                'expected'       => '1 + 2 ',
+            ,
+            'length-7'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 7,
+                'expected'       => '1 + 2 +',
+            ,
+            'length-8'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 8,
+                'expected'       => '1 + 2 +
+',
+            ,
+            'length-9'          => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 9,
+                'expected'       => '1 + 2 +
+        ',
+            ,
+            'length-10'         => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 10,
+                'expected'       => '1 + 2 +
+        // Comment.
+',
+            ,
+            'length-11'         => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 11,
+                'expected'       => '1 + 2 +
+        // Comment.
+        ',
+            ,
+            'length-12'         => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 12,
+                'expected'       => '1 + 2 +
+        // Comment.
+        3',
+            ,
+            'length-13'         => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 13,
+                'expected'       => '1 + 2 +
+        // Comment.
+        3 ',
+            ,
+            'length-14'         => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 14,
+                'expected'       => '1 + 2 +
+        // Comment.
+        3 +',
+            ,
+            'length-34'         => 
+                'testMarker'     => '/* testCalculation */',
+                'startTokenType' => T_LNUMBER,
+                'length'         => 34,
+                'expected'       => '1 + 2 +
+        // Comment.
+        3 + 4
+        + 5 + 6 + 7 > 20;',
+            ,
+            'namespace'         => 
+                'testMarker'     => '/* testNamespace */',
+                'startTokenType' => T_NAMESPACE,
+                'length'         => 8,
+                'expected'       => 'namespace Foo\Bar\Baz;',
+            ,
+            'use-with-comments' => 
+                'testMarker'     => '/* testUseWithComments */',
+                'startTokenType' => T_USE,
+                'length'         => 17,
+                'expected'       => 'use Foo /*comment*/ \ Bar
+    // phpcs:ignore Stnd.Cat.Sniff --    For reasons.
+    \ Bah;',
+            ,
+            'echo-with-tabs'    => 
+                'testMarker'     => '/* testEchoWithTabs */',
+                'startTokenType' => T_ECHO,
+                'length'         => 13,
+                'expected'       => 'echo \'foo\',
+    \'bar\'   ,
+        \'baz\';',
+            ,
+            'end-of-file'       => 
+                'testMarker'     => '/* testEndOfFile */',
+                'startTokenType' => T_ECHO,
+                'length'         => 4,
+                'expected'       => 'echo   $foo;',
+            ,
+        ;
+
+    }//end dataGetTokensAsString()
+
+
+    /**
+     * Test getting a token set as a string with the original, non tab-replaced content.
+     *
+     * @param string     $testMarker     The comment which prefaces the target token in the test file.
+     * @param int|string $startTokenType The type of token(s) to look for for the start of the string.
+     * @param int        $length         Token length to get.
+     * @param string     $expected       The expected function return value.
+     *
+     * @dataProvider dataGetOrigContent()
+     *
+     * @return void
+     */
+    public function testGetOrigContent($testMarker, $startTokenType, $length, $expected)
+    {
+        $start  = $this->getTargetToken($testMarker, $startTokenType);
+        $result = self::$phpcsFile->getTokensAsString($start, $length, true);
+        $this->assertSame($expected, $result);
+
+    }//end testGetOrigContent()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testGetOrigContent() For the array format.
+     *
+     * @return array<string, array<string, string|int>>
+     */
+    public static function dataGetOrigContent()
+    {
+        return 
+            'use-with-comments' => 
+                'testMarker'     => '/* testUseWithComments */',
+                'startTokenType' => T_USE,
+                'length'         => 17,
+                'expected'       => 'use Foo /*comment*/ \ Bar
+	// phpcs:ignore Stnd.Cat.Sniff --	 For reasons.
+	\ Bah;',
+            ,
+            'echo-with-tabs'    => 
+                'testMarker'     => '/* testEchoWithTabs */',
+                'startTokenType' => T_ECHO,
+                'length'         => 13,
+                'expected'       => 'echo \'foo\',
+	\'bar\'	,
+		\'baz\';',
+            ,
+            'end-of-file'       => 
+                'testMarker'     => '/* testEndOfFile */',
+                'startTokenType' => T_ECHO,
+                'length'         => 4,
+                'expected'       => 'echo   $foo;',
+            ,
+        ;
+
+    }//end dataGetOrigContent()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/IsReferenceTest.inc Changed

@@ -1,6 +1,8 @@
 <?php
 
-namespace PHP_CodeSniffer\Tests\Core\File;
+/* testTokenizerIssue1971PHPCSlt330gt271A */
+// This has to be the first test in the file!
+&$a, $b, /* testTokenizerIssue1971PHPCSlt330gt271B */ &$c = $array;
 
 /* testBitwiseAndA */
 error_reporting( E_NOTICE & E_STRICT );
@@ -98,6 +100,32 @@
 /* testAssignByReferenceE */
 $collection = &collector();
 
+/* testAssignByReferenceF */
+$collection ??= &collector();
+
+/* testShortListAssignByReferenceNoKeyA */
+
+    &$a,
+    /* testShortListAssignByReferenceNoKeyB */
+    &$b,
+    /* testNestedShortListAssignByReferenceNoKey */
+    $c, &$d
+ = $array;
+
+/* testLongListAssignByReferenceNoKeyA */
+list($a, &$b, list(/* testLongListAssignByReferenceNoKeyB */ &$c, /* testLongListAssignByReferenceNoKeyC */ &$d)) = $array;
+
+
+    /* testNestedShortListAssignByReferenceWithKeyA */
+    'a' => &$a, $b,
+    /* testNestedShortListAssignByReferenceWithKeyB */
+    'b' => $c, &$d
+ = $array;
+
+
+/* testLongListAssignByReferenceWithKeyA */
+list(get_key()1 => &$e) = 1, 2, 3;
+
 /* testPassByReferenceA */
 functionCall(&$something, $somethingElse);
 
@@ -128,6 +156,9 @@
 /* testPassByReferenceJ */
 functionCall($something, &namespace\SomeClass::$somethingElse);
 
+/* testPassByReferencePartiallyQualifiedName */
+functionCall($something, &Sub\Level\SomeClass::$somethingElse);
+
 /* testNewByReferenceA */
 $foobar2 = &new Foobar();
 
@@ -137,9 +168,27 @@
 /* testUseByReference */
 $closure = function() use (&$var){};
 
+/* testUseByReferenceWithCommentFirstParam */
+$closure = function() use /*comment*/ (&$this->value){};
+
+/* testUseByReferenceWithCommentSecondParam */
+$closure = function() use /*comment*/ ($varA, &$varB){};
+
 /* testArrowFunctionReturnByReference */
 fn&($x) => $x;
 
+$closure = function (
+    /* testBitwiseAndExactParameterA */
+    $a = MY_CONSTANT & parent::OTHER_CONSTANT,
+    /* testPassByReferenceExactParameterB */
+    &$b,
+    /* testPassByReferenceExactParameterC */
+    &...$c,
+    /* testBitwiseAndExactParameterD */
+    $d = E_NOTICE & E_STRICT,
+) {};
+
+// Issue PHPCS#3049.
 /* testArrowFunctionPassByReferenceA */
 $fn = fn(array &$one) => 1;
 
@@ -148,3 +197,14 @@
 
 /* testClosureReturnByReference */
 $closure = function &($param) use ($value) {};
+
+/* testBitwiseAndArrowFunctionInDefault */
+$fn = fn( $one = E_NOTICE & E_STRICT) => 1;
+
+/* testTokenizerIssue1284PHPCSlt280A */
+if ($foo) {}
+&$a, /* testTokenizerIssue1284PHPCSlt280B */ &$b = $c;
+
+/* testTokenizerIssue1284PHPCSlt280C */
+if ($foo) {}
+&$a, $b;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/IsReferenceTest.php Changed

@@ -1,21 +1,39 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Files\File:isReference method.
+ * Tests for the \PHP_CodeSniffer\Files\File::isReference method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\File;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Files\File::isReference method.
+ *
+ * @covers \PHP_CodeSniffer\Files\File::isReference
+ */
 class IsReferenceTest extends AbstractMethodUnitTest
 {
 
 
     /**
+     * Test that false is returned when a non-"bitwise and" token is passed.
+     *
+     * @return void
+     */
+    public function testNotBitwiseAndToken()
+    {
+        $target = $this->getTargetToken('/* testBitwiseAndA */', T_STRING);
+        $this->assertFalse(self::$phpcsFile->isReference($target));
+
+    }//end testNotBitwiseAndToken()
+
+
+    /**
      * Test correctly identifying whether a "bitwise and" token is a reference or not.
      *
      * @param string $identifier Comment which precedes the test case.
@@ -39,206 +57,298 @@
      *
      * @see testIsReference()
      *
-     * @return array
+     * @return array<string, array<string, string|bool>>
      */
     public function dataIsReference()
     {
         return 
-            
-                '/* testBitwiseAndA */',
-                false,
+            'issue-1971-list-first-in-file'                                                                     => 
+                'testMarker' => '/* testTokenizerIssue1971PHPCSlt330gt271A */',
+                'expected'   => true,
+            ,
+            'issue-1971-list-first-in-file-nested'                                                              => 
+                'testMarker' => '/* testTokenizerIssue1971PHPCSlt330gt271B */',
+                'expected'   => true,
+            ,
+            'bitwise and: param in function call'                                                               => 
+                'testMarker' => '/* testBitwiseAndA */',
+                'expected'   => false,
+            ,
+            'bitwise and: in unkeyed short array, first value'                                                  => 
+                'testMarker' => '/* testBitwiseAndB */',
+                'expected'   => false,
+            ,
+            'bitwise and: in unkeyed short array, last value'                                                   => 
+                'testMarker' => '/* testBitwiseAndC */',
+                'expected'   => false,
+            ,
+            'bitwise and: in unkeyed long array, last value'                                                    => 
+                'testMarker' => '/* testBitwiseAndD */',
+                'expected'   => false,
+            ,
+            'bitwise and: in keyed short array, last value'                                                     => 
+                'testMarker' => '/* testBitwiseAndE */',
+                'expected'   => false,
+            ,
+            'bitwise and: in keyed long array, last value'                                                      => 
+                'testMarker' => '/* testBitwiseAndF */',
+                'expected'   => false,
+            ,
+            'bitwise and: in assignment'                                                                        => 
+                'testMarker' => '/* testBitwiseAndG */',
+                'expected'   => false,
+            ,
+            'bitwise and: in param default value in function declaration'                                       => 
+                'testMarker' => '/* testBitwiseAndH */',
+                'expected'   => false,
+            ,
+            'bitwise and: in param default value in closure declaration'                                        => 
+                'testMarker' => '/* testBitwiseAndI */',
+                'expected'   => false,
+            ,
+            'reference: function declared to return by reference'                                               => 
+                'testMarker' => '/* testFunctionReturnByReference */',
+                'expected'   => true,
+            ,
+            'reference: only param in function declaration, pass by reference'                                  => 
+                'testMarker' => '/* testFunctionPassByReferenceA */',
+                'expected'   => true,
+            ,
+            'reference: last param in function declaration, pass by reference'                                  => 
+                'testMarker' => '/* testFunctionPassByReferenceB */',
+                'expected'   => true,
+            ,
+            'reference: only param in closure declaration, pass by reference'                                   => 
+                'testMarker' => '/* testFunctionPassByReferenceC */',
+                'expected'   => true,
+            ,
+            'reference: last param in closure declaration, pass by reference'                                   => 
+                'testMarker' => '/* testFunctionPassByReferenceD */',
+                'expected'   => true,
+            ,
+            'reference: typed param in function declaration, pass by reference'                                 => 
+                'testMarker' => '/* testFunctionPassByReferenceE */',
+                'expected'   => true,
+            ,
+            'reference: typed param in closure declaration, pass by reference'                                  => 
+                'testMarker' => '/* testFunctionPassByReferenceF */',
+                'expected'   => true,
+            ,
+            'reference: variadic param in function declaration, pass by reference'                              => 
+                'testMarker' => '/* testFunctionPassByReferenceG */',
+                'expected'   => true,
+            ,
+            'reference: foreach value'                                                                          => 
+                'testMarker' => '/* testForeachValueByReference */',
+                'expected'   => true,
+            ,
+            'reference: foreach key'                                                                            => 
+                'testMarker' => '/* testForeachKeyByReference */',
+                'expected'   => true,
+            ,
+            'reference: keyed short array, first value, value by reference'                                     => 
+                'testMarker' => '/* testArrayValueByReferenceA */',
+                'expected'   => true,
+            ,
+            'reference: keyed short array, last value, value by reference'                                      => 
+                'testMarker' => '/* testArrayValueByReferenceB */',
+                'expected'   => true,
+            ,
+            'reference: unkeyed short array, only value, value by reference'                                    => 
+                'testMarker' => '/* testArrayValueByReferenceC */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndB */',
-                false,
+            'reference: unkeyed short array, last value, value by reference'                                    => 
+                'testMarker' => '/* testArrayValueByReferenceD */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndC */',
-                false,
+            'reference: keyed long array, first value, value by reference'                                      => 
+                'testMarker' => '/* testArrayValueByReferenceE */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndD */',
-                false,
+            'reference: keyed long array, last value, value by reference'                                       => 
+                'testMarker' => '/* testArrayValueByReferenceF */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndE */',
-                false,
+            'reference: unkeyed long array, only value, value by reference'                                     => 
+                'testMarker' => '/* testArrayValueByReferenceG */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndF */',
-                false,
+            'reference: unkeyed long array, last value, value by reference'                                     => 
+                'testMarker' => '/* testArrayValueByReferenceH */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndG */',
-                false,
+            'reference: variable, assign by reference'                                                          => 
+                'testMarker' => '/* testAssignByReferenceA */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndH */',
-                false,
+            'reference: variable, assign by reference, spacing variation'                                       => 
+                'testMarker' => '/* testAssignByReferenceB */',
+                'expected'   => true,
             ,
-            
-                '/* testBitwiseAndI */',
-                false,
+            'reference: variable, assign by reference, concat assign'                                           => 
+                'testMarker' => '/* testAssignByReferenceC */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionReturnByReference */',
-                true,
+            'reference: property, assign by reference'                                                          => 
+                'testMarker' => '/* testAssignByReferenceD */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionPassByReferenceA */',
-                true,
+            'reference: function return value, assign by reference'                                             => 
+                'testMarker' => '/* testAssignByReferenceE */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionPassByReferenceB */',
-                true,
+            'reference: function return value, assign by reference, null coalesce assign'                       => 
+                'testMarker' => '/* testAssignByReferenceF */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionPassByReferenceC */',
-                true,
+            'reference: unkeyed short list, first var, assign by reference'                                     => 
+                'testMarker' => '/* testShortListAssignByReferenceNoKeyA */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionPassByReferenceD */',
-                true,
+            'reference: unkeyed short list, second var, assign by reference'                                    => 
+                'testMarker' => '/* testShortListAssignByReferenceNoKeyB */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionPassByReferenceE */',
-                true,
+            'reference: unkeyed short list, nested var, assign by reference'                                    => 
+                'testMarker' => '/* testNestedShortListAssignByReferenceNoKey */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionPassByReferenceF */',
-                true,
+            'reference: unkeyed long list, second var, assign by reference'                                     => 
+                'testMarker' => '/* testLongListAssignByReferenceNoKeyA */',
+                'expected'   => true,
             ,
-            
-                '/* testFunctionPassByReferenceG */',
-                true,
+            'reference: unkeyed long list, first nested var, assign by reference'                               => 
+                'testMarker' => '/* testLongListAssignByReferenceNoKeyB */',
+                'expected'   => true,
             ,
-            
-                '/* testForeachValueByReference */',
-                true,
+            'reference: unkeyed long list, last nested var, assign by reference'                                => 
+                'testMarker' => '/* testLongListAssignByReferenceNoKeyC */',
+                'expected'   => true,
             ,
-            
-                '/* testForeachKeyByReference */',
-                true,
+            'reference: keyed short list, first nested var, assign by reference'                                => 
+                'testMarker' => '/* testNestedShortListAssignByReferenceWithKeyA */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceA */',
-                true,
+            'reference: keyed short list, last nested var, assign by reference'                                 => 
+                'testMarker' => '/* testNestedShortListAssignByReferenceWithKeyB */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceB */',
-                true,
+            'reference: keyed long list, only var, assign by reference'                                         => 
+                'testMarker' => '/* testLongListAssignByReferenceWithKeyA */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceC */',
-                true,
+            'reference: first param in function call, pass by reference'                                        => 
+                'testMarker' => '/* testPassByReferenceA */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceD */',
-                true,
+            'reference: last param in function call, pass by reference'                                         => 
+                'testMarker' => '/* testPassByReferenceB */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceE */',
-                true,
+            'reference: property in function call, pass by reference'                                           => 
+                'testMarker' => '/* testPassByReferenceC */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceF */',
-                true,
+            'reference: hierarchical self property in function call, pass by reference'                         => 
+                'testMarker' => '/* testPassByReferenceD */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceG */',
-                true,
+            'reference: hierarchical parent property in function call, pass by reference'                       => 
+                'testMarker' => '/* testPassByReferenceE */',
+                'expected'   => true,
             ,
-            
-                '/* testArrayValueByReferenceH */',
-                true,
+            'reference: hierarchical static property in function call, pass by reference'                       => 
+                'testMarker' => '/* testPassByReferenceF */',
+                'expected'   => true,
             ,
-            
-                '/* testAssignByReferenceA */',
-                true,
+            'reference: static property in function call, pass by reference'                                    => 
+                'testMarker' => '/* testPassByReferenceG */',
+                'expected'   => true,
             ,
-            
-                '/* testAssignByReferenceB */',
-                true,
+            'reference: static property in function call, first with FQN, pass by reference'                    => 
+                'testMarker' => '/* testPassByReferenceH */',
+                'expected'   => true,
             ,
-            
-                '/* testAssignByReferenceC */',
-                true,
+            'reference: static property in function call, last with FQN, pass by reference'                     => 
+                'testMarker' => '/* testPassByReferenceI */',
+                'expected'   => true,
             ,
-            
-                '/* testAssignByReferenceD */',
-                true,
+            'reference: static property in function call, last with namespace relative name, pass by reference' => 
+                'testMarker' => '/* testPassByReferenceJ */',
+                'expected'   => true,
             ,
-            
-                '/* testAssignByReferenceE */',
-                true,
+            'reference: static property in function call, last with PQN, pass by reference'                     => 
+                'testMarker' => '/* testPassByReferencePartiallyQualifiedName */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceA */',
-                true,
+            'reference: new by reference'                                                                       => 
+                'testMarker' => '/* testNewByReferenceA */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceB */',
-                true,
+            'reference: new by reference as function call param'                                                => 
+                'testMarker' => '/* testNewByReferenceB */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceC */',
-                true,
+            'reference: closure use by reference'                                                               => 
+                'testMarker' => '/* testUseByReference */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceD */',
-                true,
+            'reference: closure use by reference, first param, with comment'                                    => 
+                'testMarker' => '/* testUseByReferenceWithCommentFirstParam */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceE */',
-                true,
+            'reference: closure use by reference, last param, with comment'                                     => 
+                'testMarker' => '/* testUseByReferenceWithCommentSecondParam */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceF */',
-                true,
+            'reference: arrow fn declared to return by reference'                                               => 
+                'testMarker' => '/* testArrowFunctionReturnByReference */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceG */',
-                true,
+            'bitwise and: first param default value in closure declaration'                                     => 
+                'testMarker' => '/* testBitwiseAndExactParameterA */',
+                'expected'   => false,
             ,
-            
-                '/* testPassByReferenceH */',
-                true,
+            'reference: param in closure declaration, pass by reference'                                        => 
+                'testMarker' => '/* testPassByReferenceExactParameterB */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceI */',
-                true,
+            'reference: variadic param in closure declaration, pass by reference'                               => 
+                'testMarker' => '/* testPassByReferenceExactParameterC */',
+                'expected'   => true,
             ,
-            
-                '/* testPassByReferenceJ */',
-                true,
+            'bitwise and: last param default value in closure declaration'                                      => 
+                'testMarker' => '/* testBitwiseAndExactParameterD */',
+                'expected'   => false,
             ,
-            
-                '/* testNewByReferenceA */',
-                true,
+            'reference: typed param in arrow fn declaration, pass by reference'                                 => 
+                'testMarker' => '/* testArrowFunctionPassByReferenceA */',
+                'expected'   => true,
             ,
-            
-                '/* testNewByReferenceB */',
-                true,
+            'reference: variadic param in arrow fn declaration, pass by reference'                              => 
+                'testMarker' => '/* testArrowFunctionPassByReferenceB */',
+                'expected'   => true,
             ,
-            
-                '/* testUseByReference */',
-                true,
+            'reference: closure declared to return by reference'                                                => 
+                'testMarker' => '/* testClosureReturnByReference */',
+                'expected'   => true,
             ,
-            
-                '/* testArrowFunctionReturnByReference */',
-                true,
+            'bitwise and: param default value in arrow fn declaration'                                          => 
+                'testMarker' => '/* testBitwiseAndArrowFunctionInDefault */',
+                'expected'   => false,
             ,
-            
-                '/* testArrowFunctionPassByReferenceA */',
-                true,
+            'issue-1284-short-list-directly-after-close-curly-control-structure'                                => 
+                'testMarker' => '/* testTokenizerIssue1284PHPCSlt280A */',
+                'expected'   => true,
             ,
-            
-                '/* testArrowFunctionPassByReferenceB */',
-                true,
+            'issue-1284-short-list-directly-after-close-curly-control-structure-second-item'                    => 
+                'testMarker' => '/* testTokenizerIssue1284PHPCSlt280B */',
+                'expected'   => true,
             ,
-            
-                '/* testClosureReturnByReference */',
-                true,
+            'issue-1284-short-array-directly-after-close-curly-control-structure'                               => 
+                'testMarker' => '/* testTokenizerIssue1284PHPCSlt280C */',
+                'expected'   => true,
             ,
         ;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/AbstractFilterTestCase.php Added

@@ -0,0 +1,227 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Filters\GitModified class.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2023 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Filters;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Filters\Filter;
+use PHP_CodeSniffer\Ruleset;
+use PHPUnit\Framework\TestCase;
+use RecursiveIteratorIterator;
+
+/**
+ * Base functionality and utilities for testing Filter classes.
+ */
+abstract class AbstractFilterTestCase extends TestCase
+{
+
+    /**
+     * The Config object.
+     *
+     * @var \PHP_CodeSniffer\Config
+     */
+    protected static $config;
+
+    /**
+     * The Ruleset object.
+     *
+     * @var \PHP_CodeSniffer\Ruleset
+     */
+    protected static $ruleset;
+
+
+    /**
+     * Initialize the config and ruleset objects.
+     *
+     * @beforeClass
+     *
+     * @return void
+     */
+    public static function initializeConfigAndRuleset()
+    {
+        self::$config  = new Config('--standard=PSR1', '--extensions=php,inc/php,js,css', '--report-width=80');
+        self::$ruleset = new Ruleset(self::$config);
+
+    }//end initializeConfigAndRuleset()
+
+
+    /**
+     * Helper method to retrieve a mock object for a Filter class.
+     *
+     * The `setMethods()` method was silently deprecated in PHPUnit 9 and removed in PHPUnit 10.
+     *
+     * Note: direct access to the `getMockBuilder()` method is soft deprecated as of PHPUnit 10,
+     * and expected to be hard deprecated in PHPUnit 11 and removed in PHPUnit 12.
+     * Dealing with that is something for a later iteration of the test suite.
+     *
+     * @param string             $className       Fully qualified name of the class under test.
+     * @param array<mixed>       $constructorArgs Optional. Array of parameters to pass to the class constructor.
+     * @param array<string>|null $methodsToMock   Optional. The methods to mock in the class under test.
+     *                                            Needed for PHPUnit cross-version support as PHPUnit 4.x does
+     *                                            not have a `setMethodsExcept()` method yet.
+     *                                            If not passed, no methods will be replaced.
+     *
+     * @return \PHPUnit\Framework\MockObject\MockObject
+     */
+    protected function getMockedClass($className, array $constructorArgs=, $methodsToMock=null)
+    {
+        $mockedObj = $this->getMockBuilder($className);
+
+        if (\method_exists($mockedObj, 'onlyMethods') === true) {
+            // PHPUnit 8+.
+            if (is_array($methodsToMock) === true) {
+                return $mockedObj
+                    ->setConstructorArgs($constructorArgs)
+                    ->onlyMethods($methodsToMock)
+                    ->getMock();
+            }
+
+            return $mockedObj->getMock()
+                ->setConstructorArgs($constructorArgs);
+        }
+
+        // PHPUnit < 8.
+        return $mockedObj
+            ->setConstructorArgs($constructorArgs)
+            ->setMethods($methodsToMock)
+            ->getMock();
+
+    }//end getMockedClass()
+
+
+    /**
+     * Retrieve an array of files which were accepted by a filter.
+     *
+     * @param \PHP_CodeSniffer\Filters\Filter $filter The Filter object under test.
+     *
+     * @return array<string>
+     */
+    protected function getFilteredResultsAsArray(Filter $filter)
+    {
+        $iterator = new RecursiveIteratorIterator($filter);
+        $files    = ;
+        foreach ($iterator as $file) {
+            $files = $file;
+        }
+
+        return $files;
+
+    }//end getFilteredResultsAsArray()
+
+
+    /**
+     * Retrieve the basedir to use for tests using the `getFakeFileList()` method.
+     *
+     * @return string
+     */
+    protected static function getBaseDir()
+    {
+        return dirname(dirname(dirname(__DIR__)));
+
+    }//end getBaseDir()
+
+
+    /**
+     * Retrieve a file list containing a range of paths for testing purposes.
+     *
+     * This list **must** contain files which exist in this project (well, except for some which don't exist
+     * purely for testing purposes), as `realpath()` is used in the logic under test and `realpath()` will
+     * return `false` for any non-existent files, which will automatically filter them out before
+     * we get to the code under test.
+     *
+     * Note this list does not include `.` and `..` as \PHP_CodeSniffer\Files\FileList uses `SKIP_DOTS`.
+     *
+     * @return array<string>
+     */
+    protected static function getFakeFileList()
+    {
+        $basedir = self::getBaseDir();
+        return 
+            $basedir.'/.gitignore',
+            $basedir.'/.yamllint.yml',
+            $basedir.'/phpcs.xml',
+            $basedir.'/phpcs.xml.dist',
+            $basedir.'/autoload.php',
+            $basedir.'/bin',
+            $basedir.'/bin/phpcs',
+            $basedir.'/bin/phpcs.bat',
+            $basedir.'/scripts',
+            $basedir.'/scripts/build-phar.php',
+            $basedir.'/src',
+            $basedir.'/src/WillNotExist.php',
+            $basedir.'/src/WillNotExist.bak',
+            $basedir.'/src/WillNotExist.orig',
+            $basedir.'/src/Ruleset.php',
+            $basedir.'/src/Generators',
+            $basedir.'/src/Generators/Markdown.php',
+            $basedir.'/src/Standards',
+            $basedir.'/src/Standards/Generic',
+            $basedir.'/src/Standards/Generic/Docs',
+            $basedir.'/src/Standards/Generic/Docs/Classes',
+            $basedir.'/src/Standards/Generic/Docs/Classes/DuplicateClassNameStandard.xml',
+            $basedir.'/src/Standards/Generic/Sniffs',
+            $basedir.'/src/Standards/Generic/Sniffs/Classes',
+            $basedir.'/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+            $basedir.'/src/Standards/Generic/Tests',
+            $basedir.'/src/Standards/Generic/Tests/Classes',
+            $basedir.'/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.1.inc',
+            // Will rarely exist when running the tests.
+            $basedir.'/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.1.inc.bak',
+            $basedir.'/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.2.inc',
+            $basedir.'/src/Standards/Generic/Tests/Classes/DuplicateClassNameUnitTest.php',
+            $basedir.'/src/Standards/Squiz',
+            $basedir.'/src/Standards/Squiz/Docs',
+            $basedir.'/src/Standards/Squiz/Docs/WhiteSpace',
+            $basedir.'/src/Standards/Squiz/Docs/WhiteSpace/SemicolonSpacingStandard.xml',
+            $basedir.'/src/Standards/Squiz/Sniffs',
+            $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace',
+            $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
+            $basedir.'/src/Standards/Squiz/Tests',
+            $basedir.'/src/Standards/Squiz/Tests/WhiteSpace',
+            $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
+            $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed',
+            $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
+            $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
+            $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
+        ;
+
+    }//end getFakeFileList()
+
+
+    /**
+     * Translate Linux paths to Windows paths, when necessary.
+     *
+     * These type of tests should be able to run and pass on both *nix as well as Windows
+     * based dev systems. This method is a helper to allow for this.
+     *
+     * @param array<string|array> $paths A single or multi-dimensional array containing
+     *                                   file paths.
+     *
+     * @return array<string|array>
+     */
+    protected static function mapPathsToRuntimeOs(array $paths)
+    {
+        if (DIRECTORY_SEPARATOR !== '\\') {
+            return $paths;
+        }
+
+        foreach ($paths as $key => $value) {
+            if (is_string($value) === true) {
+                $paths$key = strtr($value, '/', '\\\\');
+            } else if (is_array($value) === true) {
+                $paths$key = self::mapPathsToRuntimeOs($value);
+            }
+        }
+
+        return $paths;
+
+    }//end mapPathsToRuntimeOs()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/Filter/AcceptTest.php Changed

@@ -5,7 +5,7 @@
  * @author    Willington Vega <wvega@wvega.com>
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Filters\Filter;
@@ -13,67 +13,39 @@
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Filters\Filter;
 use PHP_CodeSniffer\Ruleset;
-use PHPUnit\Framework\TestCase;
+use PHP_CodeSniffer\Tests\Core\Filters\AbstractFilterTestCase;
+use RecursiveArrayIterator;
 
-class AcceptTest extends TestCase
+/**
+ * Tests for the \PHP_CodeSniffer\Filters\Filter::accept method.
+ *
+ * @covers \PHP_CodeSniffer\Filters\Filter
+ */
+class AcceptTest extends AbstractFilterTestCase
 {
 
-    /**
-     * The Config object.
-     *
-     * @var \PHP_CodeSniffer\Config
-     */
-    protected static $config;
-
-    /**
-     * The Ruleset object.
-     *
-     * @var \PHP_CodeSniffer\Ruleset
-     */
-    protected static $ruleset;
-
-
-    /**
-     * Initialize the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        if ($GLOBALS'PHP_CODESNIFFER_PEAR' === true) {
-            // PEAR installs test and sniff files into different locations
-            // so these tests will not pass as they directly reference files
-            // by relative location.
-            $this->markTestSkipped('Test cannot run from a PEAR install');
-        }
-
-    }//end setUp()
-
 
     /**
      * Initialize the config and ruleset objects based on the `AcceptTest.xml` ruleset file.
      *
+     * @beforeClass
+     *
      * @return void
      */
-    public static function setUpBeforeClass()
+    public static function initializeConfigAndRuleset()
     {
-        if ($GLOBALS'PHP_CODESNIFFER_PEAR' === true) {
-            // This test will be skipped.
-            return;
-        }
-
         $standard      = __DIR__.'/'.basename(__FILE__, '.php').'.xml';
-        self::$config  = new Config("--standard=$standard", "--ignore=*/somethingelse/*");
+        self::$config  = new Config("--standard=$standard", '--ignore=*/somethingelse/*', '--report-width=80');
         self::$ruleset = new Ruleset(self::$config);
 
-    }//end setUpBeforeClass()
+    }//end initializeConfigAndRuleset()
 
 
     /**
      * Test filtering a file list for excluded paths.
      *
-     * @param array $inputPaths     List of file paths to be filtered.
-     * @param array $expectedOutput Expected filtering result.
+     * @param array<string> $inputPaths     List of file paths to be filtered.
+     * @param array<string> $expectedOutput Expected filtering result.
      *
      * @dataProvider dataExcludePatterns
      *
@@ -81,16 +53,10 @@
      */
     public function testExcludePatterns($inputPaths, $expectedOutput)
     {
-        $fakeDI   = new \RecursiveArrayIterator($inputPaths);
-        $filter   = new Filter($fakeDI, '/', self::$config, self::$ruleset);
-        $iterator = new \RecursiveIteratorIterator($filter);
-        $files    = ;
-
-        foreach ($iterator as $file) {
-            $files = $file;
-        }
+        $fakeDI = new RecursiveArrayIterator($inputPaths);
+        $filter = new Filter($fakeDI, '/', self::$config, self::$ruleset);
 
-        $this->assertEquals($expectedOutput, $files);
+        $this->assertEquals($expectedOutput, $this->getFilteredResultsAsArray($filter));
 
     }//end testExcludePatterns()
 
@@ -100,34 +66,34 @@
      *
      * @see testExcludePatterns
      *
-     * @return array
+     * @return array<string, array<string, array<string>>>
      */
-    public function dataExcludePatterns()
+    public static function dataExcludePatterns()
     {
         $testCases = 
             // Test top-level exclude patterns.
-            
-                
+            'Non-sniff specific path based excludes from ruleset and command line are respected and don\'t filter out too much' => 
+                'inputPaths'     => 
                     '/path/to/src/Main.php',
                     '/path/to/src/Something/Main.php',
                     '/path/to/src/Somethingelse/Main.php',
                     '/path/to/src/SomethingelseEvenLonger/Main.php',
                     '/path/to/src/Other/Main.php',
                 ,
-                
+                'expectedOutput' => 
                     '/path/to/src/Main.php',
                     '/path/to/src/SomethingelseEvenLonger/Main.php',
                 ,
             ,
 
             // Test ignoring standard/sniff specific exclude patterns.
-            
-                
+            'Filter should not act on standard/sniff specific exclude patterns'                                                 => 
+                'inputPaths'     => 
                     '/path/to/src/generic-project/Main.php',
                     '/path/to/src/generic/Main.php',
                     '/path/to/src/anything-generic/Main.php',
                 ,
-                
+                'expectedOutput' => 
                     '/path/to/src/generic-project/Main.php',
                     '/path/to/src/generic/Main.php',
                     '/path/to/src/anything-generic/Main.php',
@@ -136,17 +102,7 @@
         ;
 
         // Allow these tests to work on Windows as well.
-        if (DIRECTORY_SEPARATOR === '\\') {
-            foreach ($testCases as $key => $case) {
-                foreach ($case as $nr => $param) {
-                    foreach ($param as $file => $value) {
-                        $testCases$key$nr$file = strtr($value, '/', '\\');
-                    }
-                }
-            }
-        }
-
-        return $testCases;
+        return self::mapPathsToRuntimeOs($testCases);
 
     }//end dataExcludePatterns()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/GitModifiedTest.php Added

@@ -0,0 +1,260 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Filters\GitModified class.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2023 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Filters;
+
+use PHP_CodeSniffer\Filters\GitModified;
+use PHP_CodeSniffer\Tests\Core\Filters\AbstractFilterTestCase;
+use RecursiveArrayIterator;
+use ReflectionMethod;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Filters\GitModified class.
+ *
+ * @covers \PHP_CodeSniffer\Filters\GitModified
+ */
+class GitModifiedTest extends AbstractFilterTestCase
+{
+
+
+    /**
+     * Test filtering a file list for excluded paths.
+     *
+     * @return void
+     */
+    public function testFileNamePassesAsBasePathWillTranslateToDirname()
+    {
+        $rootFile = self::getBaseDir().'/autoload.php';
+
+        $fakeDI          = new RecursiveArrayIterator(self::getFakeFileList());
+        $constructorArgs = 
+            $fakeDI,
+            $rootFile,
+            self::$config,
+            self::$ruleset,
+        ;
+        $mockObj         = $this->getMockedClass('PHP_CodeSniffer\Filters\GitModified', $constructorArgs, 'exec');
+
+        $mockObj->expects($this->once())
+            ->method('exec')
+            ->willReturn('autoload.php');
+
+        $this->assertEquals($rootFile, $this->getFilteredResultsAsArray($mockObj));
+
+    }//end testFileNamePassesAsBasePathWillTranslateToDirname()
+
+
+    /**
+     * Test filtering a file list for excluded paths.
+     *
+     * @param array<string> $inputPaths        List of file paths to be filtered.
+     * @param array<string> $outputGitModified Simulated "git modified" output.
+     * @param array<string> $expectedOutput    Expected filtering result.
+     *
+     * @dataProvider dataAcceptOnlyGitModified
+     *
+     * @return void
+     */
+    public function testAcceptOnlyGitModified($inputPaths, $outputGitModified, $expectedOutput)
+    {
+        $fakeDI          = new RecursiveArrayIterator($inputPaths);
+        $constructorArgs = 
+            $fakeDI,
+            self::getBaseDir(),
+            self::$config,
+            self::$ruleset,
+        ;
+        $mockObj         = $this->getMockedClass('PHP_CodeSniffer\Filters\GitModified', $constructorArgs, 'exec');
+
+        $mockObj->expects($this->once())
+            ->method('exec')
+            ->willReturn($outputGitModified);
+
+        $this->assertEquals($expectedOutput, $this->getFilteredResultsAsArray($mockObj));
+
+    }//end testAcceptOnlyGitModified()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testAcceptOnlyGitModified
+     *
+     * @return array<string, array<string, array<string>>>
+     */
+    public static function dataAcceptOnlyGitModified()
+    {
+        $basedir      = self::getBaseDir();
+        $fakeFileList = self::getFakeFileList();
+
+        $testCases = 
+            'no files marked as git modified'                                      => 
+                'inputPaths'        => $fakeFileList,
+                'outputGitModified' => ,
+                'expectedOutput'    => ,
+            ,
+
+            'files marked as git modified which don\'t actually exist'             => 
+                'inputPaths'        => $fakeFileList,
+                'outputGitModified' => 
+                    'src/WillNotExist.php',
+                    'src/WillNotExist.bak',
+                    'src/WillNotExist.orig',
+                ,
+                'expectedOutput'    => ,
+            ,
+
+            'single file marked as git modified - file in root dir'                => 
+                'inputPaths'        => $fakeFileList,
+                'outputGitModified' => 'autoload.php',
+                'expectedOutput'    => 
+                    $basedir.'/autoload.php',
+                ,
+            ,
+            'single file marked as git modified - file in sub dir'                 => 
+                'inputPaths'        => $fakeFileList,
+                'outputGitModified' => 'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                'expectedOutput'    => 
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Generic',
+                    $basedir.'/src/Standards/Generic/Sniffs',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
+            ,
+
+            'multiple files marked as git modified, none valid for scan'           => 
+                'inputPaths'        => $fakeFileList,
+                'outputGitModified' => 
+                    '.gitignore',
+                    'phpcs.xml.dist',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
+                ,
+                'expectedOutput'    => 
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Squiz',
+                    $basedir.'/src/Standards/Squiz/Tests',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace',
+                ,
+            ,
+
+            'multiple files marked as git modified, only one file valid for scan'  => 
+                'inputPaths'        => $fakeFileList,
+                'outputGitModified' => 
+                    '.gitignore',
+                    'src/Standards/Generic/Docs/Classes/DuplicateClassNameStandard.xml',
+                    'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
+                'expectedOutput'    => 
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Generic',
+                    $basedir.'/src/Standards/Generic/Docs',
+                    $basedir.'/src/Standards/Generic/Docs/Classes',
+                    $basedir.'/src/Standards/Generic/Sniffs',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
+            ,
+
+            'multiple files marked as git modified, multiple files valid for scan' => 
+                'inputPaths'        => $fakeFileList,
+                'outputGitModified' => 
+                    '.yamllint.yml',
+                    'autoload.php',
+                    'src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
+                ,
+                'expectedOutput'    => 
+                    $basedir.'/autoload.php',
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Squiz',
+                    $basedir.'/src/Standards/Squiz/Sniffs',
+                    $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace',
+                    $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
+                    $basedir.'/src/Standards/Squiz/Tests',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
+                ,
+            ,
+        ;
+
+        return $testCases;
+
+    }//end dataAcceptOnlyGitModified()
+
+
+    /**
+     * Test filtering a file list for excluded paths.
+     *
+     * @param string        $cmd      Command to run.
+     * @param array<string> $expected Expected return value.
+     *
+     * @dataProvider dataExecAlwaysReturnsArray
+     *
+     * @return void
+     */
+    public function testExecAlwaysReturnsArray($cmd, $expected)
+    {
+        $fakeDI = new RecursiveArrayIterator(self::getFakeFileList());
+        $filter = new GitModified($fakeDI, '/', self::$config, self::$ruleset);
+
+        $reflMethod = new ReflectionMethod($filter, 'exec');
+        $reflMethod->setAccessible(true);
+        $result = $reflMethod->invoke($filter, $cmd);
+
+        $this->assertSame($expected, $result);
+
+    }//end testExecAlwaysReturnsArray()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testExecAlwaysReturnsArray
+     *
+     * {@internal Missing: test with a command which yields a `false` return value.
+     *            JRF: I've not managed to find a command which does so, let alone one, which then
+     *            doesn't have side-effects of uncatchable output while running the tests.}
+     *
+     * @return array<string, array<string, string|array<string>>>
+     */
+    public static function dataExecAlwaysReturnsArray()
+    {
+        return 
+            'valid command which won\'t have any output unless files in the bin dir have been modified' => 
+                // Largely using the command used in the filter, but only checking the bin dir.
+                // This should prevent the test unexpectedly failing during local development (in most cases).
+                'cmd'      => 'git ls-files -o -m --exclude-standard -- '.escapeshellarg(self::getBaseDir().'/bin'),
+                'expected' => ,
+            ,
+            'valid command which will have output'                                                      => 
+                'cmd'      => 'git ls-files --exclude-standard -- '.escapeshellarg(self::getBaseDir().'/bin'),
+                'expected' => 
+                    'bin/phpcbf',
+                    'bin/phpcbf.bat',
+                    'bin/phpcs',
+                    'bin/phpcs.bat',
+                ,
+            ,
+        ;
+
+    }//end dataExecAlwaysReturnsArray()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Filters/GitStagedTest.php Added

@@ -0,0 +1,260 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Filters\GitStaged class.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2023 PHPCSStandards Contributors
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Filters;
+
+use PHP_CodeSniffer\Filters\GitStaged;
+use PHP_CodeSniffer\Tests\Core\Filters\AbstractFilterTestCase;
+use RecursiveArrayIterator;
+use ReflectionMethod;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Filters\GitStaged class.
+ *
+ * @covers \PHP_CodeSniffer\Filters\GitStaged
+ */
+class GitStagedTest extends AbstractFilterTestCase
+{
+
+
+    /**
+     * Test filtering a file list for excluded paths.
+     *
+     * @return void
+     */
+    public function testFileNamePassesAsBasePathWillTranslateToDirname()
+    {
+        $rootFile = self::getBaseDir().'/autoload.php';
+
+        $fakeDI          = new RecursiveArrayIterator(self::getFakeFileList());
+        $constructorArgs = 
+            $fakeDI,
+            $rootFile,
+            self::$config,
+            self::$ruleset,
+        ;
+        $mockObj         = $this->getMockedClass('PHP_CodeSniffer\Filters\GitStaged', $constructorArgs, 'exec');
+
+        $mockObj->expects($this->once())
+            ->method('exec')
+            ->willReturn('autoload.php');
+
+        $this->assertEquals($rootFile, $this->getFilteredResultsAsArray($mockObj));
+
+    }//end testFileNamePassesAsBasePathWillTranslateToDirname()
+
+
+    /**
+     * Test filtering a file list for excluded paths.
+     *
+     * @param array<string> $inputPaths      List of file paths to be filtered.
+     * @param array<string> $outputGitStaged Simulated "git staged" output.
+     * @param array<string> $expectedOutput  Expected filtering result.
+     *
+     * @dataProvider dataAcceptOnlyGitStaged
+     *
+     * @return void
+     */
+    public function testAcceptOnlyGitStaged($inputPaths, $outputGitStaged, $expectedOutput)
+    {
+        $fakeDI          = new RecursiveArrayIterator($inputPaths);
+        $constructorArgs = 
+            $fakeDI,
+            self::getBaseDir(),
+            self::$config,
+            self::$ruleset,
+        ;
+        $mockObj         = $this->getMockedClass('PHP_CodeSniffer\Filters\GitStaged', $constructorArgs, 'exec');
+
+        $mockObj->expects($this->once())
+            ->method('exec')
+            ->willReturn($outputGitStaged);
+
+        $this->assertEquals($expectedOutput, $this->getFilteredResultsAsArray($mockObj));
+
+    }//end testAcceptOnlyGitStaged()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testAcceptOnlyGitStaged
+     *
+     * @return array<string, array<string, array<string>>>
+     */
+    public static function dataAcceptOnlyGitStaged()
+    {
+        $basedir      = self::getBaseDir();
+        $fakeFileList = self::getFakeFileList();
+
+        $testCases = 
+            'no files marked as git modified'                                      => 
+                'inputPaths'      => $fakeFileList,
+                'outputGitStaged' => ,
+                'expectedOutput'  => ,
+            ,
+
+            'files marked as git modified which don\'t actually exist'             => 
+                'inputPaths'      => $fakeFileList,
+                'outputGitStaged' => 
+                    'src/WillNotExist.php',
+                    'src/WillNotExist.bak',
+                    'src/WillNotExist.orig',
+                ,
+                'expectedOutput'  => ,
+            ,
+
+            'single file marked as git modified - file in root dir'                => 
+                'inputPaths'      => $fakeFileList,
+                'outputGitStaged' => 'autoload.php',
+                'expectedOutput'  => 
+                    $basedir.'/autoload.php',
+                ,
+            ,
+            'single file marked as git modified - file in sub dir'                 => 
+                'inputPaths'      => $fakeFileList,
+                'outputGitStaged' => 'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                'expectedOutput'  => 
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Generic',
+                    $basedir.'/src/Standards/Generic/Sniffs',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
+            ,
+
+            'multiple files marked as git modified, none valid for scan'           => 
+                'inputPaths'      => $fakeFileList,
+                'outputGitStaged' => 
+                    '.gitignore',
+                    'phpcs.xml.dist',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
+                ,
+                'expectedOutput'  => 
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Squiz',
+                    $basedir.'/src/Standards/Squiz/Tests',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace',
+                ,
+            ,
+
+            'multiple files marked as git modified, only one file valid for scan'  => 
+                'inputPaths'      => $fakeFileList,
+                'outputGitStaged' => 
+                    '.gitignore',
+                    'src/Standards/Generic/Docs/Classes/DuplicateClassNameStandard.xml',
+                    'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
+                'expectedOutput'  => 
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Generic',
+                    $basedir.'/src/Standards/Generic/Docs',
+                    $basedir.'/src/Standards/Generic/Docs/Classes',
+                    $basedir.'/src/Standards/Generic/Sniffs',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes',
+                    $basedir.'/src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ,
+            ,
+
+            'multiple files marked as git modified, multiple files valid for scan' => 
+                'inputPaths'      => $fakeFileList,
+                'outputGitStaged' => 
+                    '.yamllint.yml',
+                    'autoload.php',
+                    'src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js.fixed',
+                    'src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
+                ,
+                'expectedOutput'  => 
+                    $basedir.'/autoload.php',
+                    $basedir.'/src',
+                    $basedir.'/src/Standards',
+                    $basedir.'/src/Standards/Squiz',
+                    $basedir.'/src/Standards/Squiz/Sniffs',
+                    $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace',
+                    $basedir.'/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
+                    $basedir.'/src/Standards/Squiz/Tests',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.js',
+                    $basedir.'/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.php',
+                ,
+            ,
+        ;
+
+        return $testCases;
+
+    }//end dataAcceptOnlyGitStaged()
+
+
+    /**
+     * Test filtering a file list for excluded paths.
+     *
+     * @param string        $cmd      Command to run.
+     * @param array<string> $expected Expected return value.
+     *
+     * @dataProvider dataExecAlwaysReturnsArray
+     *
+     * @return void
+     */
+    public function testExecAlwaysReturnsArray($cmd, $expected)
+    {
+        $fakeDI = new RecursiveArrayIterator(self::getFakeFileList());
+        $filter = new GitStaged($fakeDI, '/', self::$config, self::$ruleset);
+
+        $reflMethod = new ReflectionMethod($filter, 'exec');
+        $reflMethod->setAccessible(true);
+        $result = $reflMethod->invoke($filter, $cmd);
+
+        $this->assertSame($expected, $result);
+
+    }//end testExecAlwaysReturnsArray()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testExecAlwaysReturnsArray
+     *
+     * {@internal Missing: test with a command which yields a `false` return value.
+     *            JRF: I've not managed to find a command which does so, let alone one, which then
+     *            doesn't have side-effects of uncatchable output while running the tests.}
+     *
+     * @return array<string, array<string, array<string>>>
+     */
+    public static function dataExecAlwaysReturnsArray()
+    {
+        return 
+            'valid command which won\'t have any output unless files in the bin dir have been modified & staged' => 
+                // Largely using the command used in the filter, but only checking the bin dir.
+                // This should prevent the test unexpectedly failing during local development (in most cases).
+                'cmd'      => 'git diff --cached --name-only -- '.escapeshellarg(self::getBaseDir().'/bin'),
+                'expected' => ,
+            ,
+            'valid command which will have output'                                                               => 
+                'cmd'      => 'git ls-files --exclude-standard -- '.escapeshellarg(self::getBaseDir().'/bin'),
+                'expected' => 
+                    'bin/phpcbf',
+                    'bin/phpcbf.bat',
+                    'bin/phpcs',
+                    'bin/phpcs.bat',
+                ,
+            ,
+        ;
+
+    }//end dataExecAlwaysReturnsArray()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/IsCamelCapsTest.php Deleted

@@ -1,135 +0,0 @@
-<?php
-/**
- * Tests for the \PHP_CodeSniffer\Util\Common::isCamelCaps method.
- *
- * @author    Greg Sherwood <gsherwood@squiz.net>
- * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
- */
-
-namespace PHP_CodeSniffer\Tests\Core;
-
-use PHP_CodeSniffer\Util\Common;
-use PHPUnit\Framework\TestCase;
-
-class IsCamelCapsTest extends TestCase
-{
-
-
-    /**
-     * Test valid public function/method names.
-     *
-     * @return void
-     */
-    public function testValidNotClassFormatPublic()
-    {
-        $this->assertTrue(Common::isCamelCaps('thisIsCamelCaps', false, true, true));
-        $this->assertTrue(Common::isCamelCaps('thisISCamelCaps', false, true, false));
-
-    }//end testValidNotClassFormatPublic()
-
-
-    /**
-     * Test invalid public function/method names.
-     *
-     * @return void
-     */
-    public function testInvalidNotClassFormatPublic()
-    {
-        $this->assertFalse(Common::isCamelCaps('_thisIsCamelCaps', false, true, true));
-        $this->assertFalse(Common::isCamelCaps('thisISCamelCaps', false, true, true));
-        $this->assertFalse(Common::isCamelCaps('ThisIsCamelCaps', false, true, true));
-
-        $this->assertFalse(Common::isCamelCaps('3thisIsCamelCaps', false, true, true));
-        $this->assertFalse(Common::isCamelCaps('*thisIsCamelCaps', false, true, true));
-        $this->assertFalse(Common::isCamelCaps('-thisIsCamelCaps', false, true, true));
-
-        $this->assertFalse(Common::isCamelCaps('this*IsCamelCaps', false, true, true));
-        $this->assertFalse(Common::isCamelCaps('this-IsCamelCaps', false, true, true));
-        $this->assertFalse(Common::isCamelCaps('this_IsCamelCaps', false, true, true));
-        $this->assertFalse(Common::isCamelCaps('this_is_camel_caps', false, true, true));
-
-    }//end testInvalidNotClassFormatPublic()
-
-
-    /**
-     * Test valid private method names.
-     *
-     * @return void
-     */
-    public function testValidNotClassFormatPrivate()
-    {
-        $this->assertTrue(Common::isCamelCaps('_thisIsCamelCaps', false, false, true));
-        $this->assertTrue(Common::isCamelCaps('_thisISCamelCaps', false, false, false));
-        $this->assertTrue(Common::isCamelCaps('_i18N', false, false, true));
-        $this->assertTrue(Common::isCamelCaps('_i18n', false, false, true));
-
-    }//end testValidNotClassFormatPrivate()
-
-
-    /**
-     * Test invalid private method names.
-     *
-     * @return void
-     */
-    public function testInvalidNotClassFormatPrivate()
-    {
-        $this->assertFalse(Common::isCamelCaps('thisIsCamelCaps', false, false, true));
-        $this->assertFalse(Common::isCamelCaps('_thisISCamelCaps', false, false, true));
-        $this->assertFalse(Common::isCamelCaps('_ThisIsCamelCaps', false, false, true));
-        $this->assertFalse(Common::isCamelCaps('__thisIsCamelCaps', false, false, true));
-        $this->assertFalse(Common::isCamelCaps('__thisISCamelCaps', false, false, false));
-
-        $this->assertFalse(Common::isCamelCaps('3thisIsCamelCaps', false, false, true));
-        $this->assertFalse(Common::isCamelCaps('*thisIsCamelCaps', false, false, true));
-        $this->assertFalse(Common::isCamelCaps('-thisIsCamelCaps', false, false, true));
-        $this->assertFalse(Common::isCamelCaps('_this_is_camel_caps', false, false, true));
-
-    }//end testInvalidNotClassFormatPrivate()
-
-
-    /**
-     * Test valid class names.
-     *
-     * @return void
-     */
-    public function testValidClassFormatPublic()
-    {
-        $this->assertTrue(Common::isCamelCaps('ThisIsCamelCaps', true, true, true));
-        $this->assertTrue(Common::isCamelCaps('ThisISCamelCaps', true, true, false));
-        $this->assertTrue(Common::isCamelCaps('This3IsCamelCaps', true, true, false));
-
-    }//end testValidClassFormatPublic()
-
-
-    /**
-     * Test invalid class names.
-     *
-     * @return void
-     */
-    public function testInvalidClassFormat()
-    {
-        $this->assertFalse(Common::isCamelCaps('thisIsCamelCaps', true));
-        $this->assertFalse(Common::isCamelCaps('This-IsCamelCaps', true));
-        $this->assertFalse(Common::isCamelCaps('This_Is_Camel_Caps', true));
-
-    }//end testInvalidClassFormat()
-
-
-    /**
-     * Test invalid class names with the private flag set.
-     *
-     * Note that the private flag is ignored if the class format
-     * flag is set, so these names are all invalid.
-     *
-     * @return void
-     */
-    public function testInvalidClassFormatPrivate()
-    {
-        $this->assertFalse(Common::isCamelCaps('_ThisIsCamelCaps', true, true));
-        $this->assertFalse(Common::isCamelCaps('_ThisIsCamelCaps', true, false));
-
-    }//end testInvalidClassFormatPrivate()
-
-
-}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/ExplainTest.php Added

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Tests to verify that the "explain" command functions as expected.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2023 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Ruleset;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Ruleset;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test the Ruleset::explain() function.
+ *
+ * @covers \PHP_CodeSniffer\Ruleset::explain
+ */
+class ExplainTest extends TestCase
+{
+
+
+    /**
+     * Test the output of the "explain" command.
+     *
+     * @return void
+     */
+    public function testExplain()
+    {
+        // Set up the ruleset.
+        $config  = new Config('--standard=PSR1', '-e');
+        $ruleset = new Ruleset($config);
+
+        $expected  = PHP_EOL;
+        $expected .= 'The PSR1 standard contains 8 sniffs'.PHP_EOL.PHP_EOL;
+        $expected .= 'Generic (4 sniffs)'.PHP_EOL;
+        $expected .= '------------------'.PHP_EOL;
+        $expected .= '  Generic.Files.ByteOrderMark'.PHP_EOL;
+        $expected .= '  Generic.NamingConventions.UpperCaseConstantName'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowAlternativePHPTags'.PHP_EOL;
+        $expected .= '  Generic.PHP.DisallowShortOpenTag'.PHP_EOL.PHP_EOL;
+        $expected .= 'PSR1 (3 sniffs)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  PSR1.Classes.ClassDeclaration'.PHP_EOL;
+        $expected .= '  PSR1.Files.SideEffects'.PHP_EOL;
+        $expected .= '  PSR1.Methods.CamelCapsMethodName'.PHP_EOL.PHP_EOL;
+        $expected .= 'Squiz (1 sniff)'.PHP_EOL;
+        $expected .= '---------------'.PHP_EOL;
+        $expected .= '  Squiz.Classes.ValidClassName'.PHP_EOL;
+
+        $this->expectOutputString($expected);
+
+        $ruleset->explain();
+
+    }//end testExplain()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyAllowedAsDeclaredSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyAllowedViaMagicMethodSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyAllowedViaStdClassSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/Fixtures/Sniffs/Category/SetPropertyNotAllowedViaAttributeSniff.php Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Ruleset;
@@ -13,6 +13,11 @@
 use PHP_CodeSniffer\Ruleset;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Ruleset class using a Linux-style absolute path to include a sniff.
+ *
+ * @covers \PHP_CodeSniffer\Ruleset
+ */
 class RuleInclusionAbsoluteLinuxTest extends TestCase
 {
 
@@ -41,17 +46,12 @@
     /**
      * Initialize the config and ruleset objects.
      *
+     * @before
+     *
      * @return void
      */
-    public function setUp()
+    public function initializeConfigAndRuleset()
     {
-        if ($GLOBALS'PHP_CODESNIFFER_PEAR' === true) {
-            // PEAR installs test and sniff files into different locations
-            // so these tests will not pass as they directly reference files
-            // by relative location.
-            $this->markTestSkipped('Test cannot run from a PEAR install');
-        }
-
         $this->standard = __DIR__.'/'.basename(__FILE__, '.php').'.xml';
         $repoRootDir    = dirname(dirname(dirname(__DIR__)));
 
@@ -74,19 +74,21 @@
         $config        = new Config("--standard={$this->standard}");
         $this->ruleset = new Ruleset($config);
 
-    }//end setUp()
+    }//end initializeConfigAndRuleset()
 
 
     /**
      * Reset ruleset file.
      *
+     * @after
+     *
      * @return void
      */
-    public function tearDown()
+    public function resetRuleset()
     {
         file_put_contents($this->standard, $this->contents);
 
-    }//end tearDown()
+    }//end resetRuleset()
 
 
     /**
@@ -98,7 +100,6 @@
     public function testLinuxStylePathRuleInclusion()
     {
         // Test that the sniff is correctly registered.
-        $this->assertObjectHasAttribute('sniffCodes', $this->ruleset);
         $this->assertCount(1, $this->ruleset->sniffCodes);
         $this->assertArrayHasKey('Generic.Formatting.SpaceAfterNot', $this->ruleset->sniffCodes);
         $this->assertSame(

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionAbsoluteLinuxTest.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Ruleset;
@@ -13,6 +13,11 @@
 use PHP_CodeSniffer\Ruleset;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Ruleset class using a Windows-style absolute path to include a sniff.
+ *
+ * @covers \PHP_CodeSniffer\Ruleset
+ */
 class RuleInclusionAbsoluteWindowsTest extends TestCase
 {
 
@@ -41,21 +46,16 @@
     /**
      * Initialize the config and ruleset objects.
      *
+     * @before
+     *
      * @return void
      */
-    public function setUp()
+    public function initializeConfigAndRuleset()
     {
         if (DIRECTORY_SEPARATOR === '/') {
             $this->markTestSkipped('Windows specific test');
         }
 
-        if ($GLOBALS'PHP_CODESNIFFER_PEAR' === true) {
-            // PEAR installs test and sniff files into different locations
-            // so these tests will not pass as they directly reference files
-            // by relative location.
-            $this->markTestSkipped('Test cannot run from a PEAR install');
-        }
-
         $this->standard = __DIR__.'/'.basename(__FILE__, '.php').'.xml';
         $repoRootDir    = dirname(dirname(dirname(__DIR__)));
 
@@ -73,21 +73,23 @@
         $config        = new Config("--standard={$this->standard}");
         $this->ruleset = new Ruleset($config);
 
-    }//end setUp()
+    }//end initializeConfigAndRuleset()
 
 
     /**
      * Reset ruleset file.
      *
+     * @after
+     *
      * @return void
      */
-    public function tearDown()
+    public function resetRuleset()
     {
         if (DIRECTORY_SEPARATOR !== '/') {
             file_put_contents($this->standard, $this->contents);
         }
 
-    }//end tearDown()
+    }//end resetRuleset()
 
 
     /**
@@ -99,7 +101,6 @@
     public function testWindowsStylePathRuleInclusion()
     {
         // Test that the sniff is correctly registered.
-        $this->assertObjectHasAttribute('sniffCodes', $this->ruleset);
         $this->assertCount(1, $this->ruleset->sniffCodes);
         $this->assertArrayHasKey('Generic.Formatting.SpaceAfterCast', $this->ruleset->sniffCodes);
         $this->assertSame(

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionAbsoluteWindowsTest.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionTest-include.xml Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Ruleset;
@@ -12,7 +12,13 @@
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Ruleset;
 use PHPUnit\Framework\TestCase;
+use ReflectionObject;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Ruleset class.
+ *
+ * @covers \PHP_CodeSniffer\Ruleset
+ */
 class RuleInclusionTest extends TestCase
 {
 
@@ -39,34 +45,14 @@
 
 
     /**
-     * Initialize the test.
-     *
-     * @return void
-     */
-    public function setUp()
-    {
-        if ($GLOBALS'PHP_CODESNIFFER_PEAR' === true) {
-            // PEAR installs test and sniff files into different locations
-            // so these tests will not pass as they directly reference files
-            // by relative location.
-            $this->markTestSkipped('Test cannot run from a PEAR install');
-        }
-
-    }//end setUp()
-
-
-    /**
      * Initialize the config and ruleset objects based on the `RuleInclusionTest.xml` ruleset file.
      *
+     * @beforeClass
+     *
      * @return void
      */
-    public static function setUpBeforeClass()
+    public static function initializeConfigAndRuleset()
     {
-        if ($GLOBALS'PHP_CODESNIFFER_PEAR' === true) {
-            // This test will be skipped.
-            return;
-        }
-
         $standard       = __DIR__.'/'.basename(__FILE__, '.php').'.xml';
         self::$standard = $standard;
 
@@ -91,19 +77,21 @@
         $config        = new Config("--standard=$standard");
         self::$ruleset = new Ruleset($config);
 
-    }//end setUpBeforeClass()
+    }//end initializeConfigAndRuleset()
 
 
     /**
      * Reset ruleset file.
      *
+     * @after
+     *
      * @return void
      */
-    public function tearDown()
+    public function resetRuleset()
     {
         file_put_contents(self::$standard, self::$contents);
 
-    }//end tearDown()
+    }//end resetRuleset()
 
 
     /**
@@ -113,14 +101,13 @@
      */
     public function testHasSniffCodes()
     {
-        $this->assertObjectHasAttribute('sniffCodes', self::$ruleset);
-        $this->assertCount(14, self::$ruleset->sniffCodes);
+        $this->assertCount(48, self::$ruleset->sniffCodes);
 
     }//end testHasSniffCodes()
 
 
     /**
-     * Test that sniffs are correctly registered, independently on the syntax used to include the sniff.
+     * Test that sniffs are correctly registered, independently of the syntax used to include the sniff.
      *
      * @param string $key   Expected array key.
      * @param string $value Expected array value.
@@ -148,6 +135,54 @@
     {
         return 
             
+                'PSR2.Classes.ClassDeclaration',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\ClassDeclarationSniff',
+            ,
+            
+                'PSR2.Classes.PropertyDeclaration',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\PropertyDeclarationSniff',
+            ,
+            
+                'PSR2.ControlStructures.ControlStructureSpacing',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ControlStructureSpacingSniff',
+            ,
+            
+                'PSR2.ControlStructures.ElseIfDeclaration',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ElseIfDeclarationSniff',
+            ,
+            
+                'PSR2.ControlStructures.SwitchDeclaration',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\SwitchDeclarationSniff',
+            ,
+            
+                'PSR2.Files.ClosingTag',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Files\ClosingTagSniff',
+            ,
+            
+                'PSR2.Files.EndFileNewline',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Files\EndFileNewlineSniff',
+            ,
+            
+                'PSR2.Methods.FunctionCallSignature',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff',
+            ,
+            
+                'PSR2.Methods.FunctionClosingBrace',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionClosingBraceSniff',
+            ,
+            
+                'PSR2.Methods.MethodDeclaration',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\MethodDeclarationSniff',
+            ,
+            
+                'PSR2.Namespaces.NamespaceDeclaration',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Namespaces\NamespaceDeclarationSniff',
+            ,
+            
+                'PSR2.Namespaces.UseDeclaration',
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Namespaces\UseDeclarationSniff',
+            ,
+            
                 'PSR1.Classes.ClassDeclaration',
                 'PHP_CodeSniffer\Standards\PSR1\Sniffs\Classes\ClassDeclarationSniff',
             ,
@@ -180,8 +215,100 @@
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\UpperCaseConstantNameSniff',
             ,
             
-                'Zend.NamingConventions.ValidVariableName',
-                'PHP_CodeSniffer\Standards\Zend\Sniffs\NamingConventions\ValidVariableNameSniff',
+                'Generic.Files.LineEndings',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineEndingsSniff',
+            ,
+            
+                'Generic.Files.LineLength',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff',
+            ,
+            
+                'Squiz.WhiteSpace.SuperfluousWhitespace',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\SuperfluousWhitespaceSniff',
+            ,
+            
+                'Generic.Formatting.DisallowMultipleStatements',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\DisallowMultipleStatementsSniff',
+            ,
+            
+                'Generic.WhiteSpace.ScopeIndent',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\ScopeIndentSniff',
+            ,
+            
+                'Generic.WhiteSpace.DisallowTabIndent',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\DisallowTabIndentSniff',
+            ,
+            
+                'Generic.PHP.LowerCaseKeyword',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\LowerCaseKeywordSniff',
+            ,
+            
+                'Generic.PHP.LowerCaseConstant',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\PHP\LowerCaseConstantSniff',
+            ,
+            
+                'Squiz.Scope.MethodScope',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\Scope\MethodScopeSniff',
+            ,
+            
+                'Squiz.WhiteSpace.ScopeKeywordSpacing',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ScopeKeywordSpacingSniff',
+            ,
+            
+                'Squiz.Functions.FunctionDeclaration',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\FunctionDeclarationSniff',
+            ,
+            
+                'Squiz.Functions.LowercaseFunctionKeywords',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\LowercaseFunctionKeywordsSniff',
+            ,
+            
+                'Squiz.Functions.FunctionDeclarationArgumentSpacing',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\FunctionDeclarationArgumentSpacingSniff',
+            ,
+            
+                'PEAR.Functions.ValidDefaultValue',
+                'PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions\ValidDefaultValueSniff',
+            ,
+            
+                'Squiz.Functions.MultiLineFunctionDeclaration',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\Functions\MultiLineFunctionDeclarationSniff',
+            ,
+            
+                'Generic.Functions.FunctionCallArgumentSpacing',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\Functions\FunctionCallArgumentSpacingSniff',
+            ,
+            
+                'Squiz.ControlStructures.ControlSignature',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ControlSignatureSniff',
+            ,
+            
+                'Squiz.WhiteSpace.ControlStructureSpacing',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ControlStructureSpacingSniff',
+            ,
+            
+                'Squiz.WhiteSpace.ScopeClosingBrace',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\ScopeClosingBraceSniff',
+            ,
+            
+                'Squiz.ControlStructures.ForEachLoopDeclaration',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ForEachLoopDeclarationSniff',
+            ,
+            
+                'Squiz.ControlStructures.ForLoopDeclaration',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\ForLoopDeclarationSniff',
+            ,
+            
+                'Squiz.ControlStructures.LowercaseDeclaration',
+                'PHP_CodeSniffer\Standards\Squiz\Sniffs\ControlStructures\LowercaseDeclarationSniff',
+            ,
+            
+                'Generic.ControlStructures.InlineControlStructure',
+                'PHP_CodeSniffer\Standards\Generic\Sniffs\ControlStructures\InlineControlStructureSniff',
+            ,
+            
+                'PSR12.Operators.OperatorSpacing',
+                'PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff',
             ,
             
                 'Generic.Arrays.ArrayIndent',
@@ -192,10 +319,6 @@
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\CyclomaticComplexitySniff',
             ,
             
-                'Generic.Files.LineLength',
-                'PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff',
-            ,
-            
                 'Generic.NamingConventions.CamelCapsFunctionName',
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\CamelCapsFunctionNameSniff',
             ,
@@ -222,9 +345,11 @@
      */
     public function testSettingProperties($sniffClass, $propertyName, $expectedValue)
     {
-        $this->assertObjectHasAttribute('sniffs', self::$ruleset);
         $this->assertArrayHasKey($sniffClass, self::$ruleset->sniffs);
-        $this->assertObjectHasAttribute($propertyName, self::$ruleset->sniffs$sniffClass);
+
+        $hasProperty = (new ReflectionObject(self::$ruleset->sniffs$sniffClass))->hasProperty($propertyName);
+        $errorMsg    = sprintf('Property %s does not exist on sniff class %s', $propertyName, $sniffClass);
+        $this->assertTrue($hasProperty, $errorMsg);
 
         $actualValue = self::$ruleset->sniffs$sniffClass->$propertyName;
         $this->assertSame($expectedValue, $actualValue);
@@ -242,49 +367,54 @@
     public function dataSettingProperties()
     {
         return 
-            'ClassDeclarationSniff'                           => 
-                'PHP_CodeSniffer\Standards\PSR1\Sniffs\Classes\ClassDeclarationSniff',
-                'setforallsniffs',
-                true,
+            'Set property for complete standard: PSR2 ClassDeclaration'                                  => 
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\ClassDeclarationSniff',
+                'indent',
+                '20',
             ,
-            'SideEffectsSniff'                                => 
-                'PHP_CodeSniffer\Standards\PSR1\Sniffs\Files\SideEffectsSniff',
-                'setforallsniffs',
-                true,
+            'Set property for complete standard: PSR2 SwitchDeclaration'                                 => 
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\SwitchDeclarationSniff',
+                'indent',
+                '20',
             ,
-            'ValidVariableNameSniff'                          => 
-                'PHP_CodeSniffer\Standards\Zend\Sniffs\NamingConventions\ValidVariableNameSniff',
-                'setforallincategory',
-                true,
+            'Set property for complete standard: PSR2 FunctionCallSignature'                             => 
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff',
+                'indent',
+                '20',
+            ,
+            'Set property for complete category: PSR12 OperatorSpacing'                                  => 
+                'PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff',
+                'ignoreSpacingBeforeAssignments',
+                false,
             ,
-            'ArrayIndentSniff'                                => 
+            'Set property for individual sniff: Generic ArrayIndent'                                     => 
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays\ArrayIndentSniff',
                 'indent',
                 '2',
             ,
-            'LineLengthSniff'                                 => 
+            'Set property for individual sniff using sniff file inclusion: Generic LineLength'           => 
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff',
                 'lineLimit',
                 '10',
             ,
-            'CamelCapsFunctionNameSniff'                      => 
+            'Set property for individual sniff using sniff file inclusion: CamelCapsFunctionName'        => 
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\CamelCapsFunctionNameSniff',
                 'strict',
                 false,
             ,
-            'NestingLevelSniff-nestingLevel'                  => 
+            'Set property for individual sniff via included ruleset: NestingLevel - nestingLevel'        => 
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff',
                 'nestingLevel',
                 '2',
             ,
-            'NestingLevelSniff-setforsniffsinincludedruleset' => 
+            'Set property for all sniffs in an included ruleset: NestingLevel - absoluteNestingLevel'    => 
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\NestingLevelSniff',
-                'setforsniffsinincludedruleset',
+                'absoluteNestingLevel',
                 true,
             ,
 
             // Testing that setting a property at error code level does *not* work.
-            'CyclomaticComplexitySniff'                       => 
+            'Set property for error code will not change the sniff property value: CyclomaticComplexity' => 
                 'PHP_CodeSniffer\Standards\Generic\Sniffs\Metrics\CyclomaticComplexitySniff',
                 'complexity',
                 10,
@@ -294,4 +424,55 @@
     }//end dataSettingProperties()
 
 
+    /**
+     * Test that setting properties for standards, categories on sniffs which don't support the property will
+     * silently ignore the property and not set it.
+     *
+     * @param string $sniffClass   The name of the sniff class.
+     * @param string $propertyName The name of the property which should not be set.
+     *
+     * @dataProvider dataSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails
+     *
+     * @return void
+     */
+    public function testSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails($sniffClass, $propertyName)
+    {
+        $this->assertArrayHasKey($sniffClass, self::$ruleset->sniffs, 'Sniff class '.$sniffClass.' not listed in registered sniffs');
+
+        $sniffObject = self::$ruleset->sniffs$sniffClass;
+
+        $hasProperty = (new ReflectionObject(self::$ruleset->sniffs$sniffClass))->hasProperty($propertyName);
+        $errorMsg    = sprintf('Property %s registered for sniff %s which does not support it', $propertyName, $sniffClass);
+        $this->assertFalse($hasProperty, $errorMsg);
+
+    }//end testSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
+
+
+    /**
+     * Data provider.
+     *
+     * @see self::testSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
+     *
+     * @return array
+     */
+    public function dataSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
+    {
+        return 
+            'Set property for complete standard: PSR2 ClassDeclaration'      => 
+                'PHP_CodeSniffer\Standards\PSR1\Sniffs\Classes\ClassDeclarationSniff',
+                'setforallsniffs',
+            ,
+            'Set property for complete standard: PSR2 FunctionCallSignature' => 
+                'PHP_CodeSniffer\Standards\PSR2\Sniffs\Methods\FunctionCallSignatureSniff',
+                'setforallsniffs',
+            ,
+            'Set property for complete category: PSR12 OperatorSpacing'      => 
+                'PHP_CodeSniffer\Standards\PSR12\Sniffs\Operators\OperatorSpacingSniff',
+                'setforallincategory',
+            ,
+        ;
+
+    }//end dataSettingInvalidPropertiesOnStandardsAndCategoriesSilentlyFails()
+
+
 }//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/RuleInclusionTest.xml Changed

@@ -1,15 +1,17 @@
 <?xml version="1.0"?>
 <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="RuleInclusionTest" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
 
-    <rule ref="PSR1">
+    <rule ref="PSR2">
         <properties>
             <property name="setforallsniffs" value="true" />
+            <property name="indent" value="20" />
         </properties>
     </rule>
 
-    <rule ref="Zend.NamingConventions">
+    <rule ref="PSR12.Operators">
         <properties>
             <property name="setforallincategory" value="true" />
+            <property name="ignoreSpacingBeforeAssignments" value="false" />
         </properties>
     </rule>
 
@@ -38,8 +40,9 @@
     </rule>
 
     <rule ref="./RuleInclusionTest-include.xml">
+        
         <properties>
-            <property name="setforsniffsinincludedruleset" value="true" />
+            <property name="absoluteNestingLevel" value="true" />
         </properties>
     </rule>

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyAllowedAsDeclaredTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyAllowedViaMagicMethodTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyAllowedViaStdClassTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyAppliesPropertyToMultipleSniffsInCategoryTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategoryTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandardTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyNotAllowedViaAttributeTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetPropertyThrowsErrorOnInvalidPropertyTest.xml Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Ruleset/SetSniffPropertyTest.php Added

@@ -0,0 +1,399 @@
+<?php
+/**
+ * Tests for the handling of properties being set via the ruleset.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2022 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Ruleset;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Ruleset;
+use PHPUnit\Framework\TestCase;
+use ReflectionObject;
+
+/**
+ * These tests specifically focus on the changes made to work around the PHP 8.2 dynamic properties deprecation.
+ *
+ * @covers \PHP_CodeSniffer\Ruleset::setSniffProperty
+ */
+class SetSniffPropertyTest extends TestCase
+{
+
+
+    /**
+     * Test that setting a property via the ruleset works in all situations which allow for it.
+     *
+     * @param string $name Name of the test. Used for the sniff name, the ruleset file name etc.
+     *
+     * @dataProvider dataSniffPropertiesGetSetWhenAllowed
+     *
+     * @return void
+     */
+    public function testSniffPropertiesGetSetWhenAllowed($name)
+    {
+        $sniffCode  = "Fixtures.Category.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+        $properties = 
+            'arbitrarystring' => 'arbitraryvalue',
+            'arbitraryarray'  => 
+                'mykey'    => 'myvalue',
+                'otherkey' => 'othervalue',
+            ,
+        ;
+
+        // Set up the ruleset.
+        $standard = __DIR__."/{$name}Test.xml";
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        // Verify that the sniff has been registered.
+        $this->assertGreaterThan(0, count($ruleset->sniffCodes), 'No sniff codes registered');
+
+        // Verify that our target sniff has been registered.
+        $this->assertArrayHasKey($sniffCode, $ruleset->sniffCodes, 'Target sniff not registered');
+        $this->assertSame($sniffClass, $ruleset->sniffCodes$sniffCode, 'Target sniff not registered with the correct class');
+
+        // Test that the property as declared in the ruleset has been set on the sniff.
+        $this->assertArrayHasKey($sniffClass, $ruleset->sniffs, 'Sniff class not listed in registered sniffs');
+
+        $sniffObject = $ruleset->sniffs$sniffClass;
+        foreach ($properties as $name => $expectedValue) {
+            $this->assertSame($expectedValue, $sniffObject->$name, 'Property value not set to expected value');
+        }
+
+    }//end testSniffPropertiesGetSetWhenAllowed()
+
+
+    /**
+     * Data provider.
+     *
+     * @see self::testSniffPropertiesGetSetWhenAllowed()
+     *
+     * @return array
+     */
+    public function dataSniffPropertiesGetSetWhenAllowed()
+    {
+        return 
+            'Property allowed as explicitly declared'            => 'SetPropertyAllowedAsDeclared',
+            'Property allowed as sniff extends stdClass'         => 'SetPropertyAllowedViaStdClass',
+            'Property allowed as sniff has magic __set() method' => 'SetPropertyAllowedViaMagicMethod',
+        ;
+
+    }//end dataSniffPropertiesGetSetWhenAllowed()
+
+
+    /**
+     * Test that setting a property for a category will apply it correctly to those sniffs which support the
+     * property, but won't apply it to sniffs which don't.
+     *
+     * Note: this test intentionally uses the `PEAR.Functions` category as two sniffs in that category
+     * have a public property with the same name (`indent`) and one sniff doesn't, which makes it a great
+     * test case for this.
+     *
+     * @return void
+     */
+    public function testSetPropertyAppliesPropertyToMultipleSniffsInCategory()
+    {
+        $propertyName  = 'indent';
+        $expectedValue = '10';
+
+        // Set up the ruleset.
+        $standard = __DIR__.'/SetPropertyAppliesPropertyToMultipleSniffsInCategoryTest.xml';
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        // Test that the two sniffs which support the property have received the value.
+        $sniffClass = 'PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions\FunctionCallSignatureSniff';
+        $this->assertArrayHasKey($sniffClass, $ruleset->sniffs, 'Sniff class '.$sniffClass.' not listed in registered sniffs');
+        $sniffObject = $ruleset->sniffs$sniffClass;
+        $this->assertSame($expectedValue, $sniffObject->$propertyName, 'Property value not set to expected value for '.$sniffClass);
+
+        $sniffClass = 'PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions\FunctionDeclarationSniff';
+        $this->assertArrayHasKey($sniffClass, $ruleset->sniffs, 'Sniff class '.$sniffClass.' not listed in registered sniffs');
+        $sniffObject = $ruleset->sniffs$sniffClass;
+        $this->assertSame($expectedValue, $sniffObject->$propertyName, 'Property value not set to expected value for '.$sniffClass);
+
+        // Test that the property doesn't get set for the one sniff which doesn't support the property.
+        $sniffClass = 'PHP_CodeSniffer\Standards\PEAR\Sniffs\Functions\ValidDefaultValueSniff';
+        $this->assertArrayHasKey($sniffClass, $ruleset->sniffs, 'Sniff class '.$sniffClass.' not listed in registered sniffs');
+
+        $hasProperty = (new ReflectionObject($ruleset->sniffs$sniffClass))->hasProperty($propertyName);
+        $errorMsg    = sprintf('Property %s registered for sniff %s which does not support it', $propertyName, $sniffClass);
+        $this->assertFalse($hasProperty, $errorMsg);
+
+    }//end testSetPropertyAppliesPropertyToMultipleSniffsInCategory()
+
+
+    /**
+     * Test that attempting to set a non-existent property directly on a sniff will throw an error
+     * when the sniff does not explicitly declare the property, extends stdClass or has magic methods.
+     *
+     * @return void
+     */
+    public function testSetPropertyThrowsErrorOnInvalidProperty()
+    {
+        $exceptionClass = 'PHP_CodeSniffer\Exceptions\RuntimeException';
+        $exceptionMsg   = 'Ruleset invalid. Property "indentation" does not exist on sniff Generic.Arrays.ArrayIndent';
+        if (method_exists($this, 'expectException') === true) {
+            $this->expectException($exceptionClass);
+            $this->expectExceptionMessage($exceptionMsg);
+        } else {
+            // PHPUnit < 5.2.0.
+            $this->setExpectedException($exceptionClass, $exceptionMsg);
+        }
+
+        // Set up the ruleset.
+        $standard = __DIR__.'/SetPropertyThrowsErrorOnInvalidPropertyTest.xml';
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+    }//end testSetPropertyThrowsErrorOnInvalidProperty()
+
+
+    /**
+     * Test that attempting to set a non-existent property directly on a sniff will throw an error
+     * when the sniff does not explicitly declare the property, extends stdClass or has magic methods,
+     * even though the sniff has the PHP 8.2 `#AllowDynamicProperties` attribute set.
+     *
+     * @return void
+     */
+    public function testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute()
+    {
+        $exceptionClass = 'PHP_CodeSniffer\Exceptions\RuntimeException';
+        $exceptionMsg   = 'Ruleset invalid. Property "arbitrarystring" does not exist on sniff Fixtures.Category.SetPropertyNotAllowedViaAttribute';
+        if (method_exists($this, 'expectException') === true) {
+            $this->expectException($exceptionClass);
+            $this->expectExceptionMessage($exceptionMsg);
+        } else {
+            // PHPUnit < 5.2.0.
+            $this->setExpectedException($exceptionClass, $exceptionMsg);
+        }
+
+        // Set up the ruleset.
+        $standard = __DIR__.'/SetPropertyNotAllowedViaAttributeTest.xml';
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+    }//end testSetPropertyThrowsErrorWhenPropertyOnlyAllowedViaAttribute()
+
+
+    /**
+     * Test that attempting to set a non-existent property on a sniff when the property directive is
+     * for the whole standard, does not yield an error.
+     *
+     * @doesNotPerformAssertions
+     *
+     * @return void
+     */
+    public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandard()
+    {
+        // Set up the ruleset.
+        $standard = __DIR__.'/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandardTest.xml';
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+    }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForStandard()
+
+
+    /**
+     * Test that attempting to set a non-existent property on a sniff when the property directive is
+     * for a whole category, does not yield an error.
+     *
+     * @doesNotPerformAssertions
+     *
+     * @return void
+     */
+    public function testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategory()
+    {
+        // Set up the ruleset.
+        $standard = __DIR__.'/SetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategoryTest.xml';
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+    }//end testSetPropertyDoesNotThrowErrorOnInvalidPropertyWhenSetForCategory()
+
+
+    /**
+     * Test that setting a property via a direct call to the Ruleset::setSniffProperty() method
+     * sets the property correctly when using the new $settings array format.
+     *
+     * @return void
+     */
+    public function testDirectCallWithNewArrayFormatSetsProperty()
+    {
+        $name       = 'SetPropertyAllowedAsDeclared';
+        $sniffCode  = "Fixtures.Category.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+
+        // Set up the ruleset.
+        $standard = __DIR__."/{$name}Test.xml";
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        $propertyName  = 'arbitrarystring';
+        $propertyValue = 'new value';
+
+        $ruleset->setSniffProperty(
+            $sniffClass,
+            $propertyName,
+            
+                'scope' => 'sniff',
+                'value' => $propertyValue,
+            
+        );
+
+        // Verify that the sniff has been registered.
+        $this->assertGreaterThan(0, count($ruleset->sniffCodes), 'No sniff codes registered');
+
+        // Verify that our target sniff has been registered.
+        $this->assertArrayHasKey($sniffCode, $ruleset->sniffCodes, 'Target sniff not registered');
+        $this->assertSame($sniffClass, $ruleset->sniffCodes$sniffCode, 'Target sniff not registered with the correct class');
+
+        // Test that the property as declared in the ruleset has been set on the sniff.
+        $this->assertArrayHasKey($sniffClass, $ruleset->sniffs, 'Sniff class not listed in registered sniffs');
+
+        $sniffObject = $ruleset->sniffs$sniffClass;
+        $this->assertSame($propertyValue, $sniffObject->$propertyName, 'Property value not set to expected value');
+
+    }//end testDirectCallWithNewArrayFormatSetsProperty()
+
+
+    /**
+     * Test that setting a property via a direct call to the Ruleset::setSniffProperty() method
+     * sets the property correctly when using the old $settings array format.
+     *
+     * Tested by silencing the deprecation notice as otherwise the test would fail on the deprecation notice.
+     *
+     * @param mixed $propertyValue Value for the property to set.
+     *
+     * @dataProvider dataDirectCallWithOldArrayFormatSetsProperty
+     *
+     * @return void
+     */
+    public function testDirectCallWithOldArrayFormatSetsProperty($propertyValue)
+    {
+        $name       = 'SetPropertyAllowedAsDeclared';
+        $sniffCode  = "Fixtures.Category.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+
+        // Set up the ruleset.
+        $standard = __DIR__."/{$name}Test.xml";
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        $propertyName = 'arbitrarystring';
+
+        @$ruleset->setSniffProperty(
+            $sniffClass,
+            $propertyName,
+            $propertyValue
+        );
+
+        // Verify that the sniff has been registered.
+        $this->assertGreaterThan(0, count($ruleset->sniffCodes), 'No sniff codes registered');
+
+        // Verify that our target sniff has been registered.
+        $this->assertArrayHasKey($sniffCode, $ruleset->sniffCodes, 'Target sniff not registered');
+        $this->assertSame($sniffClass, $ruleset->sniffCodes$sniffCode, 'Target sniff not registered with the correct class');
+
+        // Test that the property as declared in the ruleset has been set on the sniff.
+        $this->assertArrayHasKey($sniffClass, $ruleset->sniffs, 'Sniff class not listed in registered sniffs');
+
+        $sniffObject = $ruleset->sniffs$sniffClass;
+        $this->assertSame($propertyValue, $sniffObject->$propertyName, 'Property value not set to expected value');
+
+    }//end testDirectCallWithOldArrayFormatSetsProperty()
+
+
+    /**
+     * Data provider.
+     *
+     * @see self::testDirectCallWithOldArrayFormatSetsProperty()
+     *
+     * @return array
+     */
+    public function dataDirectCallWithOldArrayFormatSetsProperty()
+    {
+        return 
+            'Property value is not an array (boolean)'                       => false,
+            'Property value is not an array (string)'                        => 'a string',
+            'Property value is an empty array'                               => ,
+            'Property value is an array without keys'                        => 
+                
+                    'value',
+                    false,
+                ,
+            ,
+            'Property value is an array without the "scope" or "value" keys' => 
+                
+                    'key1' => 'value',
+                    'key2' => false,
+                ,
+            ,
+            'Property value is an array without the "scope" key'             => 
+                
+                    'key1'  => 'value',
+                    'value' => true,
+                ,
+            ,
+            'Property value is an array without the "value" key'             => 
+                
+                    'scope' => 'value',
+                    'key2'  => 1234,
+                ,
+            ,
+        ;
+
+    }//end dataDirectCallWithOldArrayFormatSetsProperty()
+
+
+    /**
+     * Test that setting a property via a direct call to the Ruleset::setSniffProperty() method
+     * throws a deprecation notice when using the old $settings array format.
+     *
+     * Note: as PHPUnit stops as soon as it sees the deprecation notice, the setting of the property
+     * value is not tested here.
+     *
+     * @return void
+     */
+    public function testDirectCallWithOldArrayFormatThrowsDeprecationNotice()
+    {
+        $exceptionClass = 'PHPUnit\Framework\Error\Deprecated';
+        if (class_exists($exceptionClass) === false) {
+            $exceptionClass = 'PHPUnit_Framework_Error_Deprecated';
+        }
+
+        $exceptionMsg = 'the format of the $settings parameter has changed from (mixed) $value to array(\'scope\' => \'sniff|standard\', \'value\' => $value). Please update your integration code. See PR #3629 for more information.';
+
+        if (method_exists($this, 'expectException') === true) {
+            $this->expectException($exceptionClass);
+            $this->expectExceptionMessage($exceptionMsg);
+        } else {
+            // PHPUnit < 5.2.0.
+            $this->setExpectedException($exceptionClass, $exceptionMsg);
+        }
+
+        $name       = 'SetPropertyAllowedAsDeclared';
+        $sniffCode  = "Fixtures.Category.{$name}";
+        $sniffClass = 'Fixtures\Sniffs\Category\\'.$name.'Sniff';
+
+        // Set up the ruleset.
+        $standard = __DIR__."/{$name}Test.xml";
+        $config   = new Config("--standard=$standard");
+        $ruleset  = new Ruleset($config);
+
+        $propertyName = 'arbitrarystring';
+
+        $ruleset->setSniffProperty(
+            $sniffClass,
+            'arbitrarystring',
+            'key' => 'value'
+        );
+
+    }//end testDirectCallWithOldArrayFormatThrowsDeprecationNotice()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Sniffs/AbstractArraySniffTest.php Changed

@@ -4,13 +4,18 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2020 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Sniffs;
 
 use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
 
+/**
+ * Tests for the \PHP_CodeSniffer\Sniffs\AbstractArraySniff.
+ *
+ * @covers \PHP_CodeSniffer\Sniffs\AbstractArraySniff
+ */
 class AbstractArraySniffTest extends AbstractMethodUnitTest
 {
 
@@ -31,14 +36,16 @@
      * The test case file for a unit test class has to be in the same directory
      * directory and use the same file name as the test class, using the .inc extension.
      *
+     * @beforeClass
+     *
      * @return void
      */
-    public static function setUpBeforeClass()
+    public static function initializeFile()
     {
         self::$sniff = new AbstractArraySniffTestable();
-        parent::setUpBeforeClass();
+        parent::initializeFile();
 
-    }//end setUpBeforeClass()
+    }//end initializeFile()
 
 
     /**

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Sniffs/AbstractArraySniffTestable.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/AnonClassParenthesisOwnerTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ArrayKeywordTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/AttributesTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillEnumTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillExplicitOctalNotationTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillExplicitOctalNotationTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillFnTokenTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillMatchTokenTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillNumericSeparatorTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillReadonlyTest.inc Changed

@@ -49,9 +49,7 @@
     public ReAdOnLy string $caseInsensitiveProperty;
 
     /* testReadonlyConstructorPropertyPromotion */
-    public function __construct(private readonly bool $constructorPropertyPromotion)
-    {
-    }
+    public function __construct(private readonly bool $constructorPropertyPromotion) {}
 
     /* testReadonlyConstructorPropertyPromotionWithReference */
     public function __construct(private ReadOnly bool &$constructorPropertyPromotion) {}
@@ -68,8 +66,6 @@
 
     /* testReadonlyUsedAsMethodName */
     public function readonly() {
-        // Do something.
-
         /* testReadonlyUsedAsPropertyName */
         $this->readonly = 'foo';
 
@@ -79,9 +75,10 @@
 }
 
 /* testReadonlyUsedAsFunctionName */
-function readonly()
-{
-}
+function readonly() {}
+
+/* testReadonlyUsedAsFunctionNameWithReturnByRef */
+function &readonly() {}
 
 /* testReadonlyUsedAsNamespaceName */
 namespace Readonly;
@@ -89,12 +86,58 @@
 namespace My\Readonly\Collection;
 /* testReadonlyAsFunctionCall */
 $var = readonly($a, $b);
+/* testReadonlyAsNamespacedFunctionCall */
+$var = My\NS\readonly($a, $b);
+/* testReadonlyAsNamespaceRelativeFunctionCall */
+$var = namespace\ReadOnly($a, $b);
+/* testReadonlyAsMethodCall */
+$var = $obj->readonly($a, $b);
+/* testReadonlyAsNullsafeMethodCall */
+$var = $obj?->readOnly($a, $b);
+/* testReadonlyAsStaticMethodCallWithSpace */
+$var = ClassName::readonly ($a, $b);
 /* testClassConstantFetchWithReadonlyAsConstantName */
 echo ClassName::READONLY;
 
 /* testReadonlyUsedAsFunctionCallWithSpaceBetweenKeywordAndParens */
 $var = readonly /* comment */ ();
 
+// These test cases are inspired by
+// https://github.com/php/php-src/commit/08b75395838b4b42a41e3c70684fa6c6b113eee0
+class ReadonlyWithDisjunctiveNormalForm
+{
+    /* testReadonlyPropertyDNFTypeUnqualified */
+    readonly (B&C)|A $h;
+
+    /* testReadonlyPropertyDNFTypeFullyQualified */
+    public readonly (\Fully\Qualified\B&\Full\C)|\Foo\Bar $j;
+
+    /* testReadonlyPropertyDNFTypePartiallyQualified */
+    protected readonly (Partially\Qualified&C)|A $l;
+
+    /* testReadonlyPropertyDNFTypeRelativeName */
+    private readonly (namespace\Relative&C)|A $n;
+
+    /* testReadonlyPropertyDNFTypeMultipleSets */
+    private readonly (A&C)|(B&C)|(C&D) $m;
+
+    /* testReadonlyPropertyDNFTypeWithArray */
+    private readonly (B & C)|array $o;
+
+    /* testReadonlyPropertyDNFTypeWithSpacesAndComments */
+    private readonly ( B & C /*something*/) | A $q;
+
+    public function __construct(
+        /* testReadonlyConstructorPropertyPromotionWithDNF */
+        private readonly (B&C)|A $b1,
+        /* testReadonlyConstructorPropertyPromotionWithDNFAndRefence */
+        readonly (B&C)|A &$b2,
+    ) {}
+
+    /* testReadonlyUsedAsMethodNameWithDNFParam */
+    public function readonly (A&B $param): void {}
+}
+
 /* testParseErrorLiveCoding */
 // This must be the last test in the file.
 readonly

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BackfillReadonlyTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Jaroslav Hanslík <kukulich@kukulich.cz>
  * @copyright 2021 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
@@ -148,7 +148,39 @@
                 'readonly',
             ,
             
-                '/* testReadonlyUsedAsFunctionCallWithSpaceBetweenKeywordAndParens */',
+                '/* testReadonlyPropertyDNFTypeUnqualified */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyPropertyDNFTypeFullyQualified */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyPropertyDNFTypePartiallyQualified */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyPropertyDNFTypeRelativeName */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyPropertyDNFTypeMultipleSets */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyPropertyDNFTypeWithArray */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyPropertyDNFTypeWithSpacesAndComments */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyConstructorPropertyPromotionWithDNF */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyConstructorPropertyPromotionWithDNFAndRefence */',
                 'readonly',
             ,
             
@@ -213,6 +245,10 @@
                 'readonly',
             ,
             
+                '/* testReadonlyUsedAsFunctionNameWithReturnByRef */',
+                'readonly',
+            ,
+            
                 '/* testReadonlyUsedAsNamespaceName */',
                 'Readonly',
             ,
@@ -225,9 +261,37 @@
                 'readonly',
             ,
             
+                '/* testReadonlyAsNamespacedFunctionCall */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyAsNamespaceRelativeFunctionCall */',
+                'ReadOnly',
+            ,
+            
+                '/* testReadonlyAsMethodCall */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyAsNullsafeMethodCall */',
+                'readOnly',
+            ,
+            
+                '/* testReadonlyAsStaticMethodCallWithSpace */',
+                'readonly',
+            ,
+            
                 '/* testClassConstantFetchWithReadonlyAsConstantName */',
                 'READONLY',
             ,
+            
+                '/* testReadonlyUsedAsFunctionCallWithSpaceBetweenKeywordAndParens */',
+                'readonly',
+            ,
+            
+                '/* testReadonlyUsedAsMethodNameWithDNFParam */',
+                'readonly',
+            ,
         ;
 
     }//end dataNotReadonly()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BitwiseOrTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/BitwiseOrTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
@@ -110,6 +110,7 @@
             '/* testTypeUnionPropertyWithStaticAndReadOnlyKeywords */',
             '/* testTypeUnionPropertyWithVarAndReadOnlyKeywords */',
             '/* testTypeUnionPropertyWithOnlyReadOnlyKeyword */',
+            '/* testTypeUnionPropertyWithOnlyStaticKeyword */',
             '/* testTypeUnionParam1 */',
             '/* testTypeUnionParam2 */',
             '/* testTypeUnionParam3 */',
@@ -130,6 +131,9 @@
             '/* testTypeUnionArrowParam */',
             '/* testTypeUnionArrowReturnType */',
             '/* testTypeUnionNonArrowFunctionDeclaration */',
+            '/* testTypeUnionPHP82TrueFirst */',
+            '/* testTypeUnionPHP82TrueMiddle */',
+            '/* testTypeUnionPHP82TrueLast */',
         ;
 
     }//end dataTypeUnion()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.inc Changed

@@ -1,227 +1,264 @@
-<?php
-
-/* testNamespaceIsKeyword */
-namespace SomeNamespace;
-
-class ContextSensitiveKeywords
-{
-    const /* testAbstract */ ABSTRACT = 'ABSTRACT';
-    const /* testArray */ ARRAY = 'ARRAY';
-    const /* testAs */ AS = 'AS';
-    const /* testBreak */ BREAK = 'BREAK';
-    const /* testCallable */ CALLABLE = 'CALLABLE';
-    const /* testCase */ CASE = 'CASE';
-    const /* testCatch */ CATCH = 'CATCH';
-    const /* testClass */ CLASS = 'CLASS';
-    const /* testClone */ CLONE = 'CLONE';
-    const /* testConst */ CONST = 'CONST';
-    const /* testContinue */ CONTINUE = 'CONTINUE';
-    const /* testDeclare */ DECLARE = 'DECLARE';
-    const /* testDefault */ DEFAULT = 'DEFAULT';
-    const /* testDo */ DO = 'DO';
-    const /* testEcho */ ECHO = 'ECHO';
-    const /* testElse */ ELSE = 'ELSE';
-    const /* testElseIf */ ELSEIF = 'ELSEIF';
-    const /* testEmpty */ EMPTY = 'EMPTY';
-    const /* testEndDeclare */ ENDDECLARE = 'ENDDECLARE';
-    const /* testEndFor */ ENDFOR = 'ENDFOR';
-    const /* testEndForeach */ ENDFOREACH = 'ENDFOREACH';
-    const /* testEndIf */ ENDIF = 'ENDIF';
-    const /* testEndSwitch */ ENDSWITCH = 'ENDSWITCH';
-    const /* testEndWhile */ ENDWHILE = 'ENDWHILE';
-    const /* testEnum */ ENUM = 'ENUM';
-    const /* testEval */ EVAL = 'EVAL';
-    const /* testExit */ EXIT = 'EXIT';
-    const /* testExtends */ EXTENDS = 'EXTENDS';
-    const /* testFinal */ FINAL = 'FINAL';
-    const /* testFinally */ FINALLY = 'FINALLY';
-    const /* testFn */ FN = 'FN';
-    const /* testFor */ FOR = 'FOR';
-    const /* testForeach */ FOREACH = 'FOREACH';
-    const /* testFunction */ FUNCTION = 'FUNCTION';
-    const /* testGlobal */ GLOBAL = 'GLOBAL';
-    const /* testGoto */ GOTO = 'GOTO';
-    const /* testIf */ IF = 'IF';
-    const /* testImplements */ IMPLEMENTS = 'IMPLEMENTS';
-    const /* testInclude */ INCLUDE = 'INCLUDE';
-    const /* testIncludeOnce */ INCLUDE_ONCE = 'INCLUDE_ONCE';
-    const /* testInstanceOf */ INSTANCEOF = 'INSTANCEOF';
-    const /* testInsteadOf */ INSTEADOF = 'INSTEADOF';
-    const /* testInterface */ INTERFACE = 'INTERFACE';
-    const /* testIsset */ ISSET = 'ISSET';
-    const /* testList */ LIST = 'LIST';
-    const /* testMatch */ MATCH = 'MATCH';
-    const /* testNamespace */ NAMESPACE = 'NAMESPACE';
-    const /* testNew */ NEW = 'NEW';
-    const /* testParent */ PARENT = 'PARENT';
-    const /* testPrint */ PRINT = 'PRINT';
-    const /* testPrivate */ PRIVATE = 'PRIVATE';
-    const /* testProtected */ PROTECTED = 'PROTECTED';
-    const /* testPublic */ PUBLIC = 'PUBLIC';
-    const /* testReadonly */ READONLY = 'READONLY';
-    const /* testRequire */ REQUIRE = 'REQUIRE';
-    const /* testRequireOnce */ REQUIRE_ONCE = 'REQUIRE_ONCE';
-    const /* testReturn */ RETURN = 'RETURN';
-    const /* testSelf */ SELF = 'SELF';
-    const /* testStatic */ STATIC = 'STATIC';
-    const /* testSwitch */ SWITCH = 'SWITCH';
-    const /* testThrows */ THROW = 'THROW';
-    const /* testTrait */ TRAIT = 'TRAIT';
-    const /* testTry */ TRY = 'TRY';
-    const /* testUnset */ UNSET = 'UNSET';
-    const /* testUse */ USE = 'USE';
-    const /* testVar */ VAR = 'VAR';
-    const /* testWhile */ WHILE = 'WHILE';
-    const /* testYield */ YIELD = 'YIELD';
-    const /* testYieldFrom */ YIELD_FROM = 'YIELD_FROM';
-
-    const /* testAnd */ AND = 'LOGICAL_AND';
-    const /* testOr */ OR = 'LOGICAL_OR';
-    const /* testXor */ XOR = 'LOGICAL_XOR';
-}
-
-namespace /* testKeywordAfterNamespaceShouldBeString */ class;
-namespace /* testNamespaceNameIsString1 */ my\ /* testNamespaceNameIsString2 */ class\ /* testNamespaceNameIsString3 */ foreach;
-
-/* testAbstractIsKeyword */ abstract /* testClassIsKeyword */ class SomeClass
-    /* testExtendsIsKeyword */ extends SomeParent
-    /* testImplementsIsKeyword */ implements SomeInterface
-{
-    /* testUseIsKeyword */ use SomeTrait, OtherTrait {
-        SomeTrait::a /* testInsteadOfIsKeyword */ insteadof A;
-        OtherTrait::a /* testAsIsKeyword */ as B;
-    }
-
-    /* testConstIsKeyword */ const CONSTANT = 'c';
-
-    /* testPrivateIsKeyword */ private $private;
-    /* testProtectedIsKeyword */ protected $protected;
-    /* testPublicIsKeyword */ public $public;
-
-    /* testVarIsKeyword */ var $var;
-    /* testStaticIsKeyword */ static $static;
-
-    /* testReadonlyIsKeyword */ readonly $readonly;
-
-    /* testFinalIsKeyword */ final /* testFunctionIsKeyword */ function someFunction(
-        /* testCallableIsKeyword */
-        callable $callable,
-        /* testSelfIsKeyword */
-        self $self,
-        /* testParentIsKeyword */
-        parent $parent
-    ) {
-        /* testReturnIsKeyword */
-        return $this;
-    }
-}
-
-/* testInterfaceIsKeyword */ interface SomeInterface {}
-/* testTraitIsKeyword */ trait SomeTrait {}
-/* testEnumIsKeyword */ enum SomeEnum {}
-
-$object = /* testNewIsKeyword */ new SomeClass();
-$object /* testInstanceOfIsKeyword */ instanceof SomeClass;
-$copy = /* testCloneIsKeyword */ clone $object;
-
-/* testIfIsKeyword */ if (/* testEmptyIsKeyword */ empty($a)):
-/* testElseIfIsKeyword */ elseif (false):
-/* testElseIsKeyword */ else:
-/* testEndIfIsKeyword */ endif;
-
-/* testForIsKeyword */ for ($i = 0; $i < 100; $i++):
-/* testEndForIsKeyword */ endfor;
-
-/* testForeachIsKeyword */ foreach ($array as $value):
-/* testEndForeachIsKeyword */ endforeach;
-
-/* testSwitchIsKeyword */ switch (true):
-    /* testCaseIsKeyword */case false:
-        /* testBreakIsKeyword */
-        break;
-    /* testDefaultIsKeyword */ default:
-        /* testContinueIsKeyword */
-        continue;
-/* testEndSwitchIsKeyword */ endswitch;
-
-/* testDoIsKeyword */ do {
-
-} while (false);
-
-/* testWhileIsKeyword */ while (false):
-/* testEndWhileIsKeyword */ endwhile;
-
-/* testTryIsKeyword */
-try {
-    /* testThrowIsKeyword */
-    throw new Exception();
-} /* testCatchIsKeyword */ catch (Exception $e) {
-
-} /* testFinallyIsKeyword */ finally {
-
-}
-
-/* testGlobalIsKeyword */
-global $foo;
-/* testEchoIsKeyword */
-echo $foo;
-/* testPrintIsKeyword */
-print $foo;
-/* testDieIsKeyword */
-die($foo);
-/* testEvalIsKeyword */
-eval('<?php echo 5;');
-/* testExitIsKeyword */
-exit;
-/* testIssetIsKeyword */
-$a = isset($a);
-/* testUnsetIsKeyword */
-unset($a);
-
-/* testIncludeIsKeyword */
-include 'file.php';
-/* testIncludeOnceIsKeyword */
-include_once 'file.php';
-/* testRequireIsKeyword */
-require 'file.php';
-/* testRequireOnceIsKeyword */
-require_once 'file.php';
-
-$a, $b = /* testListIsKeyword */ list($array);
-
-/* testGotoIsKeyword */
-goto label;
-
-$match = /* testMatchIsKeyword */ match ($test) {
-    1 => 'a',
-    2 => 'b',
-    /* testMatchDefaultIsKeyword */ default => 'default',
-};
-
-$closure = /* testFnIsKeyword */ fn () => 'string';
-
-function () {
-    /* testYieldIsKeyword */ yield $f;
-    /* testYieldFromIsKeyword */ yield from someFunction();
-};
-
-/* testDeclareIsKeyword */ declare(ticks=1):
-/* testEndDeclareIsKeyword */ enddeclare;
-
-if (true /* testAndIsKeyword */ and false /* testOrIsKeyword */ or null /* testXorIsKeyword */ xor 0) {
-
-}
-
-$anonymousClass = new /* testAnonymousClassIsKeyword */ class {};
-$anonymousClass2 = new class /* testExtendsInAnonymousClassIsKeyword */ extends SomeParent {};
-$anonymousClass3 = new class /* testImplementsInAnonymousClassIsKeyword */ implements SomeInterface {};
-
-$instantiated1 = new /* testClassInstantiationParentIsKeyword */ parent();
-$instantiated2 = new /* testClassInstantiationSelfIsKeyword */ SELF;
-$instantiated3 = new /* testClassInstantiationStaticIsKeyword */ static($param);
-
-class Foo extends /* testNamespaceInNameIsKeyword */ namespace\Exception
-{}
-
-function /* testKeywordAfterFunctionShouldBeString */ eval() {}
-function /* testKeywordAfterFunctionByRefShouldBeString */ &switch() {}
+<?php
+
+/* testNamespaceIsKeyword */
+namespace SomeNamespace;
+
+class ContextSensitiveKeywords
+{
+    const /* testAbstract */ ABSTRACT = 'ABSTRACT';
+    const /* testArray */ ARRAY = 'ARRAY';
+    const /* testAs */ AS = 'AS';
+    const /* testBreak */ BREAK = 'BREAK';
+    const /* testCallable */ CALLABLE = 'CALLABLE';
+    const /* testCase */ CASE = 'CASE';
+    const /* testCatch */ CATCH = 'CATCH';
+    const /* testClass */ CLASS = 'CLASS';
+    const /* testClone */ CLONE = 'CLONE';
+    const /* testConst */ CONST = 'CONST';
+    const /* testContinue */ CONTINUE = 'CONTINUE';
+    const /* testDeclare */ DECLARE = 'DECLARE';
+    const /* testDefault */ DEFAULT = 'DEFAULT';
+    const /* testDo */ DO = 'DO';
+    const /* testEcho */ ECHO = 'ECHO';
+    const /* testElse */ ELSE = 'ELSE';
+    const /* testElseIf */ ELSEIF = 'ELSEIF';
+    const /* testEmpty */ EMPTY = 'EMPTY';
+    const /* testEndDeclare */ ENDDECLARE = 'ENDDECLARE';
+    const /* testEndFor */ ENDFOR = 'ENDFOR';
+    const /* testEndForeach */ ENDFOREACH = 'ENDFOREACH';
+    const /* testEndIf */ ENDIF = 'ENDIF';
+    const /* testEndSwitch */ ENDSWITCH = 'ENDSWITCH';
+    const /* testEndWhile */ ENDWHILE = 'ENDWHILE';
+    const /* testEnum */ ENUM = 'ENUM';
+    const /* testEval */ EVAL = 'EVAL';
+    const /* testExit */ EXIT = 'EXIT';
+    const /* testExtends */ EXTENDS = 'EXTENDS';
+    const /* testFinal */ FINAL = 'FINAL';
+    const /* testFinally */ FINALLY = 'FINALLY';
+    const /* testFn */ FN = 'FN';
+    const /* testFor */ FOR = 'FOR';
+    const /* testForeach */ FOREACH = 'FOREACH';
+    const /* testFunction */ FUNCTION = 'FUNCTION';
+    const /* testGlobal */ GLOBAL = 'GLOBAL';
+    const /* testGoto */ GOTO = 'GOTO';
+    const /* testIf */ IF = 'IF';
+    const /* testImplements */ IMPLEMENTS = 'IMPLEMENTS';
+    const /* testInclude */ INCLUDE = 'INCLUDE';
+    const /* testIncludeOnce */ INCLUDE_ONCE = 'INCLUDE_ONCE';
+    const /* testInstanceOf */ INSTANCEOF = 'INSTANCEOF';
+    const /* testInsteadOf */ INSTEADOF = 'INSTEADOF';
+    const /* testInterface */ INTERFACE = 'INTERFACE';
+    const /* testIsset */ ISSET = 'ISSET';
+    const /* testList */ LIST = 'LIST';
+    const /* testMatch */ MATCH = 'MATCH';
+    const /* testNamespace */ NAMESPACE = 'NAMESPACE';
+    const /* testNew */ NEW = 'NEW';
+    const /* testParent */ PARENT = 'PARENT';
+    const /* testPrint */ PRINT = 'PRINT';
+    const /* testPrivate */ PRIVATE = 'PRIVATE';
+    const /* testProtected */ PROTECTED = 'PROTECTED';
+    const /* testPublic */ PUBLIC = 'PUBLIC';
+    const /* testReadonly */ READONLY = 'READONLY';
+    const /* testRequire */ REQUIRE = 'REQUIRE';
+    const /* testRequireOnce */ REQUIRE_ONCE = 'REQUIRE_ONCE';
+    const /* testReturn */ RETURN = 'RETURN';
+    const /* testSelf */ SELF = 'SELF';
+    const /* testStatic */ STATIC = 'STATIC';
+    const /* testSwitch */ SWITCH = 'SWITCH';
+    const /* testThrows */ THROW = 'THROW';
+    const /* testTrait */ TRAIT = 'TRAIT';
+    const /* testTry */ TRY = 'TRY';
+    const /* testUnset */ UNSET = 'UNSET';
+    const /* testUse */ USE = 'USE';
+    const /* testVar */ VAR = 'VAR';
+    const /* testWhile */ WHILE = 'WHILE';
+    const /* testYield */ YIELD = 'YIELD';
+    const /* testYieldFrom */ YIELD_FROM = 'YIELD_FROM';
+
+    const /* testAnd */ AND = 'LOGICAL_AND';
+    const /* testOr */ OR = 'LOGICAL_OR';
+    const /* testXor */ XOR = 'LOGICAL_XOR';
+
+    const /* testFalse */ FALSE = 'FALSE',
+    const /* testTrue */ TRUE = 'TRUE',
+    const /* testNull */ NULL = 'NULL',
+}
+
+namespace /* testKeywordAfterNamespaceShouldBeString */ class;
+namespace /* testNamespaceNameIsString1 */ my\ /* testNamespaceNameIsString2 */ class\ /* testNamespaceNameIsString3 */ foreach;
+
+/* testAbstractIsKeyword */ abstract /* testClassIsKeyword */ class SomeClass
+    /* testExtendsIsKeyword */ extends SomeParent
+    /* testImplementsIsKeyword */ implements SomeInterface
+{
+    /* testUseIsKeyword */ use SomeTrait, OtherTrait {
+        SomeTrait::a /* testInsteadOfIsKeyword */ insteadof A;
+        OtherTrait::a /* testAsIsKeyword */ as B;
+    }
+
+    /* testConstIsKeyword */ const CONSTANT = 'c';
+
+    /* testPrivateIsKeyword */ private $private;
+    /* testProtectedIsKeyword */ protected $protected;
+    /* testPublicIsKeyword */ public $public;
+
+    /* testVarIsKeyword */ var $var;
+    /* testStaticIsKeyword */ static $static;
+
+    /* testReadonlyIsKeyword */ readonly $readonly;
+
+    /* testFinalIsKeyword */ final /* testFunctionIsKeyword */ function someFunction(
+        /* testCallableIsKeyword */
+        callable $callable,
+        /* testSelfIsKeyword */
+        self $self,
+        /* testParentIsKeyword */
+        parent $parent
+    ) {
+        /* testReturnIsKeyword */
+        return $this;
+    }
+}
+
+/* testInterfaceIsKeyword */ interface SomeInterface {}
+/* testTraitIsKeyword */ trait SomeTrait {}
+/* testEnumIsKeyword */ enum SomeEnum {}
+
+$object = /* testNewIsKeyword */ new SomeClass();
+$object /* testInstanceOfIsKeyword */ instanceof SomeClass;
+$copy = /* testCloneIsKeyword */ clone $object;
+
+/* testIfIsKeyword */ if (/* testEmptyIsKeyword */ empty($a)):
+/* testElseIfIsKeyword */ elseif (false):
+/* testElseIsKeyword */ else:
+/* testEndIfIsKeyword */ endif;
+
+/* testForIsKeyword */ for ($i = 0; $i < 100; $i++):
+/* testEndForIsKeyword */ endfor;
+
+/* testForeachIsKeyword */ foreach ($array as $value):
+/* testEndForeachIsKeyword */ endforeach;
+
+/* testSwitchIsKeyword */ switch (true):
+    /* testCaseIsKeyword */case false:
+        /* testBreakIsKeyword */
+        break;
+    /* testDefaultIsKeyword */ default:
+        /* testContinueIsKeyword */
+        continue;
+/* testEndSwitchIsKeyword */ endswitch;
+
+/* testDoIsKeyword */ do {
+
+} while (false);
+
+/* testWhileIsKeyword */ while (false):
+/* testEndWhileIsKeyword */ endwhile;
+
+/* testTryIsKeyword */
+try {
+    /* testThrowIsKeyword */
+    throw new Exception();
+} /* testCatchIsKeyword */ catch (Exception $e) {
+
+} /* testFinallyIsKeyword */ finally {
+
+}
+
+/* testGlobalIsKeyword */
+global $foo;
+/* testEchoIsKeyword */
+echo $foo;
+/* testPrintIsKeyword */
+print $foo;
+/* testDieIsKeyword */
+die($foo);
+/* testEvalIsKeyword */
+eval('<?php echo 5;');
+/* testExitIsKeyword */
+exit;
+/* testIssetIsKeyword */
+$a = isset($a);
+/* testUnsetIsKeyword */
+unset($a);
+
+/* testIncludeIsKeyword */
+include 'file.php';
+/* testIncludeOnceIsKeyword */
+include_once 'file.php';
+/* testRequireIsKeyword */
+require 'file.php';
+/* testRequireOnceIsKeyword */
+require_once 'file.php';
+
+$a, $b = /* testListIsKeyword */ list($array);
+
+/* testGotoIsKeyword */
+goto label;
+
+$match = /* testMatchIsKeyword */ match ($test) {
+    1 => 'a',
+    2 => 'b',
+    /* testMatchDefaultIsKeyword */ default => 'default',
+};
+
+$closure = /* testFnIsKeyword */ fn () => 'string';
+
+function () {
+    /* testYieldIsKeyword */ yield $f;
+    /* testYieldFromIsKeyword */ yield from someFunction();
+};
+
+/* testDeclareIsKeyword */ declare(ticks=1):
+/* testEndDeclareIsKeyword */ enddeclare;
+
+if (true /* testAndIsKeyword */ and false /* testOrIsKeyword */ or null /* testXorIsKeyword */ xor 0) {
+
+}
+
+$anonymousClass = new /* testAnonymousClassIsKeyword */ class {};
+$anonymousClass2 = new class /* testExtendsInAnonymousClassIsKeyword */ extends SomeParent {};
+$anonymousClass3 = new class /* testImplementsInAnonymousClassIsKeyword */ implements SomeInterface {};
+
+$instantiated1 = new /* testClassInstantiationParentIsKeyword */ parent();
+$instantiated2 = new /* testClassInstantiationSelfIsKeyword */ SELF;
+$instantiated3 = new /* testClassInstantiationStaticIsKeyword */ static($param);
+
+class Foo extends /* testNamespaceInNameIsKeyword */ namespace\Exception
+{}
+
+function /* testKeywordAfterFunctionShouldBeString */ eval() {}
+function /* testKeywordAfterFunctionByRefShouldBeString */ &switch() {}
+
+function /* testKeywordSelfAfterFunctionByRefShouldBeString */ &self() {}
+function /* testKeywordStaticAfterFunctionByRefShouldBeString */ &static() {}
+function /* testKeywordParentAfterFunctionByRefShouldBeString */ &parent() {}
+function /* testKeywordFalseAfterFunctionByRefShouldBeString */ &false() {}
+function /* testKeywordTrueAfterFunctionByRefShouldBeString */ & true () {}
+function /* testKeywordNullAfterFunctionByRefShouldBeString */ &NULL() {}
+
+/* testKeywordAsFunctionCallNameShouldBeStringSelf */ self();
+/* testKeywordAsFunctionCallNameShouldBeStringStatic */ static();
+$obj-> /* testKeywordAsMethodCallNameShouldBeStringStatic */ static();
+/* testKeywordAsFunctionCallNameShouldBeStringParent */ parent();
+/* testKeywordAsFunctionCallNameShouldBeStringFalse */ false();
+/* testKeywordAsFunctionCallNameShouldBeStringTrue */ True ();
+/* testKeywordAsFunctionCallNameShouldBeStringNull */ null /*comment*/ ();
+
+$instantiated4 = new /* testClassInstantiationFalseIsString */ False();
+$instantiated5 = new /* testClassInstantiationTrueIsString */ true ();
+$instantiated6 = new /* testClassInstantiationNullIsString */ null();
+
+$function = /* testStaticIsKeywordBeforeClosure */ static function(/* testStaticIsKeywordWhenParamType */ static $param) {};
+$arrow = /* testStaticIsKeywordBeforeArrow */ static fn(): /* testStaticIsKeywordWhenReturnType */ static => 10;
+
+function standAloneFalseTrueNullTypesAndMore(
+    /* testFalseIsKeywordAsParamType */ false $paramA,
+    /* testTrueIsKeywordAsParamType */ true $paramB,
+    /* testNullIsKeywordAsParamType */ null $paramC,
+) /* testFalseIsKeywordAsReturnType */ false | /* testTrueIsKeywordAsReturnType */ true | /* testNullIsKeywordAsReturnType */ null {
+    if ($a === /* testFalseIsKeywordInComparison */ false
+    || $a === /* testTrueIsKeywordInComparison */ true
+    || $a === /* testNullIsKeywordInComparison */ null
+    ) {}
+}

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ContextSensitiveKeywordsTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Jaroslav Hanslík <kukulich@kukulich.cz>
  * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
@@ -30,7 +30,7 @@
     {
         $tokens = self::$phpcsFile->getTokens();
 
-        $token = $this->getTargetToken($testMarker, (Tokens::$contextSensitiveKeywords + T_STRING));
+        $token = $this->getTargetToken($testMarker, (Tokens::$contextSensitiveKeywords + T_STRING, T_NULL, T_FALSE, T_TRUE, T_PARENT, T_SELF));
 
         $this->assertSame(T_STRING, $tokens$token'code');
         $this->assertSame('T_STRING', $tokens$token'type');
@@ -120,6 +120,9 @@
             '/* testAnd */',
             '/* testOr */',
             '/* testXor */',
+            '/* testFalse */',
+            '/* testTrue */',
+            '/* testNull */',
 
             '/* testKeywordAfterNamespaceShouldBeString */',
             '/* testNamespaceNameIsString1 */',
@@ -128,6 +131,24 @@
 
             '/* testKeywordAfterFunctionShouldBeString */',
             '/* testKeywordAfterFunctionByRefShouldBeString */',
+            '/* testKeywordSelfAfterFunctionByRefShouldBeString */',
+            '/* testKeywordStaticAfterFunctionByRefShouldBeString */',
+            '/* testKeywordParentAfterFunctionByRefShouldBeString */',
+            '/* testKeywordFalseAfterFunctionByRefShouldBeString */',
+            '/* testKeywordTrueAfterFunctionByRefShouldBeString */',
+            '/* testKeywordNullAfterFunctionByRefShouldBeString */',
+
+            '/* testKeywordAsFunctionCallNameShouldBeStringSelf */',
+            '/* testKeywordAsFunctionCallNameShouldBeStringStatic */',
+            '/* testKeywordAsMethodCallNameShouldBeStringStatic */',
+            '/* testKeywordAsFunctionCallNameShouldBeStringParent */',
+            '/* testKeywordAsFunctionCallNameShouldBeStringFalse */',
+            '/* testKeywordAsFunctionCallNameShouldBeStringTrue */',
+            '/* testKeywordAsFunctionCallNameShouldBeStringNull */',
+
+            '/* testClassInstantiationFalseIsString */',
+            '/* testClassInstantiationTrueIsString */',
+            '/* testClassInstantiationNullIsString */',
         ;
 
     }//end dataStrings()
@@ -148,7 +169,10 @@
     {
         $tokens = self::$phpcsFile->getTokens();
 
-        $token = $this->getTargetToken($testMarker, (Tokens::$contextSensitiveKeywords + T_ANON_CLASS, T_MATCH_DEFAULT, T_PARENT, T_SELF, T_STRING));
+        $token = $this->getTargetToken(
+            $testMarker,
+            (Tokens::$contextSensitiveKeywords + T_ANON_CLASS, T_MATCH_DEFAULT, T_PARENT, T_SELF, T_STRING, T_NULL, T_FALSE, T_TRUE)
+        );
 
         $this->assertSame(constant($expectedTokenType), $tokens$token'code');
         $this->assertSame($expectedTokenType, $tokens$token'type');
@@ -501,6 +525,60 @@
                 '/* testNamespaceInNameIsKeyword */',
                 'T_NAMESPACE',
             ,
+
+            
+                '/* testStaticIsKeywordBeforeClosure */',
+                'T_STATIC',
+            ,
+            
+                '/* testStaticIsKeywordWhenParamType */',
+                'T_STATIC',
+            ,
+            
+                '/* testStaticIsKeywordBeforeArrow */',
+                'T_STATIC',
+            ,
+            
+                '/* testStaticIsKeywordWhenReturnType */',
+                'T_STATIC',
+            ,
+
+            
+                '/* testFalseIsKeywordAsParamType */',
+                'T_FALSE',
+            ,
+            
+                '/* testTrueIsKeywordAsParamType */',
+                'T_TRUE',
+            ,
+            
+                '/* testNullIsKeywordAsParamType */',
+                'T_NULL',
+            ,
+            
+                '/* testFalseIsKeywordAsReturnType */',
+                'T_FALSE',
+            ,
+            
+                '/* testTrueIsKeywordAsReturnType */',
+                'T_TRUE',
+            ,
+            
+                '/* testNullIsKeywordAsReturnType */',
+                'T_NULL',
+            ,
+            
+                '/* testFalseIsKeywordInComparison */',
+                'T_FALSE',
+            ,
+            
+                '/* testTrueIsKeywordInComparison */',
+                'T_TRUE',
+            ,
+            
+                '/* testNullIsKeywordInComparison */',
+                'T_NULL',
+            ,
         ;
 
     }//end dataKeywords()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/DefaultKeywordTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/DoubleArrowTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/DoubleQuotedStringTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/EnumCaseTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/FinallyTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/GotoLabelTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocNowdocCloserTest.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
  * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
@@ -29,9 +29,11 @@
      * {@internal This is a near duplicate of the original method. Only difference is that
      * tab replacement is enabled for this test.}
      *
+     * @beforeClass
+     *
      * @return void
      */
-    public static function setUpBeforeClass()
+    public static function initializeFile()
     {
         $config            = new Config();
         $config->standards = 'PSR1';
@@ -51,7 +53,7 @@
         self::$phpcsFile = new DummyFile($contents, $ruleset, $config);
         self::$phpcsFile->process();
 
-    }//end setUpBeforeClass()
+    }//end initializeFile()
 
 
     /**

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocStringTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NullsafeObjectOperatorTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ScopeSettingWithNamespaceOperatorTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ShortArrayTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/StableCommentWhitespaceTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/StableCommentWhitespaceWinTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/TypeIntersectionTest.inc Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/TypeIntersectionTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/UndoNamespacedNameSingleTokenTest.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Util Added

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Util/IsCamelCapsTest.php Added

@@ -0,0 +1,140 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Util\Common::isCamelCaps method.
+ *
+ * @author    Greg Sherwood <gsherwood@squiz.net>
+ * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Util;
+
+use PHP_CodeSniffer\Util\Common;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Util\Common::isCamelCaps method.
+ *
+ * @covers \PHP_CodeSniffer\Util\Common::isCamelCaps
+ */
+class IsCamelCapsTest extends TestCase
+{
+
+
+    /**
+     * Test valid public function/method names.
+     *
+     * @return void
+     */
+    public function testValidNotClassFormatPublic()
+    {
+        $this->assertTrue(Common::isCamelCaps('thisIsCamelCaps', false, true, true));
+        $this->assertTrue(Common::isCamelCaps('thisISCamelCaps', false, true, false));
+
+    }//end testValidNotClassFormatPublic()
+
+
+    /**
+     * Test invalid public function/method names.
+     *
+     * @return void
+     */
+    public function testInvalidNotClassFormatPublic()
+    {
+        $this->assertFalse(Common::isCamelCaps('_thisIsCamelCaps', false, true, true));
+        $this->assertFalse(Common::isCamelCaps('thisISCamelCaps', false, true, true));
+        $this->assertFalse(Common::isCamelCaps('ThisIsCamelCaps', false, true, true));
+
+        $this->assertFalse(Common::isCamelCaps('3thisIsCamelCaps', false, true, true));
+        $this->assertFalse(Common::isCamelCaps('*thisIsCamelCaps', false, true, true));
+        $this->assertFalse(Common::isCamelCaps('-thisIsCamelCaps', false, true, true));
+
+        $this->assertFalse(Common::isCamelCaps('this*IsCamelCaps', false, true, true));
+        $this->assertFalse(Common::isCamelCaps('this-IsCamelCaps', false, true, true));
+        $this->assertFalse(Common::isCamelCaps('this_IsCamelCaps', false, true, true));
+        $this->assertFalse(Common::isCamelCaps('this_is_camel_caps', false, true, true));
+
+    }//end testInvalidNotClassFormatPublic()
+
+
+    /**
+     * Test valid private method names.
+     *
+     * @return void
+     */
+    public function testValidNotClassFormatPrivate()
+    {
+        $this->assertTrue(Common::isCamelCaps('_thisIsCamelCaps', false, false, true));
+        $this->assertTrue(Common::isCamelCaps('_thisISCamelCaps', false, false, false));
+        $this->assertTrue(Common::isCamelCaps('_i18N', false, false, true));
+        $this->assertTrue(Common::isCamelCaps('_i18n', false, false, true));
+
+    }//end testValidNotClassFormatPrivate()
+
+
+    /**
+     * Test invalid private method names.
+     *
+     * @return void
+     */
+    public function testInvalidNotClassFormatPrivate()
+    {
+        $this->assertFalse(Common::isCamelCaps('thisIsCamelCaps', false, false, true));
+        $this->assertFalse(Common::isCamelCaps('_thisISCamelCaps', false, false, true));
+        $this->assertFalse(Common::isCamelCaps('_ThisIsCamelCaps', false, false, true));
+        $this->assertFalse(Common::isCamelCaps('__thisIsCamelCaps', false, false, true));
+        $this->assertFalse(Common::isCamelCaps('__thisISCamelCaps', false, false, false));
+
+        $this->assertFalse(Common::isCamelCaps('3thisIsCamelCaps', false, false, true));
+        $this->assertFalse(Common::isCamelCaps('*thisIsCamelCaps', false, false, true));
+        $this->assertFalse(Common::isCamelCaps('-thisIsCamelCaps', false, false, true));
+        $this->assertFalse(Common::isCamelCaps('_this_is_camel_caps', false, false, true));
+
+    }//end testInvalidNotClassFormatPrivate()
+
+
+    /**
+     * Test valid class names.
+     *
+     * @return void
+     */
+    public function testValidClassFormatPublic()
+    {
+        $this->assertTrue(Common::isCamelCaps('ThisIsCamelCaps', true, true, true));
+        $this->assertTrue(Common::isCamelCaps('ThisISCamelCaps', true, true, false));
+        $this->assertTrue(Common::isCamelCaps('This3IsCamelCaps', true, true, false));
+
+    }//end testValidClassFormatPublic()
+
+
+    /**
+     * Test invalid class names.
+     *
+     * @return void
+     */
+    public function testInvalidClassFormat()
+    {
+        $this->assertFalse(Common::isCamelCaps('thisIsCamelCaps', true));
+        $this->assertFalse(Common::isCamelCaps('This-IsCamelCaps', true));
+        $this->assertFalse(Common::isCamelCaps('This_Is_Camel_Caps', true));
+
+    }//end testInvalidClassFormat()
+
+
+    /**
+     * Test invalid class names with the private flag set.
+     *
+     * Note that the private flag is ignored if the class format
+     * flag is set, so these names are all invalid.
+     *
+     * @return void
+     */
+    public function testInvalidClassFormatPrivate()
+    {
+        $this->assertFalse(Common::isCamelCaps('_ThisIsCamelCaps', true, true));
+        $this->assertFalse(Common::isCamelCaps('_ThisIsCamelCaps', true, false));
+
+    }//end testInvalidClassFormatPrivate()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Util/SuggestTypeTest.php Added

@@ -0,0 +1,224 @@
+<?php
+/**
+ * Tests for the \PHP_CodeSniffer\Util\Sniffs\Comments::suggestType() method.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2019 Juliette Reinders Folmer. All rights reserved.
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Util;
+
+use PHP_CodeSniffer\Util\Common;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests for the \PHP_CodeSniffer\Util\Sniffs\Comments::suggestType() method.
+ *
+ * @covers \PHP_CodeSniffer\Util\Common::suggestType
+ */
+class SuggestTypeTest extends TestCase
+{
+
+
+    /**
+     * Test passing an empty type to the suggestType() method.
+     *
+     * @return void
+     */
+    public function testSuggestTypeEmpty()
+    {
+        $this->assertSame('', Common::suggestType(''));
+
+    }//end testSuggestTypeEmpty()
+
+
+    /**
+     * Test passing one of the allowed types to the suggestType() method.
+     *
+     * @param string $varType The type.
+     *
+     * @dataProvider dataSuggestTypeAllowedType
+     *
+     * @return void
+     */
+    public function testSuggestTypeAllowedType($varType)
+    {
+        $result = Common::suggestType($varType);
+        $this->assertSame($varType, $result);
+
+    }//end testSuggestTypeAllowedType()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testSuggestTypeAllowedType()
+     *
+     * @return array<string, array<string>>
+     */
+    public function dataSuggestTypeAllowedType()
+    {
+        $data = ;
+        foreach (Common::$allowedTypes as $type) {
+            $data'Type: '.$type = $type;
+        }
+
+        return $data;
+
+    }//end dataSuggestTypeAllowedType()
+
+
+    /**
+     * Test passing one of the allowed types in the wrong case to the suggestType() method.
+     *
+     * @param string $varType  The type found.
+     * @param string $expected Expected suggested type.
+     *
+     * @dataProvider dataSuggestTypeAllowedTypeWrongCase
+     *
+     * @return void
+     */
+    public function testSuggestTypeAllowedTypeWrongCase($varType, $expected)
+    {
+        $result = Common::suggestType($varType);
+        $this->assertSame($expected, $result);
+
+    }//end testSuggestTypeAllowedTypeWrongCase()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testSuggestTypeAllowedTypeWrongCase()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public function dataSuggestTypeAllowedTypeWrongCase()
+    {
+        $data = ;
+        foreach (Common::$allowedTypes as $type) {
+            $data'Mixed case: '.$type = 
+                'varType'  => ucfirst($type),
+                'expected' => $type,
+            ;
+            $data'Uppercase: '.$type  = 
+                'varType'  => strtoupper($type),
+                'expected' => $type,
+            ;
+        }
+
+        return $data;
+
+    }//end dataSuggestTypeAllowedTypeWrongCase()
+
+
+    /**
+     * Test the suggestType() method for all other cases.
+     *
+     * @param string $varType  The type found.
+     * @param string $expected Expected suggested type.
+     *
+     * @dataProvider dataSuggestTypeOther
+     *
+     * @return void
+     */
+    public function testSuggestTypeOther($varType, $expected)
+    {
+        $result = Common::suggestType($varType);
+        $this->assertSame($expected, $result);
+
+    }//end testSuggestTypeOther()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testSuggestTypeOther()
+     *
+     * @return array<string, array<string, string>>
+     */
+    public function dataSuggestTypeOther()
+    {
+        return 
+            // Short forms.
+            'Short form type: bool, lowercase'                                => 
+                'varType'  => 'bool',
+                'expected' => 'boolean',
+            ,
+            'Short form type: bool, uppercase'                                => 
+                'varType'  => 'BOOL',
+                'expected' => 'boolean',
+            ,
+            'Short form type: double, lowercase'                              => 
+                'varType'  => 'double',
+                'expected' => 'float',
+            ,
+            'Short form type: real, mixed case'                               => 
+                'varType'  => 'Real',
+                'expected' => 'float',
+            ,
+            'Short form type: double, mixed case'                             => 
+                'varType'  => 'DoUbLe',
+                'expected' => 'float',
+            ,
+            'Short form type: int, lowercase'                                 => 
+                'varType'  => 'int',
+                'expected' => 'integer',
+            ,
+            'Short form type: int, uppercase'                                 => 
+                'varType'  => 'INT',
+                'expected' => 'integer',
+            ,
+
+            // Array types.
+            'Array type: mixed case keyword, empty parentheses'               => 
+                'varType'  => 'Array()',
+                'expected' => 'array',
+            ,
+            'Array type: short form type as value within the parentheses'     => 
+                'varType'  => 'array(real)',
+                'expected' => 'array(float)',
+            ,
+            'Array type: short form type as key within the parentheses'       => 
+                'varType'  => 'array(int => object)',
+                'expected' => 'array(integer => object)',
+            ,
+            'Array type: valid specification'                                 => 
+                'varType'  => 'array(integer => array(string => resource))',
+                'expected' => 'array(integer => array(string => resource))',
+            ,
+            'Array type: short form + uppercase types within the parentheses' => 
+                'varType'  => 'ARRAY(BOOL => DOUBLE)',
+                'expected' => 'array(boolean => float)',
+            ,
+            'Array type: no space around the arrow within the parentheses'    => 
+                'varType'  => 'array(string=>resource)',
+                'expected' => 'array(string => resource)',
+            ,
+
+            // Incomplete array type.
+            'Array type: incomplete specification'                            => 
+                'varType'  => 'array(int =>',
+                'expected' => 'array',
+            ,
+
+            // Custom types are returned unchanged.
+            'Unknown type: "<string> => <int>"'                               => 
+                'varType'  => '<string> => <int>',
+                'expected' => '<string> => <int>',
+            ,
+            'Unknown type: "string"'                                        => 
+                'varType'  => 'string',
+                'expected' => 'string',
+            ,
+            'Unknown type: "\DateTime"'                                       => 
+                'varType'  => '\DateTime',
+                'expected' => '\DateTime',
+            ,
+        ;
+
+    }//end dataSuggestTypeOther()
+
+
+}//end class

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/FileList.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Standards/AbstractSniffUnitTest.php Changed

@@ -8,7 +8,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Standards;
@@ -50,15 +50,17 @@
     /**
      * Sets up this unit test.
      *
+     * @before
+     *
      * @return void
      */
-    protected function setUp()
+    protected function setUpPrerequisites()
     {
         $class = get_class($this);
         $this->standardsDir = $GLOBALS'PHP_CODESNIFFER_STANDARD_DIRS'$class;
         $this->testsDir     = $GLOBALS'PHP_CODESNIFFER_TEST_DIRS'$class;
 
-    }//end setUp()
+    }//end setUpPrerequisites()
 
 
     /**
@@ -88,7 +90,7 @@
         }
 
         // Put them in order.
-        sort($testFiles);
+        sort($testFiles, SORT_NATURAL);
 
         return $testFiles;
 
@@ -431,7 +433,6 @@
      */
     public function setCliValues($filename, $config)
     {
-        return;
 
     }//end setCliValues()

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php Changed

@@ -4,7 +4,7 @@
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
- * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
 namespace PHP_CodeSniffer\Tests\Standards;
@@ -61,20 +61,11 @@
         foreach ($installedStandards as $standard => $details) {
             Autoload::addSearchPath($details'path', $details'namespace');
 
-            // If the test is running PEAR installed, the built-in standards
-            // are split into different directories; one for the sniffs and
-            // a different file system location for tests.
-            if ($isInstalled === true && is_dir(dirname($details'path').DIRECTORY_SEPARATOR.'Generic') === true) {
-                $testPath = realpath(__DIR__.'/../../src/Standards/'.$standard);
-            } else {
-                $testPath = $details'path';
-            }
-
             if (in_array($standard, $ignoreTestsForStandards, true) === true) {
                 continue;
             }
 
-            $testsDir = $testPath.DIRECTORY_SEPARATOR.'Tests'.DIRECTORY_SEPARATOR;
+            $testsDir = $details'path'.DIRECTORY_SEPARATOR.'Tests'.DIRECTORY_SEPARATOR;
             if (is_dir($testsDir) === false) {
                 // No tests for this standard.
                 continue;

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/TestSuite.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/TestSuite7.php Changed

roundcubemail-1.5.tar.gz/vendor/squizlabs/php_codesniffer/tests/bootstrap.php Changed

roundcubemail.dsc Changed

Overview

Request 3272 (accepted)

Request History