Index: typo3/sysext/impexp/ext_tables.php
===================================================================
--- typo3/sysext/impexp/ext_tables.php (revision 8023)
+++ typo3/sysext/impexp/ext_tables.php (working copy)
@@ -4,17 +4,16 @@
}
if (TYPO3_MODE == 'BE') {
- $GLOBALS['TBE_MODULES_EXT']['xMOD_alt_clickmenu']['extendCMclasses'][] = array (
+ $GLOBALS['TBE_MODULES_EXT']['xMOD_alt_clickmenu']['extendCMclasses'][] = array(
'name' => 'tx_impexp_clickmenu',
'path' => t3lib_extMgm::extPath($_EXTKEY).'class.tx_impexp_clickmenu.php'
);
- $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['taskcenter']['impexp']['tasks'] = array (
+ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['taskcenter']['impexp']['tx_impexp_task'] = array(
'title' => 'LLL:EXT:impexp/locallang_csh.xml:.alttitle',
'description' => 'LLL:EXT:impexp/locallang_csh.xml:.description',
- 'icon' => 'EXT:impexp/export.gif',
- 'task' => 'tx_impexp_task',
+ 'icon' => 'EXT:impexp/export.gif'
);
t3lib_extMgm::addLLrefForTCAdescr('xMOD_tx_impexp','EXT:impexp/locallang_csh.xml');
Index: typo3/sysext/impexp/task/class.tx_impexp_task.php
===================================================================
--- typo3/sysext/impexp/task/class.tx_impexp_task.php (revision 8023)
+++ typo3/sysext/impexp/task/class.tx_impexp_task.php (working copy)
@@ -68,8 +68,6 @@
return '';
}
-
-
/**
* Main Task center module
*
@@ -86,9 +84,9 @@
} else {
// header
$content .= $this->taskObject->description(
- $GLOBALS['LANG']->getLL('.alttitle'),
- $GLOBALS['LANG']->getLL('.description')
- );
+ $GLOBALS['LANG']->getLL('.alttitle'),
+ $GLOBALS['LANG']->getLL('.description')
+ );
$thumbnails = $lines = array();
@@ -109,16 +107,9 @@
foreach($presets as $key => $presetCfg) {
$configuration = unserialize($presetCfg['preset_data']);
$thumbnailFile = $thumbnails[$configuration['meta']['thumbnail']];
- $title = strlen($presetCfg['title']) ? $presetCfg['title'] : '['.$presetCfg['uid'].']';
+ $title = strlen($presetCfg['title']) ? $presetCfg['title'] : '[' . $presetCfg['uid'] . ']';
+ $icon = 'EXT:impexp/export.gif';
- if ($thumbnailFile && 1==2) {
- // @todo: create icon or maybe completly remove it because where to display?
- $src= '../' . $GLOBALS['BACK_PATH'] . substr($tempDir, strlen(PATH_site)) . basename($thumbnailFile);
- $icon = $src;
- } else {
- $icon = 'EXT:impexp/export.gif';
- }
-
$description = array();
// is public?
@@ -157,10 +148,10 @@
// collect all preset information
$lines[$key] = array(
- 'icon' => $icon,
- 'title' => htmlspecialchars($title),
- 'descriptionHtml' => implode('
', $description),
- 'link' => 'mod.php?M=user_task&SET[function]=impexp.tasks&display=' . $presetCfg['uid']
+ 'icon' => $icon,
+ 'title' => $title,
+ 'descriptionHtml' => implode('
', $description),
+ 'link' => 'mod.php?M=user_task&SET[function]=impexp.tx_impexp_task&display=' . $presetCfg['uid']
);
}
@@ -174,7 +165,6 @@
$GLOBALS['LANG']->getLL('no-presets'),
'',
t3lib_FlashMessage::NOTICE
-
);
$content .= $flashMessage->render();
}
@@ -189,14 +179,14 @@
*
* @return array Array of preset records
*/
- function getPresets() {
+ protected function getPresets() {
$presets = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
- '*',
- 'tx_impexp_presets',
- '(public > 0 OR user_uid=' . $GLOBALS['BE_USER']->user['uid'] . ')',
- '',
- 'item_uid DESC, title'
- );
+ '*',
+ 'tx_impexp_presets',
+ '(public > 0 OR user_uid=' . $GLOBALS['BE_USER']->user['uid'] . ')',
+ '',
+ 'item_uid DESC, title'
+ );
return $presets;
}
@@ -206,16 +196,17 @@
*
* @return string Absolute path to first "_temp_" folder of the current user, otherwise blank.
*/
- function userTempFolder() {
+ protected function userTempFolder() {
foreach($GLOBALS['FILEMOUNTS'] as $filePathInfo) {
$tempFolder = $filePathInfo['path'] . '_temp_/';
if (@is_dir($tempFolder)) {
return $tempFolder;
}
}
+
+ return '';
}
-
}
Index: typo3/sysext/sys_action/ext_emconf.php
===================================================================
--- typo3/sysext/sys_action/ext_emconf.php (revision 8023)
+++ typo3/sysext/sys_action/ext_emconf.php (working copy)
@@ -33,13 +33,12 @@
'author_company' => 'Curby Soft Multimedia',
'CGLcompliance' => '',
'CGLcompliance_note' => '',
- 'version' => '1.2.0',
+ 'version' => '2.0.0',
'_md5_values_when_last_written' => 'a:17:{s:8:"TODO.txt";s:4:"17ff";s:22:"class.tx_sysaction.php";s:4:"627a";s:16:"ext_autoload.php";s:4:"9b72";s:12:"ext_icon.gif";s:4:"f410";s:14:"ext_tables.php";s:4:"abdf";s:14:"ext_tables.sql";s:4:"c36f";s:13:"locallang.xml";s:4:"3327";s:27:"locallang_csh_sysaction.xml";s:4:"a1d4";s:17:"locallang_tca.xml";s:4:"abe1";s:14:"sys_action.gif";s:4:"eb3a";s:17:"sys_action__h.gif";s:4:"7a29";s:7:"tca.php";s:4:"3356";s:32:"task/class.tx_sysaction_task.php";s:4:"207e";s:46:"toolbarmenu/class.tx_sysaction_toolbarmenu.php";s:4:"11d3";s:35:"toolbarmenu/registerToolbarItem.php";s:4:"58a6";s:29:"toolbarmenu/tx_sysactions.css";s:4:"bd1b";s:28:"toolbarmenu/tx_sysactions.js";s:4:"deb0";}',
'constraints' => array(
'depends' => array(
- 'taskcenter' => '1.0.0-0.0.0',
- 'php' => '5.1.0-0.0.0',
- 'typo3' => '4.3.0-0.0.0',
+ 'taskcenter' => '2.0.0-0.0.0',
+ 'typo3' => '4.4.0-0.0.0',
),
'conflicts' => array(
),
Index: typo3/sysext/sys_action/ext_tables.php
===================================================================
--- typo3/sysext/sys_action/ext_tables.php (revision 8023)
+++ typo3/sysext/sys_action/ext_tables.php (working copy)
@@ -4,8 +4,8 @@
}
if (TYPO3_MODE == 'BE') {
- $TCA['sys_action'] = array (
- 'ctrl' => array (
+ $TCA['sys_action'] = array(
+ 'ctrl' => array(
'label' => 'title',
'tstamp' => 'tstamp',
'default_sortby' => 'ORDER BY title',
@@ -17,7 +17,7 @@
'adminOnly' => 1,
'rootLevel' => -1,
'setToDefaultOnCopy' => 'assign_to_groups',
- 'enablecolumns' => array (
+ 'enablecolumns' => array(
'disabled' => 'hidden'
),
'typeicon_classes' => array(
@@ -33,11 +33,10 @@
t3lib_extMgm::addLLrefForTCAdescr('sys_action','EXT:sys_action/locallang_csh_sysaction.xml');
- $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['taskcenter']['sys_action']['tasks'] = array(
+ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['taskcenter']['sys_action']['tx_sysaction_task'] = array(
'title' => 'LLL:EXT:sys_action/locallang_tca.xml:sys_action',
'description' => 'LLL:EXT:sys_action/locallang_csh_sysaction.xml:.description',
- 'icon' => 'EXT:sys_action/sys_action.gif',
- 'task' => 'tx_sysaction_task'
+ 'icon' => 'EXT:sys_action/x-sys_action.png',
);
}
?>
\ No newline at end of file
Index: typo3/sysext/sys_action/task/class.tx_sysaction_task.php
===================================================================
--- typo3/sysext/sys_action/task/class.tx_sysaction_task.php (revision 8023)
+++ typo3/sysext/sys_action/task/class.tx_sysaction_task.php (working copy)
@@ -59,9 +59,9 @@
// if no task selected, render the menu
if ($show == 0) {
$content .= $this->taskObject->description(
- $GLOBALS['LANG']->getLL('sys_action'),
- $GLOBALS['LANG']->getLL('description')
- );
+ $GLOBALS['LANG']->getLL('sys_action'),
+ $GLOBALS['LANG']->getLL('description')
+ );
$content .= $this->renderActionList();
} else {
@@ -71,7 +71,7 @@
if (count($record) == 0) {
$flashMessage = t3lib_div::makeInstance(
't3lib_FlashMessage',
- $GLOBALS['LANG']->getLL('action_error-not-found', true),
+ $GLOBALS['LANG']->getLL('action_error-not-found', TRUE),
$GLOBALS['LANG']->getLL('action_error'),
t3lib_FlashMessage::ERROR
);
@@ -100,7 +100,7 @@
default:
$flashMessage = t3lib_div::makeInstance(
't3lib_FlashMessage',
- $GLOBALS['LANG']->getLL('action_noType', true),
+ $GLOBALS['LANG']->getLL('action_noType', TRUE),
$GLOBALS['LANG']->getLL('action_error'),
t3lib_FlashMessage::ERROR
);
@@ -121,16 +121,16 @@
$content = '
' . $GLOBALS['LANG']->getLL('description') . '
'; // get the actions - $lines = $this->getActions(); - if (count($lines) > 0) { + $actionList = $this->getActions(); + if (count($actionList) > 0) { $items = ''; // render a single action menu item - foreach ($lines as $line) { - $active = (t3lib_div::_GP('show') === $line['uid']) ? ' class="active" ' : ''; + foreach ($actionList as $action) { + $active = (t3lib_div::_GP('show') === $action['uid']) ? ' class="active" ' : ''; $items .= '