Commit 4bbf448d authored by Philipp Nowinski's avatar Philipp Nowinski
Browse files

Merge branch 'bugfix/t38' into 'master'

TYPO3 CMS v8 Support

- Support for TYPO3 7.6 - 8.5.0-dev
- composer.json improvements
- fixed exception (Please review them exactly - it's the first time I'm working with TYPO3 backend modules)
- removed obsolete TER-v1 ext_emconf.php options

I look forward to get some feedback ¯\_(ツ)_/¯

See merge request !10
parents 6a5e4bca 4975e029
......@@ -36,20 +36,10 @@ class AbstractViewHelper extends AbstractBackendViewHelper {
/**
* Returns an instance of the page renderer
*
* @deprecated Implement the following migration if the extension just needs to support > 7.5.
* @return PageRenderer
*/
public function getPageRenderer() {
// Migration
// return $this->objectManager->get(\TYPO3\CMS\Core\Page\PageRenderer::class);
if (TYPO3_MODE === 'BE') {
$pageRenderer = $this->getDocInstance()->getPageRenderer();
} else {
/** @noinspection PhpUndefinedMethodInspection */
$pageRenderer = $GLOBALS['TSFE']->getPageRenderer();
}
return $pageRenderer;
return $this->objectManager->get(\TYPO3\CMS\Core\Page\PageRenderer::class);
}
/**
......@@ -70,4 +60,4 @@ class AbstractViewHelper extends AbstractBackendViewHelper {
}
}
?>
\ No newline at end of file
?>
......@@ -38,7 +38,6 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
*/
public function initializeArguments() {
parent::initializeArguments();
$this->registerArgument('condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE);
$this->registerArgument('or', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE);
$this->registerArgument('or2', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE);
$this->registerArgument('or3', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE);
......@@ -101,4 +100,4 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
}
}
?>
\ No newline at end of file
?>
......@@ -45,7 +45,7 @@ class InlineLanguageLabelsViewHelper extends AbstractViewHelper {
*
* @param string $labels Comma separated list of label keys to include
* @param boolean $htmlEscape
* @return string
* @return void
*/
public function render($labels = '', $htmlEscape = FALSE) {
$extensionName = $this->controllerContext->getRequest()->getControllerExtensionName();
......@@ -57,17 +57,17 @@ class InlineLanguageLabelsViewHelper extends AbstractViewHelper {
$languageArray[$key] = ($htmlEscape ? htmlentities($value) : $value);
}
return '
<script type="text/javascript">
var AY = AY || {};
$javascriptCode = '
var AY = AY || {};
AY.lang = AY.lang || {};
AY.lang.' . $extensionName . ' = AY.lang.' . $extensionName . ' || {};
var languageLabels = ' . json_encode($languageArray) . ';
for (label in languageLabels) {
AY.lang.' . $extensionName . '[label] = languageLabels[label];
}
</script>
';
$this->getPageRenderer()->addJsInlineCode($extensionName, $javascriptCode);
}
}
......
......@@ -102,7 +102,7 @@
<div id="typo3-docbody">
<div id="typo3-inner-docbody">
<f:render section="selectItems" />
<f:flashMessages renderMode="div" />
<f:flashMessages />
<f:render section="main" />
</div>
</div>
......
This diff is collapsed.
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 321.95 321.95"><defs><style>.cls-1{fill:none;}.cls-2{fill:#e8e8e8;}.cls-3{fill:#fff;}.cls-4{fill:#333e48;}.cls-5{fill:#1e252b;}.cls-6{fill:#61b4e4;}.cls-7{fill:#2f6384;}.cls-8{fill:#1b7fbc;}.cls-9{fill:#ceb782;}</style></defs><title>Extension</title><g id="Ebene_2" data-name="Ebene 2"><g id="Layer_1" data-name="Layer 1"><rect class="cls-1" width="321.95" height="321.95"/><polygon class="cls-2" points="4.6 0 189.02 0 273.37 64.21 273.37 321.94 4.6 321.94 4.6 0"/><polygon class="cls-3" points="26.59 26.33 168.35 26.33 168.35 87.63 251.39 87.63 251.39 295.61 26.59 295.61 26.59 26.33"/><path class="cls-4" d="M184.45,112.41H43.53a4.5,4.5,0,0,1,0-9H184.45a4.5,4.5,0,0,1,0,9Z"/><path class="cls-4" d="M206.09,144.76H43.53a4.5,4.5,0,0,1,0-9H206.09a4.5,4.5,0,0,1,0,9Z"/><path class="cls-4" d="M144.52,80.07h-101a4.5,4.5,0,0,1,0-9h101a4.5,4.5,0,0,1,0,9Z"/><path class="cls-4" d="M224.45,177.1H43.53a4.5,4.5,0,0,1,0-9H224.45a4.5,4.5,0,0,1,0,9Z"/><path class="cls-4" d="M218.74,209.45H43.53a4.5,4.5,0,0,1,0-9h175.2a4.5,4.5,0,0,1,0,9Z"/><path class="cls-4" d="M234.45,241.79H43.53a4.5,4.5,0,0,1,0-9H234.45a4.5,4.5,0,0,1,0,9Z"/><path class="cls-4" d="M139,274.14H43.53a4.5,4.5,0,1,1,0-9H139a4.5,4.5,0,0,1,0,9Z"/><path class="cls-5" d="M109.33,285.95c1.73,1.77-.46,6.74-3.57,9.78s-7,4.06-8.76,2.28-.61-5.67,2.5-8.7S107.6,284.17,109.33,285.95Z"/><circle class="cls-6" cx="299.32" cy="54.82" r="22.63" transform="translate(-3.83 28.36) rotate(-5.39)"/><rect class="cls-7" x="84.78" y="133.22" width="261.86" height="45.25" transform="translate(-41.88 222.67) rotate(-50.39)"/><rect class="cls-8" x="84.8" y="147.93" width="261.85" height="15.84" transform="translate(-41.88 222.69) rotate(-50.39)"/><polygon class="cls-9" points="105.31 296.74 97.73 290.46 114.8 242.29 149.67 271.15 105.31 296.74"/></g></g></svg>
\ No newline at end of file
......@@ -6,13 +6,15 @@
"license": ["GPL-2.0+"],
"version": "3.3.3",
"support": {
"issues": "https://forge.typo3.org/projects/extension-lfeditor"
"issues": "https://forge.typo3.org/projects/extension-lfeditor",
"source": "https://gitlab.sgalinski.de/typo3/lfeditor/"
},
"require": {
"typo3/cms-core": "*"
"typo3/cms-core": ">=7.6.12,<8.6.0"
},
"replace": {
"lfeditor": "self.version"
"lfeditor": "self.version",
"typo3-ter/lfeditor": "self.version"
},
"autoload": {
"psr-4": {
......
<?php
/***************************************************************
* Extension Manager/Repository config file for ext "lfeditor".
*
* Auto generated 01-07-2013 06:06
*
* Manual updates:
* Only the data in the array - everything else is removed by next
* writing. "version" and "dependencies" must not be touched!
***************************************************************/
$EM_CONF[$_EXTKEY] = array(
'title' => 'Language File Editor',
'description' => 'This module serves several functions for editing of language files.
......@@ -28,29 +18,18 @@ Following functions are implemented in this module:
* Meta information handling
* Backups, recovering and diff view',
'category' => 'module',
'shy' => 0,
'version' => '3.3.3',
'doNotLoadInFE' => 1,
'dependencies' => '',
'conflicts' => '',
'priority' => '',
'loadOrder' => '',
'module' => '',
'state' => 'stable',
'uploadfolder' => 0,
'createDirs' => '',
'modify_tables' => 'be_users',
'clearcacheonload' => 0,
'lockType' => '',
'author' => 'Stefan Galinski, Damjan Komlenac',
'author_email' => 'stefan@sgalinski.de',
'author_company' => 'sgalinski Internet Services',
'CGLcompliance' => '',
'CGLcompliance_note' => '',
'constraints' => array(
'depends' => array(
'php' => '5.3.0-5.6.99',
'typo3' => '6.2.15-7.99.99',
'php' => '5.3.0-7.0.99',
'typo3' => '7.6.12-7.99.99',
),
'conflicts' => array(
),
......@@ -58,8 +37,4 @@ Following functions are implemented in this module:
'tinymce' => '4.2.8',
),
),
'suggests' => array(
),
);
?>
\ No newline at end of file
<?php
if (!defined('TYPO3_MODE')) {
die('Access denied!!!');
die('Access denied!!!');
}
if (TYPO3_MODE == 'BE') {
TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
'SGalinski.lfeditor',
'user',
'LFEditor',
'',
array(
'General' => 'index, general, changeSelection, generalSave, goToEditFile, switchInsertMode,
TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
'SGalinski.lfeditor',
'user',
'LFEditor',
'',
array(
'General' => 'index, general, changeSelection, generalSave, goToEditFile, switchInsertMode,
switchEditingMode, refreshLanguageFileList',
'EditFile' => 'editFile, changeSelection, editFileSave, refreshLanguageFileList',
'EditConstant' => 'editConstant, changeSelection, editConstantSave, prepareEditConstant,
'EditFile' => 'editFile, changeSelection, editFileSave, refreshLanguageFileList',
'EditConstant' => 'editConstant, changeSelection, editConstantSave, prepareEditConstant,
refreshLanguageFileList',
'AddConstant' => 'addConstant, changeSelection, addConstantSave, refreshLanguageFileList',
'DeleteConstant' => 'deleteConstant, changeSelection, deleteConstantSave, refreshLanguageFileList',
'RenameConstant' => 'renameConstant, changeSelection, renameConstantSave, refreshLanguageFileList',
'SearchConstant' => 'searchConstant, changeSelection, searchConstantSearch, refreshLanguageFileList',
'ViewTree' => 'viewTree, changeSelection, selectExplodeToken, refreshLanguageFileList',
'ManageBackups' => 'manageBackups, changeSelection, deleteBackup, recoverBackup, showDifferenceBackup,
'AddConstant' => 'addConstant, changeSelection, addConstantSave, refreshLanguageFileList',
'DeleteConstant' => 'deleteConstant, changeSelection, deleteConstantSave, refreshLanguageFileList',
'RenameConstant' => 'renameConstant, changeSelection, renameConstantSave, refreshLanguageFileList',
'SearchConstant' => 'searchConstant, changeSelection, searchConstantSearch, refreshLanguageFileList',
'ViewTree' => 'viewTree, changeSelection, selectExplodeToken, refreshLanguageFileList',
'ManageBackups' => 'manageBackups, changeSelection, deleteBackup, recoverBackup, showDifferenceBackup,
deleteAllBackup, refreshLanguageFileList',
),
array(
'access' => 'user,group',
'icon' => 'EXT:lfeditor/ext_icon.png',
'labels' => 'LLL:EXT:lfeditor/Resources/Private/Language/locallang_mod.xml',
)
);
),
array(
'access' => 'user,group',
'icon' => 'EXT:lfeditor/Resources/Public/Icons/Extension.svg',
'labels' => 'LLL:EXT:lfeditor/Resources/Private/Language/locallang_mod.xml',
)
);
}
?>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment