Bug #20351 » 10971v2_4-2.diff
| ChangeLog (Arbeitskopie) | ||
|---|---|---|
|
2009-10-11 Rupert Germann <rupi@gmx.li>
|
||
|
* Fixed bug #10971: Fatal error in impexp module: Call to a member function includeLLFile() on a non-object (thanks to Andre Steiling)
|
||
|
2009-10-10 Rupert Germann <rupi@gmx.li>
|
||
|
* Fixed bug #12129 (follow-up to bug #11986): Translation update broken with activated output compression (thanks to Steffen Gebert)
|
||
| typo3/sysext/impexp/app/conf.php (Arbeitskopie) | ||
|---|---|---|
|
<?php
|
||
|
#define('TYPO3_MOD_PATH', 'sysext/impexp/app/');
|
||
|
#$BACK_PATH='../../../';
|
||
|
define('TYPO3_MOD_PATH', 'sysext/impexp/app/');
|
||
|
$BACK_PATH='../../../';
|
||
|
$MCONF['name']='xMOD_tximpexp'; // xMOD_[modulename][optional: '_something']
|
||
|
?>
|
||
| typo3/sysext/impexp/app/index.php (Arbeitskopie) | ||
|---|---|---|
|
*/
|
||
|
#unset($MCONF);
|
||
|
#require ('conf.php');
|
||
|
#require ($BACK_PATH.'init.php');
|
||
|
#require ($BACK_PATH.'template.php');
|
||
|
unset($MCONF);
|
||
|
require ('conf.php');
|
||
|
require ($BACK_PATH.'init.php');
|
||
|
require ($BACK_PATH.'template.php');
|
||
|
$LANG->includeLLFile('EXT:impexp/app/locallang.php');
|
||
|
require_once (PATH_t3lib.'class.t3lib_scbase.php');
|
||
|
require_once (t3lib_extMgm::extPath('impexp').'class.tx_impexp.php');
|
||
| ... | ... | |
|
// Make input selector:
|
||
|
$path = $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']; // must have trailing slash.
|
||
|
$filesInDir = t3lib_div::getFilesInDir(PATH_site.$path, 't3d,xml', 1, 1);
|
||
|
|
||
|
$userPath = $this->userSaveFolder(); //Files from User-Dir
|
||
|
$filesInUserDir = t3lib_div::getFilesInDir($userPath, 't3d,xml', 1, 1);
|
||
|
|
||
|
$filesInDir = array_merge($filesInUserDir, $filesInDir);
|
||
|
if (is_dir(PATH_site.$path.'export/')) {
|
||
| typo3/sysext/impexp/ext_tables.php (Arbeitskopie) | ||
|---|---|---|
|
'name' => 'tx_impexp_clickmenu',
|
||
|
'path' => t3lib_extMgm::extPath($_EXTKEY).'class.tx_impexp_clickmenu.php'
|
||
|
);
|
||
|
t3lib_extMgm::addModulePath('xMOD_tximpexp',t3lib_extMgm::extPath($_EXTKEY).'app/');
|
||
|
t3lib_extMgm::insertModuleFunction(
|
||
|
'user_task',
|
||
| typo3/sysext/impexp/class.tx_impexp_clickmenu.php (Arbeitskopie) | ||
|---|---|---|
|
$LL = $this->includeLL();
|
||
|
$url = 'mod.php?M=xMOD_tximpexp&tx_impexp[action]=export';
|
||
|
$modUrl = $backRef->backPath.t3lib_extMgm::extRelPath('impexp') . 'app/index.php';
|
||
|
$url = $modUrl . '?tx_impexp[action]=export';
|
||
|
if ($table=='pages') {
|
||
|
$url.='&tx_impexp[pagetree][id]='.$uid;
|
||
|
$url.='&tx_impexp[pagetree][levels]=0';
|
||
| ... | ... | |
|
);
|
||
|
if ($table=='pages') {
|
||
|
$url = 'mod.php?M=xMOD_tximpexp&id='.$uid.'&table='.$table.'&tx_impexp[action]=import';
|
||
|
$url = $modUrl . '?id='. $uid . '&table=' . $table . '&tx_impexp[action]=import';
|
||
|
$localItems[] = $backRef->linkItem(
|
||
|
$GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('import',$LL)),
|
||
|
$backRef->excludeIcon('<img'.t3lib_iconWorks::skinImg($backRef->backPath,t3lib_extMgm::extRelPath('impexp').'import.gif','width="18" height="16"').' alt="" />'),
|
||
| typo3/class.db_list_extra.inc (Arbeitskopie) | ||
|---|---|---|
|
// Export
|
||
|
if (t3lib_extMgm::isLoaded('impexp')) {
|
||
|
$buttons['export'] = '<a href="' . htmlspecialchars($this->backPath. 'mod.php?M=xMOD_tximpexp&tx_impexp[action]=export&tx_impexp[list][]=' . rawurlencode($this->table . ':' . $this->id)) . '">' .
|
||
|
'<img' . t3lib_iconWorks::skinImg($this->backPath, t3lib_extMgm::extRelPath('impexp') . 'export.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.export', 1) . '" alt="" />' .
|
||
|
'</a>';
|
||
|
$url = $this->backPath . t3lib_extMgm::extRelPath('impexp') . 'app/index.php?tx_impexp[action]=export';
|
||
|
$buttons['export'] = '<a href="' . htmlspecialchars($url . '&tx_impexp[list][]=' . rawurlencode($this->table . ':' . $this->id)) . '">' . '<img' . t3lib_iconWorks::skinImg($this->backPath, t3lib_extMgm::extRelPath('impexp') . 'export.gif') . ' title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:rm.export', 1) . '" alt="" />' .
|
||
|
'</a>';
|
||
|
}
|
||
|
}
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
|
||
|
/**
|
||
|
* @hook recStatInfoHooks: Allows to insert HTML before record icons on various places
|
||
|
* @date 2007-09-22
|
||