From cc2cfe78bf7ea872cf429e06d8a92ac772f2506a Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Mon, 18 Feb 2013 21:47:09 +0100
Subject: [PATCH] [TASK] Cleanup sysext "wizard_crpages" and "wizard_sortpages"
This is a non-functional change that reformats the code, removes
unnecessary empty lines and fixes reference to old classnames.
Furthermore change "0" to FALSE where a boolean is needed.
Change-Id: Ida0c80ce0c54c6054e248b29c716b740f5e65194
Resolves: #46143
Releases: 6.1
Reviewed-on: https://review.typo3.org/18820
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
---
...CreatePagesWizardModuleFunctionController.php | 1 -
typo3/sysext/wizard_crpages/ext_tables.php | 16 +++++++++++++---
.../View/SortPagesWizardModuleFunction.php | 7 ++++---
typo3/sysext/wizard_sortpages/ext_tables.php | 15 ++++++++++++---
4 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
index 1f24f6e3d53e..80c7edb600b7 100644
--- a/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
+++ b/typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
@@ -277,5 +277,4 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
}
-
?>
\ No newline at end of file
diff --git a/typo3/sysext/wizard_crpages/ext_tables.php b/typo3/sysext/wizard_crpages/ext_tables.php
index 305fe355139e..e0499762be02 100755
--- a/typo3/sysext/wizard_crpages/ext_tables.php
+++ b/typo3/sysext/wizard_crpages/ext_tables.php
@@ -2,8 +2,18 @@
if (!defined('TYPO3_MODE')) {
die('Access denied.');
}
-if (TYPO3_MODE == 'BE') {
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_func', 'TYPO3\\CMS\\WizardCrpages\\Controller\\CreatePagesWizardModuleFunctionController', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'class.tx_wizardcrpages_webfunc_2.php', 'LLL:EXT:wizard_crpages/locallang.php:wiz_crMany', 'wiz');
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_func', 'EXT:wizard_crpages/locallang_csh.xml');
+if (TYPO3_MODE === 'BE') {
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
+ 'web_func',
+ 'TYPO3\\CMS\\WizardCrpages\\Controller\\CreatePagesWizardModuleFunctionController',
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/Controller/CreatePagesWizardModuleFunctionController.php',
+ 'LLL:EXT:wizard_crpages/locallang.xlf:wiz_crMany',
+ 'wiz'
+ );
+
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
+ '_MOD_web_func',
+ 'EXT:wizard_crpages/locallang_csh.xlf'
+ );
}
?>
\ No newline at end of file
diff --git a/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php b/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
index 9d9f89ca9259..5069d6c466a1 100644
--- a/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
+++ b/typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php
@@ -26,6 +26,7 @@ namespace TYPO3\CMS\WizardSortpages\View;
*
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+
/**
* Creates the "Sort pages" wizard
*
@@ -63,9 +64,9 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu
if ($sortByField) {
$menuItems = array();
if (\TYPO3\CMS\Core\Utility\GeneralUtility::inList('title,subtitle,crdate,tstamp', $sortByField)) {
- $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', $sortByField, '', 0);
+ $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', $sortByField, '', FALSE);
} elseif ($sortByField == 'REV') {
- $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', 'sorting', '', 0);
+ $menuItems = $sys_pages->getMenu($this->pObj->id, 'uid,pid,title', 'sorting', '', FALSE);
$menuItems = array_reverse($menuItems);
}
if (count($menuItems)) {
@@ -81,7 +82,7 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu
\TYPO3\CMS\Backend\Utility\BackendUtility::setUpdateSignal('updatePageTree');
}
}
- $menuItems = $sys_pages->getMenu($this->pObj->id, '*', 'sorting', '', 0);
+ $menuItems = $sys_pages->getMenu($this->pObj->id, '*', 'sorting', '', FALSE);
if (count($menuItems)) {
$lines = array();
diff --git a/typo3/sysext/wizard_sortpages/ext_tables.php b/typo3/sysext/wizard_sortpages/ext_tables.php
index 507cd7495ae7..9c07c4984179 100755
--- a/typo3/sysext/wizard_sortpages/ext_tables.php
+++ b/typo3/sysext/wizard_sortpages/ext_tables.php
@@ -2,8 +2,17 @@
if (!defined('TYPO3_MODE')) {
die('Access denied.');
}
-if (TYPO3_MODE == 'BE') {
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction('web_func', 'TYPO3\\CMS\\WizardSortPages\\View\\SortPagesWizardModuleFunction', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'class.tx_wizardsortpages_webfunc_2.php', 'LLL:EXT:wizard_sortpages/locallang.php:wiz_sort', 'wiz');
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_func', 'EXT:wizard_sortpages/locallang_csh.xml');
+if (TYPO3_MODE === 'BE') {
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
+ 'web_func',
+ 'TYPO3\\CMS\\WizardSortPages\\View\\SortPagesWizardModuleFunction',
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/View/SortPagesWizardModuleFunction.php',
+ 'LLL:EXT:wizard_sortpages/locallang.php:wiz_sort',
+ 'wiz'
+ );
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr(
+ '_MOD_web_func',
+ 'EXT:wizard_sortpages/locallang_csh.xlf'
+ );
}
?>
\ No newline at end of file
--
GitLab