diff --git a/administrator/components/com_config/src/Controller/ComponentController.php b/administrator/components/com_config/src/Controller/ComponentController.php index a7718e366b545..247aecede26fb 100644 --- a/administrator/components/com_config/src/Controller/ComponentController.php +++ b/administrator/components/com_config/src/Controller/ComponentController.php @@ -161,6 +161,9 @@ public function save($key = null, $urlVar = null) case 'save': $this->setMessage(Text::_('COM_CONFIG_SAVE_SUCCESS'), 'message'); + + // No break + default: $redirect = 'index.php?option=' . $option; diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php index 50e97d2a4df04..262901fb2df8b 100644 --- a/administrator/components/com_finder/src/Indexer/Query.php +++ b/administrator/components/com_finder/src/Indexer/Query.php @@ -17,6 +17,7 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Uri\Uri; use Joomla\Component\Finder\Administrator\Helper\LanguageHelper; +use Joomla\Component\Finder\Site\Helper\RouteHelper; use Joomla\Database\DatabaseAwareTrait; use Joomla\Database\DatabaseInterface; use Joomla\Database\ParameterType; @@ -24,8 +25,6 @@ use Joomla\String\StringHelper; use Joomla\Utilities\ArrayHelper; -\JLoader::register('FinderHelperRoute', JPATH_SITE . '/components/com_finder/helpers/route.php'); - /** * Query class for the Finder indexer package. * @@ -385,7 +384,7 @@ public function toUri($base = '') 'q' => $uri->getVar('q'), ); - $item = \FinderHelperRoute::getItemid($query); + $item = RouteHelper::getItemid($query); // Add the menu item id if present. if ($item !== null) @@ -845,7 +844,6 @@ protected function processString($input, $lang, $mode) // Handle a before and after date filters. case 'before': case 'after': - { // Get the time offset. $offset = Factory::getApplication()->get('offset'); @@ -870,11 +868,9 @@ protected function processString($input, $lang, $mode) } break; - } // Handle a taxonomy branch filter. default: - { // Try to find the node id. $return = Taxonomy::getNodeByTitle($modifier, $value); @@ -896,7 +892,6 @@ protected function processString($input, $lang, $mode) } break; - } } // Clean up the input string again. diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php index 7ec7fd620a985..2cd6c20c56b6e 100644 --- a/administrator/components/com_users/src/Model/UsersModel.php +++ b/administrator/components/com_users/src/Model/UsersModel.php @@ -611,6 +611,9 @@ private function buildDateRange($range) case 'post_year': $dNow = false; + + // No break + case 'past_year': $dStart->modify('-1 year'); break; diff --git a/build/psr12/.editorconfig b/build/psr12/.editorconfig new file mode 100644 index 0000000000000..6ff9778775236 --- /dev/null +++ b/build/psr12/.editorconfig @@ -0,0 +1,16 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.{js,json,scss,css,vue}] +indent_size = 2 diff --git a/build/psr12/clean_errors.php b/build/psr12/clean_errors.php new file mode 100644 index 0000000000000..257cd183d49f8 --- /dev/null +++ b/build/psr12/clean_errors.php @@ -0,0 +1,174 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +$tmpDir = dirname(__DIR__) . '/tmp/psr12'; + +$cleaned = []; + +$json = file_get_contents($tmpDir . '/cleanup.json'); + +$data = json_decode($json, JSON_OBJECT_AS_ARRAY); + +// Fixing the later issues in a file first should allow us to preserve the line value per error +$data = array_reverse($data); + +foreach ($data as $error) { + $file = file_get_contents($error['file']); + switch ($error['cleanup']) { + // Remove defined JEXEC statement, PSR-12 doesn't allow functional and symbol code in the same file + case 'definedJEXEC': + $file = str_replace([ + /** + * I know this looks silly but makes it more clear what's happening + * We remove the different types of execution check from files which + * only defines symbols (like classes). + * + * The order is important. + */ + "\defined('_JEXEC') || die();", + "defined('_JEXEC') || die();", + "\defined('_JEXEC') || die;", + "defined('_JEXEC') || die;", + "\defined('_JEXEC') or die();", + "defined('_JEXEC') or die();", + "\defined('_JEXEC') or die;", + "defined('_JEXEC') or die;", + "\defined('JPATH_PLATFORM') or die();", + "defined('JPATH_PLATFORM') or die();", + "\defined('JPATH_PLATFORM') or die;", + "defined('JPATH_PLATFORM') or die;", + "\defined('JPATH_BASE') or die();", + "defined('JPATH_BASE') or die();", + "\defined('JPATH_BASE') or die;", + "defined('JPATH_BASE') or die;", + /** + * We have variants of comments in front of the 'defined die' statement + * which we would like to remove too. + * + * The order is important. + */ + "// No direct access.", + "// No direct access", + "// no direct access", + "// Restrict direct access", + "// Protect from unauthorized access", + ], '', $file); + break; + + // Not all files need a namespace + case 'MissingNamespace': + // We search for the end of the first doc block and add the exception for this file + $pos = strpos($file, ' */'); + $file = substr_replace( + $file, + "\n * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace\n", + $pos, + 0 + ); + + break; + // Not all classes have to be camelcase + case 'ValidClassNameNotCamelCaps': + // We search for the end of the first doc block and add the exception for this file + $pos = strpos($file, ' */'); + $file = substr_replace( + $file, + "\n * @phpcs:disable Squiz.Classes.ValidClassName.NotCamelCaps\n", + $pos, + 0 + ); + + break; + + case 'ConstantVisibility': + // add public to const declaration if defined in a class + $fileContent = file($error['file']); + $fileContent[$error['line'] - 1] = substr_replace($fileContent[$error['line'] - 1], 'public ', $error['column'] - 1, 0); + $file = implode('', $fileContent); + + break; + + case 'SpaceAfterCloseBrace': + // We only move single comments (starting with //) to the next line + + $fileContent = file($error['file']); + + $lineNo = $error['line']; + + // We skip blank lines + do { + $nextLine = ltrim($fileContent[$lineNo]); + if (empty($nextLine)) { + $lineNo = $lineNo + 1; + $nextLine = ltrim($fileContent[$lineNo]); + } + } while (empty($nextLine)); + + $sourceLineStartNo = $lineNo; + $sourceLineEndNo = $lineNo; + $found = false; + + while (substr(ltrim($fileContent[$sourceLineEndNo]), 0, 2) === '//') { + $sourceLineEndNo++; + $found = true; + } + + if ($sourceLineStartNo === $sourceLineEndNo) { + if (substr(ltrim($fileContent[$sourceLineStartNo]), 0, 2) === '/*') { + while (substr(ltrim($fileContent[$sourceLineEndNo]), 0, 2) !== '*/') { + $sourceLineEndNo++; + } + $sourceLineEndNo++; + $found = true; + } + } + + if (!$found) { + echo "Unrecoverable error while running SpaceAfterCloseBrace cleanup"; + var_dump($error['file'], $sourceLineStartNo, $sourceLineEndNo); + die(1); + } + $targetLineNo = $sourceLineEndNo + 1; + + // Adjust the indentation to match the next line of code + for ($indent = 0; $indent <= strlen($fileContent[$targetLineNo]); $indent++) { + if ($fileContent[$targetLineNo][$indent] !== ' ') { + break; + } + } + + $replace = []; + for ($i = $sourceLineStartNo; $i < $sourceLineEndNo; $i++) { + $newLine = ltrim($fileContent[$i]); + // Fix codeblocks not starting with /** + if (substr($newLine, 0, 2) === '/*') { + $newLine = "/**\n"; + } + + $localIndent = $indent; + if ($newLine[0] === '*') { + $localIndent++; + } + $replace[] = str_repeat(' ', $localIndent) . $newLine; + } + array_unshift($replace, $fileContent[$sourceLineEndNo]); + + array_splice($fileContent, $sourceLineStartNo, count($replace), $replace); + + $file = implode('', $fileContent); + + break; + } + + file_put_contents($error['file'], $file); + $cleaned[] = $error['file'] . ' ' . $error['cleanup']; +} + +file_put_contents($tmpDir . '/cleaned.log', implode("\n", $cleaned)); diff --git a/build/psr12/phpcs.joomla.report.php b/build/psr12/phpcs.joomla.report.php new file mode 100644 index 0000000000000..3707baf9a8168 --- /dev/null +++ b/build/psr12/phpcs.joomla.report.php @@ -0,0 +1,316 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +namespace Joomla\Reports; + +use PHP_CodeSniffer\Config; +use PHP_CodeSniffer\Files\File; + +use function array_keys; +use function array_merge; +use function array_values; +use function file_exists; +use function file_get_contents; +use function file_put_contents; +use function json_encode; +use function str_replace; + +use const JSON_OBJECT_AS_ARRAY; +use const JSON_PRETTY_PRINT; + + +class Joomla implements \PHP_CodeSniffer\Reports\Report +{ + private $tmpDir = __DIR__ . '/../tmp/psr12'; + + private $html = ''; + + private $preProcessing = []; + + /** + * 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\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) + { + if ($report['errors'] === 0 && $report['warnings'] === 0) { + return false; + } + + $template = [ + 'headline' => $report['filename'], + 'text' => 'Errors: ' . $report['errors'] . ' Warnings: ' . $report['warnings'] . ' Fixable: ' . $report['fixable'], + ]; + + $this->html = << +

{$template['headline']}

