-
- Downloads
[BUGFIX] Fix locales related warning
-
Da gehört noch mehr geändert. Habe mal alles für Typo3 7.0 upgedated ;-) Sorry, dass ich es so poste, aber wollte jetzt nicht noch ssh einrichten um ein pull request zu machen. (I hope you are german otherwise i just in formed you about an update for your extension. I updated everything.)
<?php /*************************************************************** * Copyright notice * * (c) sgalinski Internet Services (http://www.sgalinski.de) * * All rights reserved * * This script is part of the TYPO3 project. The TYPO3 project is * free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * The GNU General Public License can be found at * http://www.gnu.org/copyleft/gpl.html. * * This script is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ /** * tinyMCE initialisation class * * Usage: * $tinyMCE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tinyMCE'); * $tinyMCE->loadConfiguration($configuration); * $javascript = $tinyMCE->getJS(); * * Basic Configuration: * * tinymce.init({ * selector: 'textarea' * }); */ class tinyMCE { /** * TinyMCE configuration * * @var array */ protected $tinymceConfiguration = array(); /** * Initialization flag * * @var bool */ static protected $init = FALSE; /** * @param string $configuration file reference or configuration string (defaults to basic configuration) * @param boolean $forceLanguage set this to true if you want to force your language set by the configuration * @return void */ public function loadConfiguration($configuration = '', $forceLanguage = FALSE) { self::$init = FALSE; $this->tinymceConfiguration = $this->prepareTinyMCEConfiguration($configuration); if (!$forceLanguage) { $this->setLanguage(); } } /** * Calculates and sets the current language * * @return void */ protected function setLanguage() { /** @var $languageInstance language */ $languageInstance = (TYPO3_MODE === 'FE' ? $GLOBALS['TSFE'] : $GLOBALS['LANG']); $languageKey = $languageInstance->lang; $groupOrUserProps = \TYPO3\CMS\Backend\Utility\BackendUtility::getModTSconfig('', 'tx_tinyMCE'); if (trim($groupOrUserProps['properties']['prefLang']) !== '') { $languageKey = $groupOrUserProps['properties']['prefLang']; } // language conversion from TLD to iso631 if (class_exists('TYPO3\CMS\Core\Localization\Locales')) { /** @var $locales TYPO3\CMS\Core\Localization\Locales */ $locales = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Core\Localization\Locales'); $isoArray = $locales->getIsoMapping(); } else { $isoArray = $languageInstance->csConvObj->isoArray; } if (array_key_exists($languageKey, $isoArray)) { $languageKey = $isoArray[$languageKey]; } $languageFile = PATH_site . TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath('tinymce') . 'tinymce/langs/' . $languageKey . '.js'; if (!is_file($languageFile)) { $languageKey = 'en'; } $this->addConfigurationOption('language', $languageKey); } /** * Returns a file that contains the tinymce configuration * * @param bool $loadConfigurationWithTimer useful in relation with AJAX * @return string */ protected function getConfiguration($loadConfigurationWithTimer = FALSE) { // $configurationOptions = array(); // foreach ($this->tinymceConfiguration['strings'] as $option => $value) { // $value = '\'' . str_replace('\'', '\\\'', $value) . '\''; // $configurationOptions[] = "\t" . $option . ': ' . $value; // } // // foreach ($this->tinymceConfiguration['boolAndInt'] as $option => $value) { // if (is_numeric($value)) { // if (strpos($value, '.')) { // $value = (float) $value; // } else { // $value = (int) $value; // } // } // $configurationOptions[] = "\t" . $option . ': ' . $value; // } // // foreach ($this->tinymceConfiguration['arrays'] as $option => $value) { // $configurationOptions[] = "\t" . $option . ': ' . $value; // } // // foreach ($this->tinymceConfiguration['objects'] as $option => $value) { // $configurationOptions[] = "\t" . $option . ': ' . $value; // } // // foreach ($this->tinymceConfiguration['functions'] as $option => $value) { // $configurationOptions[] = "\t" . $option . ': ' . $value; // } // $configuration .= implode(",\n", $configurationOptions); $configuration = $this->tinymceConfiguration['preJS']; $configuration .= ' var executeTinymceInit = function() { if (!window.tinymce || (window.tinymce && !window.tinymce.init)) { return; } window.tinymce.init({ ' . $this->replaceTypo3Paths($this->tinymceConfiguration['configurationData']) . ' }); }; executeTinymceInit(); '; if ($loadConfigurationWithTimer) { $configuration .= 'window.setInterval(executeTinymceInit, 1000);' . "\n"; } $configuration .= $this->tinymceConfiguration['postJS']; $filename = 'tinymceConfiguration' . sha1($configuration) . '.js'; $file = PATH_site . 'typo3temp/' . $filename; if (!is_file($file)) { file_put_contents($file, $configuration); \TYPO3\CMS\Core\Utility\GeneralUtility::fixPermissions($file); } return $this->getPath($file, TRUE); } /** * Returns the needed javascript inclusion code * * Note: This function can only be called once for each loaded configuration. * * @param bool $loadConfigurationWithTimer * @return string */ public function getJS($loadConfigurationWithTimer = FALSE) { $output = ''; if (!self::$init) { self::$init = TRUE; $script = $GLOBALS['BACK_PATH'] . TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('tinymce') . 'tinymce/tinymce.min.js'; $output = '<script type="text/javascript" src="' . $script . '"></script>'; $script = $this->getConfiguration($loadConfigurationWithTimer); $output .= '<script type="text/javascript" src="' . $script . '"></script>'; } return $output; } /** * Loads the required javascript via the given page renderer instance * * @param t3lib_PageRenderer $pageRenderer * @param bool $loadConfigurationWithTimer * @return void */ public function loadJsViaPageRenderer(\TYPO3\CMS\Core\Page\PageRenderer $pageRenderer, $loadConfigurationWithTimer = FALSE) { if (self::$init) { return; } self::$init = TRUE; $script = $GLOBALS['BACK_PATH'] . TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('tinymce') . 'tinymce/tinymce.min.js'; $pageRenderer->addJsLibrary('tinymce', $script, 'text/javascript', FALSE, TRUE, '', TRUE); $script = $this->getConfiguration($loadConfigurationWithTimer); $pageRenderer->addJsFile($script, 'text/javascript', FALSE, TRUE, '', TRUE); } /** * Parses and processes the tinyMCE configuration * * Note: Unfortunately we didn't solved the riddle how to parse object and function blocks. So we can't parse * the configuration in detail. Also the regexp has some other possible minor flaws. Recursion (?R) could be a * possible way. * * @param string $configuration file reference or configuration string * @return array */ protected function prepareTinyMCEConfiguration($configuration) { $configurationArray = array(); // try to resolve a potential TYPO3 file path $configurationFile = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($configuration); if (is_file($configurationFile)) { $configuration = file_get_contents($configurationFile); } // split config into first and last javascript parts (applied later again into the config variables) // additionally the config part is matched to get the options $pattern = '/(.*)tinymce\.init\s*\(\s*\{(.*?)\}\s*\)\s*;?(.*)/is'; preg_match($pattern, $configuration, $matches); // add preJS and postJS $configurationArray['preJS'] = trim($matches[1]); $configurationArray['configurationData'] = trim($matches[2]); $configurationArray['postJS'] = trim($matches[3]); // split options into an array (four value types: values in quotes, int/booleans, arrays, objects, functions) // $pattern = '([^:\[\(\{]+?)\s*:\s*(?:(\[.*?\])|(\{.*\})|(function.*\})|["\']([^"\']*)["|\']\s*|([^,\n]*))[,\n]\n?'; // preg_match_all('/' . $pattern . '/is', $matches[2] . "\n", $options); // for ($i = 0; $i < count($options[1]); ++$i) { // if (trim($options[2][$i]) !== '') { // // array // $configurationArray['arrays'][trim($options[1][$i])] = trim($options[2][$i]); // } elseif (trim($options[3][$i]) !== '') { // // object // $configurationArray['objects'][trim($options[1][$i])] = trim($options[3][$i]); // } elseif (trim($options[4][$i]) !== '') { // // function // $configurationArray['functions'][trim($options[1][$i])] = trim($options[4][$i]); // } elseif (trim($options[6][$i]) !== '') { // // int/bool // $configurationArray['boolAndInt'][trim($options[1][$i])] = trim($options[6][$i]); // } else { // // quoted value (value can be empty) // $configurationArray['strings'][trim($options[1][$i])] = trim($options[5][$i]); // } // } return $configurationArray; } /** * Adds a basic configuration value to the parsed configuration * * @param string $key * @param mixed $value */ public function addConfigurationOption($key, $value) { if (is_numeric($value)) { if (strpos($value, '.')) { $value = (float) $value; } else { $value = (int) $value; } } elseif (strpos(trim($value), '[') === FALSE && strpos(trim($value), '{') === FALSE && strpos(trim($value), 'function') === FALSE ) { $value = '\'' . $value . '\''; } $this->tinymceConfiguration['configurationData'] .= "\n," . $key . ': ' . $value . "\n"; } /** * Replaces any TYPO3 extension path with the domain prefixed one. * * @param string $configuration * @return string */ protected function replaceTypo3Paths($configuration) { $replacementFunction = function ($value) { // getPath should be used, but this causes a php exception with PHP 5.3 as $this isn't set there return '\'' . \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . str_replace(PATH_site, '', \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($value[1])) . '\''; }; return preg_replace_callback('/["\'](EXT:[^"\']*)["\']/is', $replacementFunction, $configuration); } /** * Resolves a relative path like EXT:tinymce/... into an absolute one that contains either the * current host or the path to the file in the file system. * * @param string $relativePath * @param bool $returnWithDomain * @return string */ protected function getPath($relativePath, $returnWithDomain = FALSE) { $finalPath = $absolutePath = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($relativePath); if ($returnWithDomain) { $finalPath = \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_URL') . str_replace(PATH_site, '', $absolutePath); } return $finalPath; } } ?> -
Hallo Stefan,
klar kann ich das. Hier -> https://github.com/Madii/tinymce/commit/affc360a0e0e45d45a165c5b533c2065c742ae50 Mal schauen was ich noch finde
-
Hi Gregor, ich habe jetzt mal die Arbeiten der letzten Tage gepushed. Sind einige tiefgreifende, aber wichtige Anpassungen. :-)
Please register or sign in to comment