[TASK] Cleanup sysext "taskcenter" and "tsconfig_help" 22/18822/3
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 19 Feb 2013 19:24:38 +0000 (20:24 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 11 Mar 2013 21:02:59 +0000 (22:02 +0100)
Change-Id: I2658e5d0a7ae979f93b60713294adcbe8e41db09
Resolves: #46145
Releases: 6.1
Reviewed-on: https://review.typo3.org/18822
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
typo3/sysext/taskcenter/Classes/TaskInterface.php
typo3/sysext/taskcenter/Classes/TaskStatus.php
typo3/sysext/taskcenter/ext_tables.php
typo3/sysext/taskcenter/task/conf.php
typo3/sysext/taskcenter/task/index.php
typo3/sysext/tsconfig_help/Classes/Controller/TypoScriptConfigHelpModuleController.php
typo3/sysext/tsconfig_help/ext_tables.php
typo3/sysext/tsconfig_help/ext_tables.sql
typo3/sysext/tsconfig_help/mod1/conf.php
typo3/sysext/tsconfig_help/mod1/index.php

index c03a927..6ee99de 100644 (file)
@@ -1,6 +1,29 @@
 <?php
 namespace TYPO3\CMS\Taskcenter\Controller;
 
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2010-2011 Georg Ringer <typo3@ringerge.org>
+ *  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 2 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!
+ ***************************************************************/
+
 /**
  * This class provides a taskcenter for BE users
  *
@@ -388,5 +411,4 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
 }
 
-
 ?>
\ No newline at end of file
index 991b59a..5252094 100644 (file)
@@ -26,13 +26,14 @@ namespace TYPO3\CMS\Taskcenter;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
+
 /**
  * Interface for classes which provide a task.
  *
  * @author Georg Ringer <typo3@ringerge.org
  */
-interface TaskInterface
-{
+interface TaskInterface {
+
        /**
         * Returns the content for a task
         *
index 068c5e1..992cebe 100644 (file)
@@ -23,6 +23,7 @@ namespace TYPO3\CMS\Taskcenter;
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
+
 /**
  * Status of tasks
  *
@@ -64,5 +65,4 @@ class TaskStatus {
 
 }
 
-
 ?>
\ No newline at end of file
index 26b2687..9280e7e 100755 (executable)
@@ -2,10 +2,18 @@
 if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
-if (TYPO3_MODE == 'BE') {
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModulePath('tools_txtaskcenterM1', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'task/');
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('user', 'task', 'top', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'task/');
-       $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['Taskcenter::saveCollapseState'] = 'EXT:taskcenter/Classes/class.tx_taskcenter_status.php:TYPO3\\CMS\\Taskcenter\\TaskStatus->saveCollapseState';
-       $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['Taskcenter::saveSortingState'] = 'EXT:taskcenter/Classes/class.tx_taskcenter_status.php:TYPO3\\CMS\\Taskcenter\\TaskStatus->saveSortingState';
+if (TYPO3_MODE === 'BE') {
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModulePath(
+               'tools_txtaskcenterM1',
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'task/'
+       );
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+               'user',
+               'task',
+               'top',
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'task/'
+       );
+       $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['Taskcenter::saveCollapseState'] = 'EXT:taskcenter/Classes/TaskStatus.php:TYPO3\\CMS\\Taskcenter\\TaskStatus->saveCollapseState';
+       $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['Taskcenter::saveSortingState'] = 'EXT:taskcenter/Classes/TaskStatus.php:TYPO3\\CMS\\Taskcenter\\TaskStatus->saveSortingState';
 }
 ?>
\ No newline at end of file
index 44c9033..164a529 100755 (executable)
@@ -1,6 +1,6 @@
 <?php
 $MLANG['default']['tabs_images']['tab'] = 'task.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:taskcenter/task/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:taskcenter/task/locallang_mod.xlf';
 $MCONF['script'] = '_DISPATCH';
 $MCONF['access'] = 'group,user';
 $MCONF['name'] = 'user_task';
index 29b1004..3bca223 100755 (executable)
@@ -21,7 +21,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-$LANG->includeLLFile('EXT:taskcenter/task/locallang.xml');
+$LANG->includeLLFile('EXT:taskcenter/task/locallang.xlf');
 $BE_USER->modAccess($MCONF, 1);
 /*
  * @deprecated since 6.0, the classname SC_mod_user_task_index and this file is obsolete
index 6786979..5896cb7 100644 (file)
@@ -1,6 +1,29 @@
 <?php
 namespace TYPO3\CMS\TsconfigHelp\Controller;
 
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2007-2011 Stephane Schitter <stephane.schitter@free.fr>
+ *  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 2 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!
+ ***************************************************************/
+
 /**
  * Module 'TypoScript Help' for the 'tsconfig_help' extension.
  *
@@ -265,47 +288,47 @@ class TypoScriptConfigHelpModuleController extends \TYPO3\CMS\Backend\Module\Bas
                $style = array();
                foreach ($vals as $node) {
                        switch ($node['type']) {
-                       case 'open':
-                               switch ($node['tag']) {
-                               case 'STYLE:STYLE':
-                                       $currentStyleName = $node['attributes']['STYLE:NAME'];
-                                       if (array_key_exists('STYLE:PARENT-STYLE-NAME', $node['attributes'])) {
-                                               $parentStyleName = $node['attributes']['STYLE:PARENT-STYLE-NAME'];
-                                               // Keep trace of parents in the style array
-                                               $style[$currentStyleName]['parents'][] = $parentStyleName;
-                                       } else {
-                                               // This style has no parent, therefore clean the variable to avoid side effects with next use of that variable
-                                               $parentStyleName = '';
-                                       }
-                                       // The style parent is already documented in the array
-                                       if (array_key_exists($parentStyleName, $style)) {
-                                               // Inherit parent style
-                                               $style[$currentStyleName] = $style[$parentStyleName];
+                               case 'open':
+                                       switch ($node['tag']) {
+                                               case 'STYLE:STYLE':
+                                                       $currentStyleName = $node['attributes']['STYLE:NAME'];
+                                                       if (array_key_exists('STYLE:PARENT-STYLE-NAME', $node['attributes'])) {
+                                                               $parentStyleName = $node['attributes']['STYLE:PARENT-STYLE-NAME'];
+                                                               // Keep trace of parents in the style array
+                                                               $style[$currentStyleName]['parents'][] = $parentStyleName;
+                                                       } else {
+                                                               // This style has no parent, therefore clean the variable to avoid side effects with next use of that variable
+                                                               $parentStyleName = '';
+                                                       }
+                                                       // The style parent is already documented in the array
+                                                       if (array_key_exists($parentStyleName, $style)) {
+                                                               // Inherit parent style
+                                                               $style[$currentStyleName] = $style[$parentStyleName];
+                                                       }
+                                                       break;
                                        }
                                        break;
-                               }
-                               break;
-                       case 'complete':
-                               switch ($node['tag']) {
-                               case 'STYLE:PROPERTIES':
-                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-WEIGHT', $node['attributes'])) {
-                                               $style[$currentStyleName]['font-weight'] = $node['attributes']['FO:FONT-WEIGHT'];
-                                       }
-                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-STYLE', $node['attributes'])) {
-                                               $style[$currentStyleName]['font-style'] = $node['attributes']['FO:FONT-STYLE'];
+                               case 'complete':
+                                       switch ($node['tag']) {
+                                               case 'STYLE:PROPERTIES':
+                                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-WEIGHT', $node['attributes'])) {
+                                                               $style[$currentStyleName]['font-weight'] = $node['attributes']['FO:FONT-WEIGHT'];
+                                                       }
+                                                       if (is_array($node['attributes']) && array_key_exists('FO:FONT-STYLE', $node['attributes'])) {
+                                                               $style[$currentStyleName]['font-style'] = $node['attributes']['FO:FONT-STYLE'];
+                                                       }
+                                                       break;
                                        }
                                        break;
-                               }
-                               break;
-                       case 'close':
-                               switch ($node['tag']) {
-                               case 'STYLE:STYLE':
-                                       $currentStyleName = '';
-                                       break;
-                               case 'STYLE:PROPERTIES':
+                               case 'close':
+                                       switch ($node['tag']) {
+                                               case 'STYLE:STYLE':
+                                                       $currentStyleName = '';
+                                                       break;
+                                               case 'STYLE:PROPERTIES':
+                                                       break;
+                                       }
                                        break;
-                               }
-                               break;
                        }
                }
                return $style;
@@ -388,14 +411,14 @@ class TypoScriptConfigHelpModuleController extends \TYPO3\CMS\Backend\Module\Bas
                global $Styles;
                $styleName = $node['attributes']['TEXT:STYLE-NAME'];
                switch ($Styles[$styleName]['font-weight']) {
-               case 'bold':
-                       $styleTags[] = 'b';
-                       break;
+                       case 'bold':
+                               $styleTags[] = 'b';
+                               break;
                }
                switch ($Styles[$styleName]['font-style']) {
-               case 'italic':
-                       $styleTags[] = 'i';
-                       break;
+                       case 'italic':
+                               $styleTags[] = 'i';
+                               break;
                }
                return $styleTags;
        }
@@ -493,111 +516,111 @@ class TypoScriptConfigHelpModuleController extends \TYPO3\CMS\Backend\Module\Bas
                                die('Malformed XML (P)' . LF);
                        }
                        switch ($node['type']) {
-                       case 'open':
-                               switch ($node['tag']) {
-                               case 'TABLE:TABLE-HEADER-ROWS':
-                                       $sectionHeader++;
-                                       break;
-                               case 'TABLE:TABLE-ROW':
-                                       // Skip section header, we only look at the *contents* of the table
-                                       if (!$sectionHeader) {
-                                               $sectionRow++;
-                                               // Make sure we are within a top-level row
-                                               if ($sectionRow == 1) {
-                                                       $rowID++;
-                                                       $cellID = 0;
-                                               }
-                                       }
-                                       break;
-                               case 'TABLE:TABLE-CELL':
-                                       // Skip section header, we only look at the *contents* of the table
-                                       if (!$sectionHeader) {
-                                               $sectionCell++;
-                                               // Make sure we are within a top-level cell
-                                               if ($sectionCell == 1) {
-                                                       $cellID++;
-                                                       // No newline required after this
-                                                       $newLineRequired = '';
-                                               }
-                                       }
-                                       break;
-                               case 'TEXT:P':
-                                       // Make sure we are in a cell
-                                       if ($sectionCell) {
-                                               $sectionP++;
-                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']);
-                                               // No newline required after this
-                                               $newLineRequired = '';
-                                               $latestTEXTPopen = $node;
-                                       }
-                                       break;
-                               }
-                               break;
-                       case 'complete':
-                               switch ($node['tag']) {
-                               case 'TEXT:P':
-                                       // make sure we are in a cell
-                                       if ($sectionCell) {
-                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']) . $this->styleHTML($this->styleTags($node), '/');
-                                               $newLineRequired = '<br>';
-                                       }
-                                       break;
-                               case 'TEXT:SPAN':
-                                       // make sure we are in a cell
-                                       if ($sectionCell) {
-                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']) . $this->styleHTML($this->styleTags($node), '/');
-                                               $newLineRequired = '';
-                                       }
-                                       break;
-                               case 'TEXT:S':
-                                       // make sure we are in a cell
-                                       if ($sectionCell) {
-                                               for ($i = 0; $i < $node['attributes']['TEXT:C']; $i++) {
-                                                       $table[$rowID - 1][$cellID - 1] .= '&nbsp;';
-                                               }
-                                               // no newline required after this
-                                               $newLineRequired = '';
+                               case 'open':
+                                       switch ($node['tag']) {
+                                               case 'TABLE:TABLE-HEADER-ROWS':
+                                                       $sectionHeader++;
+                                                       break;
+                                               case 'TABLE:TABLE-ROW':
+                                                       // Skip section header, we only look at the *contents* of the table
+                                                       if (!$sectionHeader) {
+                                                               $sectionRow++;
+                                                               // Make sure we are within a top-level row
+                                                               if ($sectionRow == 1) {
+                                                                       $rowID++;
+                                                                       $cellID = 0;
+                                                               }
+                                                       }
+                                                       break;
+                                               case 'TABLE:TABLE-CELL':
+                                                       // Skip section header, we only look at the *contents* of the table
+                                                       if (!$sectionHeader) {
+                                                               $sectionCell++;
+                                                               // Make sure we are within a top-level cell
+                                                               if ($sectionCell == 1) {
+                                                                       $cellID++;
+                                                                       // No newline required after this
+                                                                       $newLineRequired = '';
+                                                               }
+                                                       }
+                                                       break;
+                                               case 'TEXT:P':
+                                                       // Make sure we are in a cell
+                                                       if ($sectionCell) {
+                                                               $sectionP++;
+                                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']);
+                                                               // No newline required after this
+                                                               $newLineRequired = '';
+                                                               $latestTEXTPopen = $node;
+                                                       }
+                                                       break;
                                        }
                                        break;
-                               }
-                               break;
-                       case 'cdata':
-                               switch ($node['tag']) {
-                               case 'TEXT:P':
-                                       // make sure we are in a cell
-                                       if ($sectionCell) {
-                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']) . $this->styleHTML($this->styleTags($node), '/');
-                                               // no newline required after this
-                                               $newLineRequired = '';
+                               case 'complete':
+                                       switch ($node['tag']) {
+                                               case 'TEXT:P':
+                                                       // make sure we are in a cell
+                                                       if ($sectionCell) {
+                                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']) . $this->styleHTML($this->styleTags($node), '/');
+                                                               $newLineRequired = '<br>';
+                                                       }
+                                                       break;
+                                               case 'TEXT:SPAN':
+                                                       // make sure we are in a cell
+                                                       if ($sectionCell) {
+                                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']) . $this->styleHTML($this->styleTags($node), '/');
+                                                               $newLineRequired = '';
+                                                       }
+                                                       break;
+                                               case 'TEXT:S':
+                                                       // make sure we are in a cell
+                                                       if ($sectionCell) {
+                                                               for ($i = 0; $i < $node['attributes']['TEXT:C']; $i++) {
+                                                                       $table[$rowID - 1][$cellID - 1] .= '&nbsp;';
+                                                               }
+                                                               // no newline required after this
+                                                               $newLineRequired = '';
+                                                       }
+                                                       break;
                                        }
                                        break;
-                               }
-                               break;
-                       case 'close':
-                               switch ($node['tag']) {
-                               case 'TABLE:TABLE-HEADER-ROWS':
-                                       $sectionHeader--;
-                                       break;
-                               case 'TABLE:TABLE-ROW':
-                                       // skip section header, we only look at the *contents* of the table
-                                       if (!$sectionHeader) {
-                                               $sectionRow--;
+                               case 'cdata':
+                                       switch ($node['tag']) {
+                                               case 'TEXT:P':
+                                                       // make sure we are in a cell
+                                                       if ($sectionCell) {
+                                                               $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($node), '') . $newLineRequired . $this->HSCtext($node['value']) . $this->styleHTML($this->styleTags($node), '/');
+                                                               // no newline required after this
+                                                               $newLineRequired = '';
+                                                       }
+                                                       break;
                                        }
                                        break;
-                               case 'TABLE:TABLE-CELL':
-                                       // skip section header, we only look at the *contents* of the table
-                                       if (!$sectionHeader) {
-                                               $sectionCell--;
+                               case 'close':
+                                       switch ($node['tag']) {
+                                               case 'TABLE:TABLE-HEADER-ROWS':
+                                                       $sectionHeader--;
+                                                       break;
+                                               case 'TABLE:TABLE-ROW':
+                                                       // skip section header, we only look at the *contents* of the table
+                                                       if (!$sectionHeader) {
+                                                               $sectionRow--;
+                                                       }
+                                                       break;
+                                               case 'TABLE:TABLE-CELL':
+                                                       // skip section header, we only look at the *contents* of the table
+                                                       if (!$sectionHeader) {
+                                                               $sectionCell--;
+                                                       }
+                                                       break;
+                                               case 'TEXT:P':
+                                                       $sectionP--;
+                                                       // after a paragraph, require a new-line
+                                                       $newLineRequired = '<br>';
+                                                       $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($latestTEXTPopen), '/');
+                                                       break;
                                        }
                                        break;
-                               case 'TEXT:P':
-                                       $sectionP--;
-                                       // after a paragraph, require a new-line
-                                       $newLineRequired = '<br>';
-                                       $table[$rowID - 1][$cellID - 1] .= $this->styleHTML($this->styleTags($latestTEXTPopen), '/');
-                                       break;
-                               }
-                               break;
                        }
                        $id = $id + 1;
                }
@@ -727,5 +750,4 @@ class TypoScriptConfigHelpModuleController extends \TYPO3\CMS\Backend\Module\Bas
 
 }
 
-
 ?>
\ No newline at end of file
index 8fade94..9af448e 100644 (file)
@@ -2,7 +2,12 @@
 if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
-if (TYPO3_MODE == 'BE') {
-       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('help', 'txtsconfighelpM1', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/');
+if (TYPO3_MODE === 'BE') {
+       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule(
+               'help',
+               'txtsconfighelpM1',
+               '',
+               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/'
+       );
 }
 ?>
\ No newline at end of file
index 3230b8d..c93013e 100755 (executable)
@@ -11,5 +11,4 @@ CREATE TABLE static_tsconfig_help (
   title varchar(255) DEFAULT '' NOT NULL,
   PRIMARY KEY (uid),
   KEY guide (guide,md5hash)
-);
-
+);
\ No newline at end of file
index 1b1029b..6e1544b 100644 (file)
@@ -3,5 +3,5 @@ $MCONF['name'] = 'help_txtsconfighelpM1';
 $MCONF['script'] = '_DISPATCH';
 $MCONF['access'] = 'user,group';
 $MLANG['default']['tabs_images']['tab'] = 'moduleicon.gif';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:tsconfig_help/mod1/locallang_mod.xml';
+$MLANG['default']['ll_ref'] = 'LLL:EXT:tsconfig_help/mod1/locallang_mod.xlf';
 ?>
\ No newline at end of file
index c8f7cc4..78a0034 100644 (file)
@@ -21,7 +21,7 @@
  *
  *  This copyright notice MUST APPEAR in all copies of the script!
  ***************************************************************/
-$LANG->includeLLFile('EXT:tsconfig_help/mod1/locallang.xml');
+$LANG->includeLLFile('EXT:tsconfig_help/mod1/locallang.xlf');
 // This checks permissions and exits if the users has no permission for entry.
 $BE_USER->modAccess($MCONF, 1);
 /*