+

{$template['text']}

+ HTML; + + foreach ($report['messages'] as $line => $lineErrors) { + foreach ($lineErrors as $column => $colErrors) { + foreach ($colErrors as $error) { + $error['type'] = strtolower($error['type']); + if ($phpcsFile->config->encoding !== 'utf-8') { + $error['message'] = iconv($phpcsFile->config->encoding, 'utf-8', $error['message']); + } + + $error['fixable'] = $error['fixable'] === true ? 'Yes' : 'No'; + + $this->html .= << + Line: $line + Column: $column + Fixable: {$error['fixable']} + Severity: {$error['severity']} + Rule: {$error['source']} + 
{$error['message']}
+ + HTML; + $this->prepareProcessing($report['filename'],$phpcsFile, $line, $column, $error); + } + } + } + + $this->html .= << + HTML; + + $this->writeFile(); + + return true; + } + + private function prepareProcessing($file, $phpcsFile, $line, $column, $error) { + + switch ($error['source']) { + case 'PSR1.Files.SideEffects.FoundWithSymbols': + $fileContent = file_get_contents($file); + + if ( + strpos($fileContent, "defined('_JEXEC')") !== false + || strpos($fileContent, "defined('JPATH_PLATFORM')") !== false + || strpos($fileContent, "defined('JPATH_BASE')") !== false + ) { + $this->preProcessing[] = [ + 'file' => $file, + 'line' => $line, + 'column' => $column, + 'cleanup' => 'definedJEXEC' + ]; + } else { + $targetFile = $this->tmpDir . '/' . $error['source'] . '.txt'; + $fileContent = ''; + if (file_exists($targetFile)) { + $fileContent = file_get_contents($targetFile); + } + + static $replace = null; + + if ($replace === null) { + $replace = [ + "\\" => '/', + dirname(dirname(__DIR__)) . '/' => '', + '.' => '\.', + ]; + } + + $fileContent .= " " . str_replace(array_keys($replace), $replace, $file) . "\n"; + file_put_contents($targetFile, $fileContent); + } + break; + + case 'PSR1.Classes.ClassDeclaration.MissingNamespace': + $this->preProcessing[] = [ + 'file' => $file, + 'line' => $line, + 'column' => $column, + 'cleanup' => 'MissingNamespace' + ]; + break; + + case 'Squiz.Classes.ValidClassName.NotCamelCaps': + if ( + strpos($file, 'localise') !== false + || strpos($file, 'recaptcha_invisible') !== false + ) { + $this->preProcessing[] = [ + 'file' => $file, + 'line' => $line, + 'column' => $column, + 'cleanup' => 'ValidClassNameNotCamelCaps' + ]; + } + break; + + case 'Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace': + $this->preProcessing[] = [ + 'file' => $file, + 'line' => $line, + 'column' => $column, + 'cleanup' => 'SpaceAfterCloseBrace' + ]; + break; + + case 'PSR12.Properties.ConstantVisibility.NotFound': + $this->preProcessing[] = [ + 'file' => $file, + 'line' => $line, + 'column' => $column, + 'cleanup' => 'ConstantVisibility' + ]; + break; + + case 'PSR2.Classes.PropertyDeclaration.Underscore': + case 'PSR2.Methods.MethodDeclaration.Underscore': + case 'PSR1.Classes.ClassDeclaration.MultipleClasses': + case 'PSR1.Methods.CamelCapsMethodName.NotCamelCaps': + + $targetFile = $this->tmpDir . '/' . $error['source'] . '.txt'; + $fileContent = ''; + if (file_exists($targetFile)) { + $fileContent = file_get_contents($targetFile); + } + + static $replace = null; + + if ($replace === null) { + $replace = [ + "\\" => '/', + dirname(dirname(__DIR__)) . '/' => '', + '.' => '\.', + ]; + } + + $fileContent .= " " . str_replace(array_keys($replace), $replace, $file) . "\n"; + file_put_contents($targetFile, $fileContent); + break; + } + } + + /** + * Prints all violations for processed files, in a proprietary XML format. + * + * @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 + ) { + + $preprocessing = []; + if (file_exists($this->tmpDir .'/cleanup.json')) { + $preprocessing = json_decode(file_get_contents($this->tmpDir .'/cleanup.json'), JSON_OBJECT_AS_ARRAY); + } + + $preprocessing = array_merge($this->preProcessing, $preprocessing); + file_put_contents($this->tmpDir .'/cleanup.json', json_encode($preprocessing, JSON_PRETTY_PRINT)); + } + + private function getTemplate($section) + { + $sections = [ + 'header' => << + + Report + + + +
+
+
+

+ Joomla! Coding Standards Check

+
+ +
+
Check
+ HTML, + 'footer' => << +
+
+ + + HTML, + 'line' => << +

%HEADLINE%

+

%TEXT%

+
+ 
%ERROR%
+
+ + HTML + ]; + + return $sections[$section]; + } + + private function htmlAddBlock($headline, $text, $error) + { + $line = $this->getTemplate('line'); + + $replace = [ + '%HEADLINE%' => $headline, + '%TEXT%' => $text, + '%ERROR%' => $error, + ]; + + $this->html .= str_replace(array_keys($replace), $replace, $line); + } + + private function writeFile() + { + $file = $this->tmpDir . '/result.html'; + + if (file_exists($file)) { + $html = file_get_contents($file); + } else { + $html = $this->getTemplate('header'); + $html .= ''; + $html .= $this->getTemplate('footer'); + } + + $html = str_replace('', $this->html . '', $html); + + file_put_contents($this->tmpDir . '/result.html', $html); + } +} diff --git a/build/psr12/psr12_converter.php b/build/psr12/psr12_converter.php new file mode 100644 index 0000000000000..2e29c1d9e8556 --- /dev/null +++ b/build/psr12/psr12_converter.php @@ -0,0 +1,281 @@ + + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +// Set defaults +$root = dirname(dirname(__DIR__)); +$php = 'php'; +$git = 'git'; +$tmpDir = $root . '/build/tmp/psr12'; +$checkPath = false; +$tasks = [ + 'CBF' => false, + 'CS' => false, + 'CLEAN' => false, + 'CMS' => false, + 'BRANCH' => false, +]; + +$script = array_shift($argv); + +if (empty($argv)) { + echo << [path] + + Description: + The converter has several tasks which can be run separately. + You can combine them seperated by a comma (,). + + Tasks: + * CBF + This task executes the PHP Code Beautifier and Fixer. It + does the heavy lifting making the code PSR-12 compatible. + (beware this tasks modifies many files) + * CS + This task executes the PHP Code Sniffer. It collects all + issues and generates a HTML report in build/tmp/psr12. + Also it generates a collection of issues which can't be + fixed by CBF. This information is saved as json in + build/tmp/psr12/cleanup.json. If this option is activated + the tmp directory is cleaned before running. + * CLEAN + This tasks loads the cleanup.json generated by the CS task + and changes the cms specific files. After completing this + task it re-runs the CBF and CS task. + * CMS + This tasks activates all other tasks and automatically + commits the changes after both CBF runs. Usually only + needed for the first cms conversion. + * BRANCH + This tasks updates all files changed by the current + branch compared to the psr12anchor tag. This allows + to update a create pull request. + + Path: + Providing a path will only check the directories or files + specified. It's possible to add multiple files and folder + seperated by a comma (,). + + + TEXT; + die(1); +} + +foreach ($argv as $arg) { + if (substr($arg, 0, 2) === '--') { + $argi = explode('=', $arg, 2); + switch ($argi[0]) { + case '--task': + foreach ($tasks as $task => $value) { + if (stripos($argi[1], $task) !== false) { + $tasks[$task] = true; + } + } + break; + } + } else { + $checkPath = $arg; + break; + } +} + +if ($tasks['CMS']) { + $tasks['CBF'] = true; + $tasks['CS'] = true; + $tasks['CLEAN'] = true; +} + +if ($tasks['BRANCH']) { + $tasks['CMS'] = true; + $tasks['CBF'] = true; + $tasks['CS'] = true; + $tasks['CLEAN'] = true; + + $cmd = $git . ' --no-pager diff --name-only psr12anchor..HEAD'; + exec($cmd, $output, $result); + if ($result !== 0) { + die('Unable to find changes for this branch'); + } + foreach($output as $k => $line) { + if (substr($line, -4) !== '.php') { + unset($output[$k]); + } + } + + $checkPath = implode(',', $output); +} + +$items = []; +if ($checkPath) { + $items = explode(',', $checkPath); +} else { + $items[] = 'index.php'; + $items[] = 'administrator/index.php'; + + $baseFolders = [ + 'administrator/components', + 'administrator/includes', + 'administrator/language', + 'administrator/modules', + 'administrator/templates', + 'api', + 'cli', + 'components', + 'includes', + 'installation', + 'language', + 'layouts', + 'libraries', + 'modules', + 'plugins', + 'templates', + ]; + + foreach ($baseFolders as $folder) { + $dir = dir($root . '/' . $folder); + while (false !== ($entry = $dir->read())) { + if (($entry === ".") || ($entry === "..")) { + continue; + } + if (!is_dir($dir->path . '/' . $entry)) { + if (substr($entry, -4) !== '.php') { + continue; + } + } + if ( + $folder === 'libraries' + && ( + $entry === 'php-encryption' + || $entry === 'phpass' + || $entry === 'vendor' + ) + ) { + continue; + } + $items[] = str_replace($root . '/', '', $dir->path) . '/' . $entry; + } + $dir->close(); + } +} +$executedTasks = implode( + ',', + array_keys( + array_filter($tasks, function ($task) { + return $task; + }) + ) +); +$executedPaths = implode("\n", $items); + +echo << + + The Joomla CMS PSR-12 exceptions. + + + build/* + cache/* + docs/* + logs/* + media/* + node_modules/* + tmp/* + tests/* + + + libraries/php-encryption/* + libraries/phpass/* + libraries/vendor/* + + stubs.php + configuration.php + + + + + + + + + + + + + + administrator/components/com_banners/src/Controller/BannersController\.php + + + + administrator/components/com_banners/src/Model/DownloadModel\.php + administrator/components/com_banners/src/Table/BannerTable\.php + administrator/components/com_banners/src/Table/ClientTable\.php + administrator/components/com_cache/src/Model/CacheModel\.php + administrator/components/com_contact/src/Table/ContactTable\.php + administrator/components/com_fields/src/Table/FieldTable\.php + administrator/components/com_fields/src/Table/GroupTable\.php + administrator/components/com_finder/src/Table/FilterTable\.php + administrator/components/com_finder/src/Table/LinkTable\.php + administrator/components/com_installer/src/Model/DatabaseModel\.php + administrator/components/com_installer/src/Model/InstallModel\.php + administrator/components/com_installer/src/Table/UpdatesiteTable\.php + administrator/components/com_mails/src/Table/TemplateTable\.php + administrator/components/com_menus/src/Helper/MenusHelper\.php + administrator/components/com_menus/src/Model/MenuModel\.php + administrator/components/com_newsfeeds/src/Table/NewsfeedTable\.php + administrator/components/com_plugins/src/Model/PluginModel\.php + administrator/components/com_privacy/src/Table/RequestTable\.php + administrator/components/com_scheduler/src/Table/TaskTable\.php + administrator/components/com_tags/src/Table/TagTable\.php + administrator/components/com_templates/src/Model/StyleModel\.php + administrator/components/com_users/src/Model/UserModel\.php + administrator/components/com_users/src/Table/NoteTable\.php + administrator/components/com_workflow/src/Table/StageTable\.php + administrator/components/com_workflow/src/Table/TransitionTable\.php + administrator/components/com_workflow/src/Table/WorkflowTable\.php + components/com_banners/src/Model/BannerModel\.php + components/com_contact/src/Model/CategoriesModel\.php + components/com_contact/src/Model/CategoryModel\.php + components/com_contact/src/Model/ContactModel\.php + components/com_content/src/Model/ArchiveModel\.php + components/com_content/src/Model/ArticleModel\.php + components/com_content/src/Model/CategoriesModel\.php + components/com_content/src/Model/CategoryModel\.php + components/com_content/src/Model/FeaturedModel\.php + components/com_newsfeeds/src/Model/CategoriesModel\.php + components/com_newsfeeds/src/Model/CategoryModel\.php + components/com_newsfeeds/src/Model/NewsfeedModel\.php + components/com_tags/src/Model/TagsModel\.php + installation/src/View/Preinstall/HtmlView\.php + libraries/src/Adapter/Adapter\.php + libraries/src/Application/ApplicationHelper\.php + libraries/src/Cache/Cache\.php + libraries/src/Cache/CacheStorage\.php + libraries/src/Cache/Controller/OutputController\.php + libraries/src/Cache/Controller/PageController\.php + libraries/src/Cache/Storage/FileStorage\.php + libraries/src/Cache/Storage/MemcachedStorage\.php + libraries/src/Cache/Storage/RedisStorage\.php + libraries/src/Categories/Categories\.php + libraries/src/Categories/CategoryNode\.php + libraries/src/Client/FtpClient\.php + libraries/src/Document/Document\.php + libraries/src/Document/DocumentRenderer\.php + libraries/src/Document/ErrorDocument\.php + libraries/src/Document/HtmlDocument\.php + libraries/src/Document/JsonDocument\.php + libraries/src/Document/OpensearchDocument\.php + libraries/src/Document/Renderer/Feed/AtomRenderer\.php + libraries/src/Document/Renderer/Feed/RssRenderer\.php + libraries/src/Editor/Editor\.php + libraries/src/Encrypt/Totp\.php + libraries/src/Form/Field/CaptchaField\.php + libraries/src/Input/Json\.php + libraries/src/MVC/Model/DatabaseAwareTrait\.php + libraries/src/MVC/Model/FormBehaviorTrait\.php + libraries/src/MVC/Model/ItemModel\.php + libraries/src/MVC/Model/StateBehaviorTrait\.php + libraries/src/MVC/View/AbstractView\.php + libraries/src/MVC/View/HtmlView\.php + libraries/src/MVC/View/JsonView\.php + libraries/src/Object/CMSObject\.php + libraries/src/Plugin/CMSPlugin\.php + libraries/src/Router/Route\.php + libraries/src/Table/Category\.php + libraries/src/Table/Content\.php + libraries/src/Table/CoreContent\.php + libraries/src/Table/Extension\.php + libraries/src/Table/Menu\.php + libraries/src/Table/Module\.php + libraries/src/Table/Nested\.php + libraries/src/Table/Table\.php + libraries/src/Table/Update\.php + libraries/src/Table/User\.php + libraries/src/Toolbar/Toolbar\.php + libraries/src/Tree/ImmutableNodeTrait\.php + libraries/src/Updater/UpdateAdapter\.php + libraries/src/User/User\.php + plugins/editors/tinymce/tinymce\.php + plugins/system/cache/cache\.php + + + + administrator/components/com_content/src/Service/HTML/Icon\.php + administrator/components/com_installer/src/Controller/InstallController\.php + administrator/components/com_installer/src/Model/DiscoverModel\.php + administrator/components/com_installer/src/Model/WarningsModel\.php + administrator/components/com_users/src/Service/HTML/Users\.php + components/com_content/helpers/icon\.php + components/com_content/helpers/icon\.php + libraries/src/Filesystem/Stream\.php + libraries/src/Filesystem/Streams/StreamString\.php + libraries/src/Installer/Adapter/ComponentAdapter\.php + libraries/src/Installer/Adapter/LanguageAdapter\.php + libraries/src/Installer/Adapter/ModuleAdapter\.php + libraries/src/Installer/Installer\.php + libraries/src/Installer/InstallerAdapter\.php + libraries/src/Language/Transliterate\.php + libraries/src/Mail/Mail\.php + libraries/src/Pagination/Pagination\.php + libraries/src/Toolbar/ToolbarHelper\.php + libraries/src/Utility/BufferStreamHandler\.php + + + + + libraries/cms\.php + libraries/loader\.php + + + administrator/components/com_fields/src/Model/FieldsModel\.php + administrator/components/com_fields/src/Model/GroupsModel\.php + administrator/components/com_fields/src/Table/FieldTable\.php + administrator/components/com_fields/src/Table/GroupTable\.php + administrator/components/com_finder/src/Model/MapsModel\.php + administrator/components/com_installer/src/Model/InstallerModel\.php + administrator/components/com_installer/src/Model/InstallModel\.php + administrator/components/com_installer/src/Model/LanguagesModel\.php + administrator/components/com_installer/src/Model/UpdateModel\.php + administrator/components/com_login/src/Model/LoginModel\.php + administrator/components/com_modules/src/Model/ModulesModel\.php + administrator/components/com_plugins/src/Model/PluginsModel\.php + administrator/components/com_scheduler/src/Model/TasksModel\.php + administrator/components/com_scheduler/src/Table/TaskTable\.php + administrator/components/com_users/src/Model/UsersModel\.php + administrator/components/com_workflow/src/Table/StageTable\.php + administrator/components/com_workflow/src/Table/TransitionTable\.php + administrator/components/com_workflow/src/Table/WorkflowTable\.php + api/components/com_contact/src/Controller/ContactController\.php + components/com_config/src/View/Config/HtmlView\.php + components/com_config/src/View/Modules/HtmlView\.php + components/com_config/src/View/Templates/HtmlView\.php + components/com_contact/src/Controller/ContactController\.php + components/com_contact/src/View/Contact/HtmlView\.php + components/com_contact/src/View/Featured/HtmlView\.php + components/com_contact/src/View/Form/HtmlView\.php + components/com_content/src/Model/CategoryModel\.php + components/com_content/src/View/Archive/HtmlView\.php + components/com_content/src/View/Article/HtmlView\.php + components/com_content/src/View/Featured/HtmlView\.php + components/com_content/src/View/Form/HtmlView\.php + components/com_newsfeeds/src/View/Newsfeed/HtmlView\.php + components/com_tags/src/Helper/RouteHelper\.php + components/com_tags/src/View/Tag/HtmlView\.php + components/com_tags/src/View/Tags/HtmlView\.php + installation/src/Form/Field/Installation/LanguageField\.php + libraries/src/Cache/Cache\.php + libraries/src/Cache/CacheStorage\.php + libraries/src/Cache/Controller/CallbackController\.php + libraries/src/Cache/Controller/PageController\.php + libraries/src/Cache/Controller/ViewController\.php + libraries/src/Cache/Storage/FileStorage\.php + libraries/src/Cache/Storage/MemcachedStorage\.php + libraries/src/Captcha/Captcha\.php + libraries/src/Categories/Categories\.php + libraries/src/Client/FtpClient\.php + libraries/src/Document/Document\.php + libraries/src/Document/DocumentRenderer\.php + libraries/src/Document/HtmlDocument\.php + libraries/src/Editor/Editor\.php + libraries/src/Encrypt/Base32\.php + libraries/src/Environment/Browser\.php + libraries/src/Feed/FeedFactory\.php + libraries/src/Filesystem/Folder\.php + libraries/src/Filesystem/Stream\.php + libraries/src/Filesystem/Support/StringController\.php + libraries/src/HTML/Helpers/Grid\.php + libraries/src/Installer/Adapter/ComponentAdapter\.php + libraries/src/Installer/Adapter/LanguageAdapter\.php + libraries/src/Installer/Adapter/ModuleAdapter\.php + libraries/src/Installer/Adapter/PackageAdapter\.php + libraries/src/MVC/Model/BaseDatabaseModel\.php + libraries/src/MVC/Model/LegacyModelLoaderTrait\.php + libraries/src/MVC/Model/ListModel\.php + libraries/src/MVC/View/HtmlView\.php + libraries/src/Pagination/Pagination\.php + libraries/src/Table/Category\.php + libraries/src/Table/Category\.php + libraries/src/Table/Content\.php + libraries/src/Table/Language\.php + libraries/src/Table/MenuType\.php + libraries/src/Table/Module\.php + libraries/src/Table/Nested\.php + libraries/src/Table/Table\.php + libraries/src/Toolbar/Button/ConfirmButton\.php + libraries/src/Toolbar/Button/HelpButton\.php + libraries/src/Toolbar/Button/PopupButton\.php + libraries/src/Toolbar/Button/StandardButton\.php + libraries/src/Updater/Adapter/CollectionAdapter\.php + libraries/src/Updater/Adapter/ExtensionAdapter\.php + libraries/src/Updater/Update\.php + libraries/src/Updater/UpdateAdapter\.php + modules/mod_articles_category/src/Helper/ArticlesCategoryHelper\.php + plugins/content/emailcloak/emailcloak\.php + plugins/content/joomla/joomla\.php + plugins/content/loadmodule/loadmodule\.php + plugins/content/pagebreak/pagebreak\.php + plugins/editors/none/none\.php + plugins/user/joomla/joomla\.php + + + + + administrator/components/com_joomlaupdate/finalisation\.php + + + + + administrator/components/com_installer/src/Model/DatabaseModel\.php + libraries/src/Client/FtpClient\.php + libraries/src/Filesystem/Path\.php + libraries/src/Filesystem/Streams/StreamString\.php + + + index\.php + administrator/index\.php + administrator/components/com_joomlaupdate/extract\.php + administrator/components/com_joomlaupdate/restore_finalisation\.php + administrator/includes/app\.php + administrator/includes/defines\.php + administrator/includes/framework\.php + api/includes/app\.php + api/includes/defines\.php + api/includes/framework\.php + api/index\.php + cli/joomla\.php + includes/app\.php + includes/defines\.php + includes/framework\.php + installation/includes/app\.php + installation/includes/defines\.php + installation/index\.php + libraries/cms\.php + libraries/bootstrap\.php + libraries/import\.php + libraries/import\.legacy\.php + libraries/loader\.php + + diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php index b2a5ec482e854..24a594496a065 100644 --- a/layouts/joomla/content/blog_style_default_item_title.php +++ b/layouts/joomla/content/blog_style_default_item_title.php @@ -19,15 +19,14 @@ $canEdit = $displayData->params->get('access-edit'); $currentDate = Factory::getDate()->format('Y-m-d H:i:s'); +$link = RouteHelper::getArticleRoute($displayData->slug, $displayData->catid, $displayData->language); ?> state == 0 || $params->get('show_title') || ($params->get('show_author') && !empty($displayData->author ))) : ?>
get('show_title')) : ?>

get('link_titles') && ($params->get('access-view') || $params->get('show_noauth', '0') == '1')) : ?> - diff --git a/libraries/src/Console/CheckUpdatesCommand.php b/libraries/src/Console/CheckUpdatesCommand.php index 5942145c1911c..c8e1c754ec832 100644 --- a/libraries/src/Console/CheckUpdatesCommand.php +++ b/libraries/src/Console/CheckUpdatesCommand.php @@ -1,4 +1,5 @@ title('Fetching Extension Updates'); + $symfonyStyle->title('Fetching Extension Updates'); - // Find all updates - $ret = Updater::getInstance()->findUpdates(); + // Find all updates + $ret = Updater::getInstance()->findUpdates(); - if ($ret) - { - $symfonyStyle->note('There are available updates to apply'); - $symfonyStyle->success('Check complete.'); - } - else - { - $symfonyStyle->success('There are no available updates'); - } + if ($ret) { + $symfonyStyle->note('There are available updates to apply'); + $symfonyStyle->success('Check complete.'); + } else { + $symfonyStyle->success('There are no available updates'); + } - return Command::SUCCESS; - } + return Command::SUCCESS; + } - /** - * Configure the command. - * - * @return void - * - * @since 4.0.0 - */ - protected function configure(): void - { - $help = "%command.name% command checks for pending extension updates + /** + * Configure the command. + * + * @return void + * + * @since 4.0.0 + */ + protected function configure(): void + { + $help = "%command.name% command checks for pending extension updates \nUsage: php %command.full_name%"; - $this->setDescription('Check for pending extension updates'); - $this->setHelp($help); - } + $this->setDescription('Check for pending extension updates'); + $this->setHelp($help); + } } diff --git a/libraries/src/Form/Field/MenuField.php b/libraries/src/Form/Field/MenuField.php index a61e55dbaabb5..cd9c551d1a687 100644 --- a/libraries/src/Form/Field/MenuField.php +++ b/libraries/src/Form/Field/MenuField.php @@ -14,9 +14,6 @@ use Joomla\CMS\Language\Text; use Joomla\Database\ParameterType; -// Import the com_menus helper. -require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); - /** * Supports an HTML select list of menus * diff --git a/libraries/src/Form/Field/MenuitemField.php b/libraries/src/Form/Field/MenuitemField.php index f644fc1b439c4..a58891826f1cf 100644 --- a/libraries/src/Form/Field/MenuitemField.php +++ b/libraries/src/Form/Field/MenuitemField.php @@ -13,9 +13,6 @@ use Joomla\CMS\HTML\HTMLHelper; use Joomla\Component\Menus\Administrator\Helper\MenusHelper; -// Import the com_menus helper. -require_once realpath(JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php'); - /** * Supports an HTML grouped select list of menu item grouped by menu * diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php index 7252803deb7f0..460119d07e69c 100644 --- a/libraries/src/Form/FormField.php +++ b/libraries/src/Form/FormField.php @@ -516,6 +516,8 @@ public function __set($name, $value) // Removes spaces from left & right and extra spaces from middle $value = preg_replace('/\s+/', ' ', trim((string) $value)); + // No break + case 'description': case 'hint': case 'value': @@ -552,6 +554,8 @@ public function __set($name, $value) $value = (string) $value; $value = $value === '' && isset($this->forceMultiple) ? (string) $this->forceMultiple : $value; + // No break + case 'required': case 'disabled': case 'readonly': diff --git a/libraries/src/Form/FormRule.php b/libraries/src/Form/FormRule.php index c6a9af1d7f290..e843c0aaf5d88 100644 --- a/libraries/src/Form/FormRule.php +++ b/libraries/src/Form/FormRule.php @@ -4,6 +4,9 @@ * * @copyright (C) 2017 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt + * + * Remove phpcs exception with deprecated constant JCOMPAT_UNICODE_PROPERTIES + * @phpcs:disable PSR1.Files.SideEffects */ namespace Joomla\CMS\Form; @@ -20,6 +23,8 @@ * * @var boolean * @since 1.6 + * + * @deprecated 5.0 Will be removed without replacement (Also remove phpcs exception) */ \define('JCOMPAT_UNICODE_PROPERTIES', (bool) @preg_match('/\pL/u', 'a')); } @@ -71,8 +76,16 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry throw new \UnexpectedValueException(sprintf('%s has invalid regex.', \get_class($this))); } + // Detect if we have full UTF-8 and unicode PCRE support. + static $unicodePropertiesSupport = null; + + if ($unicodePropertiesSupport === null) + { + $unicodePropertiesSupport = (bool) @\preg_match('/\pL/u', 'a'); + } + // Add unicode property support if available. - if (JCOMPAT_UNICODE_PROPERTIES) + if ($unicodePropertiesSupport) { $this->modifiers = (strpos($this->modifiers, 'u') !== false) ? $this->modifiers : $this->modifiers . 'u'; } diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php index 4c302bbe43920..83bcccf636ab0 100644 --- a/libraries/src/MVC/Model/BaseDatabaseModel.php +++ b/libraries/src/MVC/Model/BaseDatabaseModel.php @@ -110,15 +110,12 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu { $this->addTablePath($config['table_path']); } - // @codeCoverageIgnoreStart elseif (\defined('JPATH_COMPONENT_ADMINISTRATOR')) { $this->addTablePath(JPATH_COMPONENT_ADMINISTRATOR . '/tables'); $this->addTablePath(JPATH_COMPONENT_ADMINISTRATOR . '/table'); } - // @codeCoverageIgnoreEnd - // Set the clean cache event if (isset($config['event_clean_cache'])) { diff --git a/libraries/src/Utility/BufferStreamHandler.php b/libraries/src/Utility/BufferStreamHandler.php index 0d7d04d1822f7..8fb304d1e4c7c 100644 --- a/libraries/src/Utility/BufferStreamHandler.php +++ b/libraries/src/Utility/BufferStreamHandler.php @@ -4,13 +4,19 @@ * * @copyright (C) 2007 Open Source Matters, Inc. * @license GNU General Public License version 2 or later; see LICENSE.txt + * + * Remove phpcs exception with deprecated autoloading BufferStreamHandler::stream_register(); + * @phpcs:disable PSR1.Files.SideEffects */ namespace Joomla\CMS\Utility; \defined('JPATH_PLATFORM') or die; -// Workaround for B/C. Will be removed with 4.0 +/** + * @deprecated 5.0 Workaround for B/C. (removal missed in 4.0, also remove phpcs exception). + * If BufferStreamHandler is needed directly call BufferStreamHandler::stream_register(); + */ BufferStreamHandler::stream_register(); /** diff --git a/plugins/authentication/ldap/ldap.php b/plugins/authentication/ldap/ldap.php index 95a30e2cf7a63..de01d4281e0c9 100644 --- a/plugins/authentication/ldap/ldap.php +++ b/plugins/authentication/ldap/ldap.php @@ -78,7 +78,6 @@ public function onUserAuthenticate($credentials, $options, &$response) switch ($auth_method) { case 'search': - { try { $dn = str_replace('[username]', $this->params->get('username', ''), $this->params->get('users_dn', '')); @@ -135,10 +134,8 @@ public function onUserAuthenticate($credentials, $options, &$response) } break; - } case 'bind': - { // We just accept the result here try { @@ -172,7 +169,6 @@ public function onUserAuthenticate($credentials, $options, &$response) } break; - } default: // Unsupported configuration diff --git a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php index e29cc9b41863e..171d1ca886bc0 100644 --- a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php +++ b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php @@ -1,4 +1,5 @@ app->getIdentity(); - $language = $this->app->getLanguage(); - $doc = $this->app->getDocument(); - $id = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id); - $nameGroup = explode('[', preg_replace('/\[\]|\]/', '', $name)); - $fieldName = end($nameGroup); - $scriptOptions = []; - $externalPlugins = []; - $options = $doc->getScriptOptions('plg_editor_tinymce'); - $theme = 'silver'; - - // Data object for the layout - $textarea = new stdClass; - $textarea->name = $name; - $textarea->id = $id; - $textarea->class = 'mce_editable joomla-editor-tinymce'; - $textarea->cols = $col; - $textarea->rows = $row; - $textarea->width = is_numeric($width) ? $width . 'px' : $width; - $textarea->height = is_numeric($height) ? $height . 'px' : $height; - $textarea->content = $content; - $textarea->readonly = !empty($params['readonly']); - - // Render Editor markup - $editor = '
'; - $editor .= LayoutHelper::render('joomla.tinymce.textarea', $textarea); - $editor .= !$this->app->client->mobile ? LayoutHelper::render('joomla.tinymce.togglebutton') : ''; - $editor .= '
'; - - // Prepare the instance specific options - if (empty($options['tinyMCE'][$fieldName])) - { - $options['tinyMCE'][$fieldName] = []; - } - - // Width and height - if ($width && empty($options['tinyMCE'][$fieldName]['width'])) - { - $options['tinyMCE'][$fieldName]['width'] = $width; - } - - if ($height && empty($options['tinyMCE'][$fieldName]['height'])) - { - $options['tinyMCE'][$fieldName]['height'] = $height; - } - - // Set editor to readonly mode - if (!empty($params['readonly'])) - { - $options['tinyMCE'][$fieldName]['readonly'] = 1; - } - - // The ext-buttons - if (empty($options['tinyMCE'][$fieldName]['joomlaExtButtons'])) - { - $btns = $this->tinyButtons($id, $buttons); - - $options['tinyMCE'][$fieldName]['joomlaMergeDefaults'] = true; - $options['tinyMCE'][$fieldName]['joomlaExtButtons'] = $btns; - } - - $doc->addScriptOptions('plg_editor_tinymce', $options, false); - // Setup Default (common) options for the Editor script - - // Check whether we already have them - if (!empty($options['tinyMCE']['default'])) - { - return $editor; - } - - $ugroups = array_combine($user->getAuthorisedGroups(), $user->getAuthorisedGroups()); - - // Prepare the parameters - $levelParams = new Registry; - $extraOptions = new stdClass; - $toolbarParams = new stdClass; - $extraOptionsAll = (array) $this->params->get('configuration.setoptions', []); - $toolbarParamsAll = (array) $this->params->get('configuration.toolbars', []); - - // Sort the array in reverse, so the items with lowest access level goes first - krsort($extraOptionsAll); - - // Get configuration depend from User group - foreach ($extraOptionsAll as $set => $val) - { - $val = (object) $val; - $val->access = empty($val->access) ? [] : $val->access; - - // Check whether User in one of allowed group - foreach ($val->access as $group) - { - if (isset($ugroups[$group])) - { - $extraOptions = $val; - $toolbarParams = (object) $toolbarParamsAll[$set]; - } - } - } - - // load external plugins - if (isset($extraOptions->external_plugins) && $extraOptions->external_plugins) - { - foreach (json_decode(json_encode($extraOptions->external_plugins), true) as $external) - { - // get the path for readability - $path = $external['path']; - - // if we have a name and path, add it to the list - if ($external['name'] != '' && $path != '') - { - $externalPlugins[$external['name']] = substr($path, 0, 1) == '/' ? Uri::root() . substr($path, 1) : $path; - } - } - } - - // Merge the params - $levelParams->loadObject($toolbarParams); - $levelParams->loadObject($extraOptions); - - // Set the selected skin - $skin = $levelParams->get($this->app->isClient('administrator') ? 'skin_admin' : 'skin', 'oxide'); - - // Check that selected skin exists. - $skin = Folder::exists(JPATH_ROOT . '/media/vendor/tinymce/skins/ui/' . $skin) ? $skin : 'oxide'; - - if (!$levelParams->get('lang_mode', 1)) - { - // Admin selected language - $langPrefix = $levelParams->get('lang_code', 'en'); - } - else - { - // Reflect the current language - if (file_exists(JPATH_ROOT . '/media/vendor/tinymce/langs/' . $language->getTag() . '.js')) - { - $langPrefix = $language->getTag(); - } - elseif (file_exists(JPATH_ROOT . '/media/vendor/tinymce/langs/' . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . '.js')) - { - $langPrefix = substr($language->getTag(), 0, strpos($language->getTag(), '-')); - } - else - { - $langPrefix = 'en'; - } - } - - $use_content_css = $levelParams->get('content_css', 1); - $content_css_custom = $levelParams->get('content_css_custom', ''); - $content_css = null; - - // Loading of css file for 'styles' dropdown - if ($content_css_custom) - { - /** - * If URL, just pass it to $content_css - * else, assume it is a file name in the current template folder - */ - $content_css = strpos($content_css_custom, 'http') !== false - ? $content_css_custom - : $this->includeRelativeFiles('css', $content_css_custom); - } - else - { - // Process when use_content_css is Yes and no custom file given - $content_css = $use_content_css ? $this->includeRelativeFiles('css', 'editor' . (JDEBUG ? '' : '.min') . '.css') : $content_css; - } - - $ignore_filter = false; - - // Text filtering - if ($levelParams->get('use_config_textfilters', 0)) - { - // Use filters from com_config - $filter = static::getGlobalFilters($user); - $ignore_filter = $filter === false; - $blockedTags = !empty($filter->blockedTags) ? $filter->blockedTags : []; - $blockedAttributes = !empty($filter->blockedAttributes) ? $filter->blockedAttributes : []; - $tagArray = !empty($filter->tagsArray) ? $filter->tagsArray : []; - $attrArray = !empty($filter->attrArray) ? $filter->attrArray : []; - $invalid_elements = implode(',', array_merge($blockedTags, $blockedAttributes, $tagArray, $attrArray)); - - // Valid elements are all entries listed as allowed in com_config, which are now missing in the filter blocked properties - $default_filter = InputFilter::getInstance(); - $valid_elements = implode(',', array_diff($default_filter->blockedTags, $blockedTags)); - - $extended_elements = ''; - } - else - { - // Use filters from TinyMCE params - $invalid_elements = trim($levelParams->get('invalid_elements', 'script,applet,iframe')); - $extended_elements = trim($levelParams->get('extended_elements', '')); - $valid_elements = trim($levelParams->get('valid_elements', '')); - } - - // The param is true for vertical resizing only, false or both - $resizing = (bool) $levelParams->get('resizing', true); - $resize_horizontal = (bool) $levelParams->get('resize_horizontal', true); - - if ($resizing && $resize_horizontal) - { - $resizing = 'both'; - } - - // Set of always available plugins - $plugins = [ - 'autolink', - 'lists', - 'importcss', - 'quickbars', - ]; - - // Allowed elements - $elements = [ - 'hr[id|title|alt|class|width|size|noshade]', - ]; - $elements = $extended_elements ? array_merge($elements, explode(',', $extended_elements)) : $elements; - - // Prepare the toolbar/menubar - $knownButtons = static::getKnownButtons(); - - // Check if there no value at all - if (!$levelParams->get('menu') && !$levelParams->get('toolbar1') && !$levelParams->get('toolbar2')) - { - // Get from preset - $presets = static::getToolbarPreset(); - - /** - * Predefine group as: - * Set 0: for Administrator, Editor, Super Users (4,7,8) - * Set 1: for Registered, Manager (2,6), all else are public - */ - switch (true) - { - case isset($ugroups[4]) || isset($ugroups[7]) || isset($ugroups[8]): - $preset = $presets['advanced']; - break; - - case isset($ugroups[2]) || isset($ugroups[6]): - $preset = $presets['medium']; - break; - - default: - $preset = $presets['simple']; - } - - $levelParams->loadArray($preset); - } - - $menubar = (array) $levelParams->get('menu', []); - $toolbar1 = (array) $levelParams->get('toolbar1', []); - $toolbar2 = (array) $levelParams->get('toolbar2', []); - - // Make an easy way to check which button is enabled - $allButtons = array_merge($toolbar1, $toolbar2); - $allButtons = array_combine($allButtons, $allButtons); - - // Check for button-specific plugins - foreach ($allButtons as $btnName) - { - if (!empty($knownButtons[$btnName]['plugin'])) - { - $plugins[] = $knownButtons[$btnName]['plugin']; - } - } - - // Template - $templates = []; - - if (!empty($allButtons['template'])) - { - // Do we have a custom content_template_path - $template_path = $levelParams->get('content_template_path'); - $template_path = $template_path ? '/templates/' . $template_path : '/media/vendor/tinymce/templates'; - - $filepaths = Folder::exists(JPATH_ROOT . $template_path) - ? Folder::files(JPATH_ROOT . $template_path, '\.(html|txt)$', false, true) - : []; - - foreach ($filepaths as $filepath) - { - $fileinfo = pathinfo($filepath); - $filename = $fileinfo['filename']; - $full_filename = $fileinfo['basename']; - - if ($filename === 'index') - { - continue; - } - - $title = $filename; - $title_upper = strtoupper($filename); - $description = ' '; - - if ($language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE')) - { - $title = Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE'); - } - - if ($language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC')) - { - $description = Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC'); - } - - $templates[] = [ - 'title' => $title, - 'description' => $description, - 'url' => Uri::root(true) . $template_path . '/' . $full_filename, - ]; - } - } - - // Check for extra plugins, from the setoptions form - foreach (['wordcount' => 1, 'advlist' => 1, 'autosave' => 1, 'textpattern' => 0] as $pName => $def) - { - if ($levelParams->get($pName, $def)) - { - $plugins[] = $pName; - } - } - - // Use CodeMirror in the code view instead of plain text to provide syntax highlighting - if ($levelParams->get('sourcecode', 1)) - { - $externalPlugins['highlightPlus'] = HTMLHelper::_('script', 'plg_editors_tinymce/plugins/highlighter/plugin-es5.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true]); - } - - $dragdrop = $levelParams->get('drag_drop', 1); - - if ($dragdrop && $user->authorise('core.create', 'com_media')) - { - $externalPlugins['jdragndrop'] = HTMLHelper::_('script', 'plg_editors_tinymce/plugins/dragdrop/plugin.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true]); - $uploadUrl = Uri::base(false) . 'index.php?option=com_media&format=json&url=1&task=api.files'; - $uploadUrl = $this->app->isClient('site') ? htmlentities($uploadUrl, ENT_NOQUOTES, 'UTF-8', false) : $uploadUrl; - - Text::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER'); - Text::script('ERROR'); - Text::script('PLG_TINY_DND_ADDITIONALDATA'); - Text::script('PLG_TINY_DND_ALTTEXT'); - Text::script('PLG_TINY_DND_LAZYLOADED'); - Text::script('PLG_TINY_DND_EMPTY_ALT'); - - $scriptOptions['parentUploadFolder'] = $levelParams->get('path', ''); - $scriptOptions['csrfToken'] = Session::getFormToken(); - $scriptOptions['uploadUri'] = $uploadUrl; - - // @TODO have a way to select the adapter, similar to $levelParams->get('path', ''); - $scriptOptions['comMediaAdapter'] = 'local-images:'; - } - - // Convert pt to px in dropdown - $scriptOptions['fontsize_formats'] = '8px 10px 12px 14px 18px 24px 36px'; - - // select the languages for the "language of parts" menu - if (isset($extraOptions->content_languages) && $extraOptions->content_languages) - { - foreach (json_decode(json_encode($extraOptions->content_languages), true) as $content_language) - { - // if we have a language name and a language code then add to the menu - if ($content_language['content_language_name'] != '' && $content_language['content_language_code'] != '') - { - $ctemp[] = array('title' => $content_language['content_language_name'], 'code' => $content_language['content_language_code']); - } - } - $scriptOptions['content_langs'] = array_merge($ctemp); - } - - // User custom plugins and buttons - $custom_plugin = trim($levelParams->get('custom_plugin', '')); - $custom_button = trim($levelParams->get('custom_button', '')); - - if ($custom_plugin) - { - $plugins = array_merge($plugins, explode(strpos($custom_plugin, ',') !== false ? ',' : ' ', $custom_plugin)); - } - - if ($custom_button) - { - $toolbar1 = array_merge($toolbar1, explode(strpos($custom_button, ',') !== false ? ',' : ' ', $custom_button)); - } - - // Merge the two toolbars for backwards compatibility - $toolbar = array_merge($toolbar1, $toolbar2); - - // Build the final options set - $scriptOptions = array_merge( - $scriptOptions, - [ - 'deprecation_warnings' => JDEBUG ? true : false, - 'suffix' => JDEBUG ? '' : '.min', - 'baseURL' => Uri::root(true) . '/media/vendor/tinymce', - 'directionality' => $language->isRtl() ? 'rtl' : 'ltr', - 'language' => $langPrefix, - 'autosave_restore_when_empty' => false, - 'skin' => $skin, - 'theme' => $theme, - 'schema' => 'html5', - - // Toolbars - 'menubar' => empty($menubar) ? false : implode(' ', array_unique($menubar)), - 'toolbar' => empty($toolbar) ? null : 'jxtdbuttons ' . implode(' ', $toolbar), - - 'plugins' => implode(',', array_unique($plugins)), - - // Quickbars - 'quickbars_image_toolbar' => false, - 'quickbars_insert_toolbar' => false, - 'quickbars_selection_toolbar' => 'bold italic underline | H2 H3 | link blockquote', - - // Cleanup/Output - 'browser_spellcheck' => true, - 'entity_encoding' => $levelParams->get('entity_encoding', 'raw'), - 'verify_html' => !$ignore_filter, - 'paste_as_text' => (bool) $levelParams->get('paste_as_text', false), - - 'valid_elements' => $valid_elements, - 'extended_valid_elements' => implode(',', $elements), - 'invalid_elements' => $invalid_elements, - - // URL - 'relative_urls' => (bool) $levelParams->get('relative_urls', true), - 'remove_script_host' => false, - - // Drag and drop Images always FALSE, reverting this allows for inlining the images - 'paste_data_images' => false, - - // Layout - 'content_css' => $content_css, - 'document_base_url' => Uri::root(true) . '/', - 'image_caption' => true, - 'importcss_append' => true, - 'height' => $this->params->get('html_height', '550px'), - 'width' => $this->params->get('html_width', ''), - 'elementpath' => (bool) $levelParams->get('element_path', true), - 'resize' => $resizing, - 'templates' => $templates, - 'external_plugins' => empty($externalPlugins) ? null : $externalPlugins, - 'contextmenu' => (bool) $levelParams->get('contextmenu', true) ? null : false, - 'toolbar_sticky' => true, - 'toolbar_mode' => $levelParams->get('toolbar_mode', 'sliding'), - - // Image plugin options - 'a11y_advanced_options' => true, - 'image_advtab' => (bool) $levelParams->get('image_advtab', false), - 'image_title' => true, - - // Drag and drop specific - 'dndEnabled' => $dragdrop, - - // Disable TinyMCE Branding - 'branding' => false, - ] - ); - - if ($levelParams->get('newlines')) - { - // Break - $scriptOptions['force_br_newlines'] = true; - $scriptOptions['forced_root_block'] = ''; - } - else - { - // Paragraph - $scriptOptions['force_br_newlines'] = false; - $scriptOptions['forced_root_block'] = 'p'; - } - - $scriptOptions['rel_list'] = [ - ['title' => 'None', 'value' => ''], - ['title' => 'Alternate', 'value' => 'alternate'], - ['title' => 'Author', 'value' => 'author'], - ['title' => 'Bookmark', 'value' => 'bookmark'], - ['title' => 'Help', 'value' => 'help'], - ['title' => 'License', 'value' => 'license'], - ['title' => 'Lightbox', 'value' => 'lightbox'], - ['title' => 'Next', 'value' => 'next'], - ['title' => 'No Follow', 'value' => 'nofollow'], - ['title' => 'No Referrer', 'value' => 'noreferrer'], - ['title' => 'Prefetch', 'value' => 'prefetch'], - ['title' => 'Prev', 'value' => 'prev'], - ['title' => 'Search', 'value' => 'search'], - ['title' => 'Tag', 'value' => 'tag'], - ]; - - $scriptOptions['style_formats'] = [ - [ - 'title' => Text::_('PLG_TINY_MENU_CONTAINER'), - 'items' => [ - ['title' => 'article', 'block' => 'article', 'wrapper' => true, 'merge_siblings' => false], - ['title' => 'aside', 'block' => 'aside', 'wrapper' => true, 'merge_siblings' => false], - ['title' => 'section', 'block' => 'section', 'wrapper' => true, 'merge_siblings' => false], - ], - ], - ]; - - $scriptOptions['style_formats_merge'] = true; - $options['tinyMCE']['default'] = $scriptOptions; - - $doc->addScriptOptions('plg_editor_tinymce', $options); - - return $editor; - } + use GlobalFilters; + use KnownButtons; + use ResolveFiles; + use ToolbarPresets; + use XTDButtons; + + /** + * Display the editor area. + * + * @param string $name The name of the editor area. + * @param string $content The content of the field. + * @param string $width The width of the editor area. + * @param string $height The height of the editor area. + * @param int $col The number of columns for the editor area. + * @param int $row The number of rows for the editor area. + * @param boolean $buttons True and the editor buttons will be displayed. + * @param string $id An optional ID for the textarea. If not supplied the name is used. + * @param string $asset The object asset + * @param object $author The author. + * @param array $params Associative array of editor parameters. + * + * @return string + */ + public function onDisplay( + $name, + $content, + $width, + $height, + $col, + $row, + $buttons = true, + $id = null, + $asset = null, + $author = null, + $params = [] + ) { + $id = empty($id) ? $name : $id; + $user = $this->app->getIdentity(); + $language = $this->app->getLanguage(); + $doc = $this->app->getDocument(); + $id = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id); + $nameGroup = explode('[', preg_replace('/\[\]|\]/', '', $name)); + $fieldName = end($nameGroup); + $scriptOptions = []; + $externalPlugins = []; + $options = $doc->getScriptOptions('plg_editor_tinymce'); + $theme = 'silver'; + + // Data object for the layout + $textarea = new stdClass(); + $textarea->name = $name; + $textarea->id = $id; + $textarea->class = 'mce_editable joomla-editor-tinymce'; + $textarea->cols = $col; + $textarea->rows = $row; + $textarea->width = is_numeric($width) ? $width . 'px' : $width; + $textarea->height = is_numeric($height) ? $height . 'px' : $height; + $textarea->content = $content; + $textarea->readonly = !empty($params['readonly']); + + // Render Editor markup + $editor = '
'; + $editor .= LayoutHelper::render('joomla.tinymce.textarea', $textarea); + $editor .= !$this->app->client->mobile ? LayoutHelper::render('joomla.tinymce.togglebutton') : ''; + $editor .= '
'; + + // Prepare the instance specific options + if (empty($options['tinyMCE'][$fieldName])) { + $options['tinyMCE'][$fieldName] = []; + } + + // Width and height + if ($width && empty($options['tinyMCE'][$fieldName]['width'])) { + $options['tinyMCE'][$fieldName]['width'] = $width; + } + + if ($height && empty($options['tinyMCE'][$fieldName]['height'])) { + $options['tinyMCE'][$fieldName]['height'] = $height; + } + + // Set editor to readonly mode + if (!empty($params['readonly'])) { + $options['tinyMCE'][$fieldName]['readonly'] = 1; + } + + // The ext-buttons + if (empty($options['tinyMCE'][$fieldName]['joomlaExtButtons'])) { + $btns = $this->tinyButtons($id, $buttons); + + $options['tinyMCE'][$fieldName]['joomlaMergeDefaults'] = true; + $options['tinyMCE'][$fieldName]['joomlaExtButtons'] = $btns; + } + + $doc->addScriptOptions('plg_editor_tinymce', $options, false); + // Setup Default (common) options for the Editor script + + // Check whether we already have them + if (!empty($options['tinyMCE']['default'])) { + return $editor; + } + + $ugroups = array_combine($user->getAuthorisedGroups(), $user->getAuthorisedGroups()); + + // Prepare the parameters + $levelParams = new Registry(); + $extraOptions = new stdClass(); + $toolbarParams = new stdClass(); + $extraOptionsAll = (array) $this->params->get('configuration.setoptions', []); + $toolbarParamsAll = (array) $this->params->get('configuration.toolbars', []); + + // Sort the array in reverse, so the items with lowest access level goes first + krsort($extraOptionsAll); + + // Get configuration depend from User group + foreach ($extraOptionsAll as $set => $val) { + $val = (object) $val; + $val->access = empty($val->access) ? [] : $val->access; + + // Check whether User in one of allowed group + foreach ($val->access as $group) { + if (isset($ugroups[$group])) { + $extraOptions = $val; + $toolbarParams = (object) $toolbarParamsAll[$set]; + } + } + } + + // load external plugins + if (isset($extraOptions->external_plugins) && $extraOptions->external_plugins) { + foreach (json_decode(json_encode($extraOptions->external_plugins), true) as $external) { + // get the path for readability + $path = $external['path']; + + // if we have a name and path, add it to the list + if ($external['name'] != '' && $path != '') { + $externalPlugins[$external['name']] = substr($path, 0, 1) == '/' ? Uri::root() . substr($path, 1) : $path; + } + } + } + + // Merge the params + $levelParams->loadObject($toolbarParams); + $levelParams->loadObject($extraOptions); + + // Set the selected skin + $skin = $levelParams->get($this->app->isClient('administrator') ? 'skin_admin' : 'skin', 'oxide'); + + // Check that selected skin exists. + $skin = Folder::exists(JPATH_ROOT . '/media/vendor/tinymce/skins/ui/' . $skin) ? $skin : 'oxide'; + + if (!$levelParams->get('lang_mode', 1)) { + // Admin selected language + $langPrefix = $levelParams->get('lang_code', 'en'); + } else { + // Reflect the current language + if (file_exists(JPATH_ROOT . '/media/vendor/tinymce/langs/' . $language->getTag() . '.js')) { + $langPrefix = $language->getTag(); + } elseif (file_exists(JPATH_ROOT . '/media/vendor/tinymce/langs/' . substr($language->getTag(), 0, strpos($language->getTag(), '-')) . '.js')) { + $langPrefix = substr($language->getTag(), 0, strpos($language->getTag(), '-')); + } else { + $langPrefix = 'en'; + } + } + + $use_content_css = $levelParams->get('content_css', 1); + $content_css_custom = $levelParams->get('content_css_custom', ''); + $content_css = null; + + // Loading of css file for 'styles' dropdown + if ($content_css_custom) { + /** + * If URL, just pass it to $content_css + * else, assume it is a file name in the current template folder + */ + $content_css = strpos($content_css_custom, 'http') !== false + ? $content_css_custom + : $this->includeRelativeFiles('css', $content_css_custom); + } else { + // Process when use_content_css is Yes and no custom file given + $content_css = $use_content_css ? $this->includeRelativeFiles('css', 'editor' . (JDEBUG ? '' : '.min') . '.css') : $content_css; + } + + $ignore_filter = false; + + // Text filtering + if ($levelParams->get('use_config_textfilters', 0)) { + // Use filters from com_config + $filter = static::getGlobalFilters($user); + $ignore_filter = $filter === false; + $blockedTags = !empty($filter->blockedTags) ? $filter->blockedTags : []; + $blockedAttributes = !empty($filter->blockedAttributes) ? $filter->blockedAttributes : []; + $tagArray = !empty($filter->tagsArray) ? $filter->tagsArray : []; + $attrArray = !empty($filter->attrArray) ? $filter->attrArray : []; + $invalid_elements = implode(',', array_merge($blockedTags, $blockedAttributes, $tagArray, $attrArray)); + + // Valid elements are all entries listed as allowed in com_config, which are now missing in the filter blocked properties + $default_filter = InputFilter::getInstance(); + $valid_elements = implode(',', array_diff($default_filter->blockedTags, $blockedTags)); + + $extended_elements = ''; + } else { + // Use filters from TinyMCE params + $invalid_elements = trim($levelParams->get('invalid_elements', 'script,applet,iframe')); + $extended_elements = trim($levelParams->get('extended_elements', '')); + $valid_elements = trim($levelParams->get('valid_elements', '')); + } + + // The param is true for vertical resizing only, false or both + $resizing = (bool) $levelParams->get('resizing', true); + $resize_horizontal = (bool) $levelParams->get('resize_horizontal', true); + + if ($resizing && $resize_horizontal) { + $resizing = 'both'; + } + + // Set of always available plugins + $plugins = [ + 'autolink', + 'lists', + 'importcss', + 'quickbars', + ]; + + // Allowed elements + $elements = [ + 'hr[id|title|alt|class|width|size|noshade]', + ]; + $elements = $extended_elements ? array_merge($elements, explode(',', $extended_elements)) : $elements; + + // Prepare the toolbar/menubar + $knownButtons = static::getKnownButtons(); + + // Check if there no value at all + if (!$levelParams->get('menu') && !$levelParams->get('toolbar1') && !$levelParams->get('toolbar2')) { + // Get from preset + $presets = static::getToolbarPreset(); + + /** + * Predefine group as: + * Set 0: for Administrator, Editor, Super Users (4,7,8) + * Set 1: for Registered, Manager (2,6), all else are public + */ + switch (true) { + case isset($ugroups[4]) || isset($ugroups[7]) || isset($ugroups[8]): + $preset = $presets['advanced']; + break; + + case isset($ugroups[2]) || isset($ugroups[6]): + $preset = $presets['medium']; + break; + + default: + $preset = $presets['simple']; + } + + $levelParams->loadArray($preset); + } + + $menubar = (array) $levelParams->get('menu', []); + $toolbar1 = (array) $levelParams->get('toolbar1', []); + $toolbar2 = (array) $levelParams->get('toolbar2', []); + + // Make an easy way to check which button is enabled + $allButtons = array_merge($toolbar1, $toolbar2); + $allButtons = array_combine($allButtons, $allButtons); + + // Check for button-specific plugins + foreach ($allButtons as $btnName) { + if (!empty($knownButtons[$btnName]['plugin'])) { + $plugins[] = $knownButtons[$btnName]['plugin']; + } + } + + // Template + $templates = []; + + if (!empty($allButtons['template'])) { + // Do we have a custom content_template_path + $template_path = $levelParams->get('content_template_path'); + $template_path = $template_path ? '/templates/' . $template_path : '/media/vendor/tinymce/templates'; + + $filepaths = Folder::exists(JPATH_ROOT . $template_path) + ? Folder::files(JPATH_ROOT . $template_path, '\.(html|txt)$', false, true) + : []; + + foreach ($filepaths as $filepath) { + $fileinfo = pathinfo($filepath); + $filename = $fileinfo['filename']; + $full_filename = $fileinfo['basename']; + + if ($filename === 'index') { + continue; + } + + $title = $filename; + $title_upper = strtoupper($filename); + $description = ' '; + + if ($language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE')) { + $title = Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_TITLE'); + } + + if ($language->hasKey('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC')) { + $description = Text::_('PLG_TINY_TEMPLATE_' . $title_upper . '_DESC'); + } + + $templates[] = [ + 'title' => $title, + 'description' => $description, + 'url' => Uri::root(true) . $template_path . '/' . $full_filename, + ]; + } + } + + // Check for extra plugins, from the setoptions form + foreach (['wordcount' => 1, 'advlist' => 1, 'autosave' => 1, 'textpattern' => 0] as $pName => $def) { + if ($levelParams->get($pName, $def)) { + $plugins[] = $pName; + } + } + + // Use CodeMirror in the code view instead of plain text to provide syntax highlighting + if ($levelParams->get('sourcecode', 1)) { + $externalPlugins['highlightPlus'] = HTMLHelper::_('script', 'plg_editors_tinymce/plugins/highlighter/plugin-es5.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true]); + } + + $dragdrop = $levelParams->get('drag_drop', 1); + + if ($dragdrop && $user->authorise('core.create', 'com_media')) { + $externalPlugins['jdragndrop'] = HTMLHelper::_('script', 'plg_editors_tinymce/plugins/dragdrop/plugin.min.js', ['relative' => true, 'version' => 'auto', 'pathOnly' => true]); + $uploadUrl = Uri::base(false) . 'index.php?option=com_media&format=json&url=1&task=api.files'; + $uploadUrl = $this->app->isClient('site') ? htmlentities($uploadUrl, ENT_NOQUOTES, 'UTF-8', false) : $uploadUrl; + + Text::script('PLG_TINY_ERR_UNSUPPORTEDBROWSER'); + Text::script('ERROR'); + Text::script('PLG_TINY_DND_ADDITIONALDATA'); + Text::script('PLG_TINY_DND_ALTTEXT'); + Text::script('PLG_TINY_DND_LAZYLOADED'); + Text::script('PLG_TINY_DND_EMPTY_ALT'); + + $scriptOptions['parentUploadFolder'] = $levelParams->get('path', ''); + $scriptOptions['csrfToken'] = Session::getFormToken(); + $scriptOptions['uploadUri'] = $uploadUrl; + + // @TODO have a way to select the adapter, similar to $levelParams->get('path', ''); + $scriptOptions['comMediaAdapter'] = 'local-images:'; + } + + // Convert pt to px in dropdown + $scriptOptions['fontsize_formats'] = '8px 10px 12px 14px 18px 24px 36px'; + + // select the languages for the "language of parts" menu + if (isset($extraOptions->content_languages) && $extraOptions->content_languages) { + foreach (json_decode(json_encode($extraOptions->content_languages), true) as $content_language) { + // if we have a language name and a language code then add to the menu + if ($content_language['content_language_name'] != '' && $content_language['content_language_code'] != '') { + $ctemp[] = array('title' => $content_language['content_language_name'], 'code' => $content_language['content_language_code']); + } + } + $scriptOptions['content_langs'] = array_merge($ctemp); + } + + // User custom plugins and buttons + $custom_plugin = trim($levelParams->get('custom_plugin', '')); + $custom_button = trim($levelParams->get('custom_button', '')); + + if ($custom_plugin) { + $plugins = array_merge($plugins, explode(strpos($custom_plugin, ',') !== false ? ',' : ' ', $custom_plugin)); + } + + if ($custom_button) { + $toolbar1 = array_merge($toolbar1, explode(strpos($custom_button, ',') !== false ? ',' : ' ', $custom_button)); + } + + // Merge the two toolbars for backwards compatibility + $toolbar = array_merge($toolbar1, $toolbar2); + + // Build the final options set + $scriptOptions = array_merge( + $scriptOptions, + [ + 'deprecation_warnings' => JDEBUG ? true : false, + 'suffix' => JDEBUG ? '' : '.min', + 'baseURL' => Uri::root(true) . '/media/vendor/tinymce', + 'directionality' => $language->isRtl() ? 'rtl' : 'ltr', + 'language' => $langPrefix, + 'autosave_restore_when_empty' => false, + 'skin' => $skin, + 'theme' => $theme, + 'schema' => 'html5', + + // Toolbars + 'menubar' => empty($menubar) ? false : implode(' ', array_unique($menubar)), + 'toolbar' => empty($toolbar) ? null : 'jxtdbuttons ' . implode(' ', $toolbar), + + 'plugins' => implode(',', array_unique($plugins)), + + // Quickbars + 'quickbars_image_toolbar' => false, + 'quickbars_insert_toolbar' => false, + 'quickbars_selection_toolbar' => 'bold italic underline | H2 H3 | link blockquote', + + // Cleanup/Output + 'browser_spellcheck' => true, + 'entity_encoding' => $levelParams->get('entity_encoding', 'raw'), + 'verify_html' => !$ignore_filter, + 'paste_as_text' => (bool) $levelParams->get('paste_as_text', false), + + 'valid_elements' => $valid_elements, + 'extended_valid_elements' => implode(',', $elements), + 'invalid_elements' => $invalid_elements, + + // URL + 'relative_urls' => (bool) $levelParams->get('relative_urls', true), + 'remove_script_host' => false, + + // Drag and drop Images always FALSE, reverting this allows for inlining the images + 'paste_data_images' => false, + + // Layout + 'content_css' => $content_css, + 'document_base_url' => Uri::root(true) . '/', + 'image_caption' => true, + 'importcss_append' => true, + 'height' => $this->params->get('html_height', '550px'), + 'width' => $this->params->get('html_width', ''), + 'elementpath' => (bool) $levelParams->get('element_path', true), + 'resize' => $resizing, + 'templates' => $templates, + 'external_plugins' => empty($externalPlugins) ? null : $externalPlugins, + 'contextmenu' => (bool) $levelParams->get('contextmenu', true) ? null : false, + 'toolbar_sticky' => true, + 'toolbar_mode' => $levelParams->get('toolbar_mode', 'sliding'), + + // Image plugin options + 'a11y_advanced_options' => true, + 'image_advtab' => (bool) $levelParams->get('image_advtab', false), + 'image_title' => true, + + // Drag and drop specific + 'dndEnabled' => $dragdrop, + + // Disable TinyMCE Branding + 'branding' => false, + ] + ); + + if ($levelParams->get('newlines')) { + // Break + $scriptOptions['force_br_newlines'] = true; + $scriptOptions['forced_root_block'] = ''; + } else { + // Paragraph + $scriptOptions['force_br_newlines'] = false; + $scriptOptions['forced_root_block'] = 'p'; + } + + $scriptOptions['rel_list'] = [ + ['title' => 'None', 'value' => ''], + ['title' => 'Alternate', 'value' => 'alternate'], + ['title' => 'Author', 'value' => 'author'], + ['title' => 'Bookmark', 'value' => 'bookmark'], + ['title' => 'Help', 'value' => 'help'], + ['title' => 'License', 'value' => 'license'], + ['title' => 'Lightbox', 'value' => 'lightbox'], + ['title' => 'Next', 'value' => 'next'], + ['title' => 'No Follow', 'value' => 'nofollow'], + ['title' => 'No Referrer', 'value' => 'noreferrer'], + ['title' => 'Prefetch', 'value' => 'prefetch'], + ['title' => 'Prev', 'value' => 'prev'], + ['title' => 'Search', 'value' => 'search'], + ['title' => 'Tag', 'value' => 'tag'], + ]; + + $scriptOptions['style_formats'] = [ + [ + 'title' => Text::_('PLG_TINY_MENU_CONTAINER'), + 'items' => [ + ['title' => 'article', 'block' => 'article', 'wrapper' => true, 'merge_siblings' => false], + ['title' => 'aside', 'block' => 'aside', 'wrapper' => true, 'merge_siblings' => false], + ['title' => 'section', 'block' => 'section', 'wrapper' => true, 'merge_siblings' => false], + ], + ], + ]; + + $scriptOptions['style_formats_merge'] = true; + $options['tinyMCE']['default'] = $scriptOptions; + + $doc->addScriptOptions('plg_editor_tinymce', $options); + + return $editor; + } }