[TASK] CGL violations FunctionCallArgumentSpacing in /typo3/sysext/i*/
authorRoland Waldner <most.wanted@gmx.at>
Sat, 26 May 2012 21:13:31 +0000 (23:13 +0200)
committerGeorg Ringer <mail@ringerge.org>
Fri, 1 Jun 2012 06:38:09 +0000 (08:38 +0200)
There were violations against the CGL rule
"FunctionCallArgumentSpacingNoSpaceAfterComma" in /typo3/sysext/i*/.
These will be reduced by this commit.

Change-Id: Id945d410bf452d66a7ccfb6b902b3cef64345dd0
Resolves: #37513
Releases: 6.0
Reviewed-on: http://review.typo3.org/11653
Reviewed-by: Oliver Klee
Tested-by: Oliver Klee
Reviewed-by: Georg Ringer
Tested-by: Georg Ringer
12 files changed:
typo3/sysext/impexp/app/index.php
typo3/sysext/impexp/class.tx_impexp.php
typo3/sysext/impexp/class.tx_impexp_clickmenu.php
typo3/sysext/impexp/ext_tables.php
typo3/sysext/impexp/modfunc1/class.tx_impexp_modfunc1.php
typo3/sysext/indexed_search_mysql/class.tx_indexedsearch_mysql.php
typo3/sysext/info/mod1/index.php
typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php
typo3/sysext/info_pagetsconfig/ext_tables.php
typo3/sysext/install/ext_tables.php
typo3/sysext/install/mod/class.tx_install.php
typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php

index 577e733..acca839 100755 (executable)
@@ -68,7 +68,7 @@ require_once ($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:impexp/app/locallang.php');
 require_once (t3lib_extMgm::extPath('impexp').'class.tx_impexp.php');
 
-t3lib_extMgm::isLoaded('impexp',1);
+t3lib_extMgm::isLoaded('impexp', 1);
 
 
 
@@ -99,8 +99,8 @@ class localPageTree extends t3lib_browseTree {
         * @param       mixed           (See parent class)
         * @return      string          Wrapped title
         */
-       function wrapTitle($title,$v) {
-               $title = (!strcmp(trim($title),'')) ? '<em>['.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.no_title',1).']</em>' : htmlspecialchars($title);
+       function wrapTitle($title, $v) {
+               $title = (!strcmp(trim($title), '')) ? '<em>['.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.no_title', 1).']</em>' : htmlspecialchars($title);
                return $title;
        }
 
@@ -112,7 +112,7 @@ class localPageTree extends t3lib_browseTree {
         * @param       mixed           (See parent class)
         * @return      string          Icon HTML
         */
-       function PM_ATagWrap($icon,$cmd,$bMark='') {
+       function PM_ATagWrap($icon, $cmd, $bMark='') {
                return $icon;
        }
 
@@ -123,7 +123,7 @@ class localPageTree extends t3lib_browseTree {
         * @param       array           Record row (page)
         * @return      string          Icon HTML
         */
-       function wrapIcon($icon,$row) {
+       function wrapIcon($icon, $row) {
                return $icon;
        }
 
@@ -152,7 +152,7 @@ class localPageTree extends t3lib_browseTree {
                $this->stored = unserialize($this->BE_USER->uc['browseTrees']['browsePages']);
 
                        // PM action:
-               $PM = t3lib_div::intExplode('_',t3lib_div::_GP('PM'));
+               $PM = t3lib_div::intExplode('_', t3lib_div::_GP('PM'));
 
                        // traverse mounts:
                $titleLen = intval($this->BE_USER->uc['titleLen']);
@@ -170,25 +170,25 @@ class localPageTree extends t3lib_browseTree {
 
                        // Set PM icon:
                $cmd = $this->bank.'_'.($isOpen?'0_':'1_').$pid;
-               $icon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/'.($isOpen?'minus':'plus').'only.gif','width="18" height="16"').' align="top" alt="" />';
-               $firstHtml = $this->PM_ATagWrap($icon,$cmd);
+               $icon = '<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/ol/'.($isOpen?'minus':'plus').'only.gif','width="18" height="16"').' align="top" alt="" />';
+               $firstHtml = $this->PM_ATagWrap($icon, $cmd);
 
                if ($pid>0) {
-                       $rootRec = t3lib_befunc::getRecordWSOL('pages',$pid);
+                       $rootRec = t3lib_befunc::getRecordWSOL('pages', $pid);
                        $firstHtml.= $this->wrapIcon(t3lib_iconWorks::getSpriteIconForRecord('pages', $rootRec), $rootRec);
                } else {
                        $rootRec = array(
                                'title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'],
                                'uid' => 0
                        );
-                       $firstHtml.= $this->wrapIcon('<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/_icon_website.gif','width="18" height="16"').' align="top" alt="" />',$rootRec);
+                       $firstHtml.= $this->wrapIcon('<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/i/_icon_website.gif','width="18" height="16"').' align="top" alt="" />', $rootRec);
                }
                $this->tree[] = array('HTML'=>$firstHtml, 'row'=>$rootRec);
                if ($isOpen) {
                                // Set depth:
-                       $depthD = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/blank.gif','width="18" height="16"').' align="top" alt="" />';
+                       $depthD = '<img'.t3lib_iconWorks::skinImg($this->backPath, 'gfx/ol/blank.gif', 'width="18" height="16"').' align="top" alt="" />';
                        if ($this->addSelfId)   $this->ids[] = $pid;
-                       $this->getTree($pid,999,$depthD);
+                       $this->getTree($pid, 999, $depthD);
 
                        $idH = array();
                        $idH[$pid]['uid'] = $pid;
@@ -198,7 +198,7 @@ class localPageTree extends t3lib_browseTree {
                }
 
                        // Add tree:
-               $treeArr = array_merge($treeArr,$this->tree);
+               $treeArr = array_merge($treeArr, $this->tree);
 
                return $treeArr;
        }
@@ -284,7 +284,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                        // Finally: If upload went well, set the new file as the import file:
                                if (is_object($this->fileProcessor) && $this->fileProcessor->internalUploadMap[1]) {
                                        $fI = pathinfo($this->fileProcessor->internalUploadMap[1]);
-                                       if (t3lib_div::inList('t3d,xml',strtolower($fI['extension'])))  {       // Only allowed extensions....
+                                       if (t3lib_div::inList('t3d,xml', strtolower($fI['extension']))) {       // Only allowed extensions....
                                                $inData['file'] = $this->fileProcessor->internalUploadMap[1];
                                        }
                                }
@@ -376,10 +376,10 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // BUILDING EXPORT DATA:
 
                        // Processing of InData array values:
-               $inData['pagetree']['maxNumber'] = t3lib_utility_Math::forceIntegerInRange($inData['pagetree']['maxNumber'],1,10000,100);
-               $inData['listCfg']['maxNumber'] = t3lib_utility_Math::forceIntegerInRange($inData['listCfg']['maxNumber'],1,10000,100);
-               $inData['maxFileSize'] = t3lib_utility_Math::forceIntegerInRange($inData['maxFileSize'],1,10000,1000);
-               $inData['filename'] = trim(preg_replace('/[^[:alnum:]._-]*/','',preg_replace('/\.(t3d|xml)$/','',$inData['filename'])));
+               $inData['pagetree']['maxNumber'] = t3lib_utility_Math::forceIntegerInRange($inData['pagetree']['maxNumber'], 1, 10000, 100);
+               $inData['listCfg']['maxNumber'] = t3lib_utility_Math::forceIntegerInRange($inData['listCfg']['maxNumber'], 1, 10000, 100);
+               $inData['maxFileSize'] = t3lib_utility_Math::forceIntegerInRange($inData['maxFileSize'], 1, 10000, 1000);
+               $inData['filename'] = trim(preg_replace('/[^[:alnum:]._-]*/', '', preg_replace('/\.(t3d|xml)$/', '', $inData['filename'])));
                if (strlen($inData['filename'])) {
                        $inData['filename'].= $inData['filetype']=='xml' ? '.xml' : '.t3d';
                }
@@ -395,7 +395,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                        // Create export object and configure it:
                $this->export = t3lib_div::makeInstance('tx_impexp');
-               $this->export->init(0,'export');
+               $this->export->init(0, 'export');
                $this->export->setCharset($GLOBALS['LANG']->charSet);
 
                $this->export->maxFileSize = $inData['maxFileSize']*1024;
@@ -429,7 +429,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                if ($inData['meta']['thumbnail']) {
                        $tempDir = $this->userTempFolder();
                        if ($tempDir) {
-                               $thumbnails = t3lib_div::getFilesInDir($tempDir,'png,gif,jpg',1);
+                               $thumbnails = t3lib_div::getFilesInDir($tempDir, 'png,gif,jpg', 1);
                                $theThumb = $thumbnails[$inData['meta']['thumbnail']];
                                if ($theThumb) {
                                        $this->export->addThumbnail($theThumb);
@@ -441,19 +441,19 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // Configure which records to export
                if (is_array($inData['record'])) {
                        foreach($inData['record'] as $ref) {
-                               $rParts = explode(':',$ref);
-                               $this->export->export_addRecord($rParts[0],t3lib_BEfunc::getRecord($rParts[0],$rParts[1]));
+                               $rParts = explode(':', $ref);
+                               $this->export->export_addRecord($rParts[0], t3lib_BEfunc::getRecord($rParts[0], $rParts[1]));
                        }
                }
 
                        // Configure which tables to export
                if (is_array($inData['list'])) {
                        foreach($inData['list'] as $ref) {
-                               $rParts = explode(':',$ref);
-                               if ($GLOBALS['BE_USER']->check('tables_select',$rParts[0])) {
-                                       $res = $this->exec_listQueryPid($rParts[0],$rParts[1],t3lib_utility_Math::forceIntegerInRange($inData['listCfg']['maxNumber'],1));
+                               $rParts = explode(':', $ref);
+                               if ($GLOBALS['BE_USER']->check('tables_select', $rParts[0])) {
+                                       $res = $this->exec_listQueryPid($rParts[0], $rParts[1], t3lib_utility_Math::forceIntegerInRange($inData['listCfg']['maxNumber'], 1));
                                        while($subTrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
-                                               $this->export->export_addRecord($rParts[0],$subTrow);
+                                               $this->export->export_addRecord($rParts[0], $subTrow);
                                        }
                                }
                        }
@@ -464,12 +464,12 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        if ($inData['pagetree']['levels']==-1)  {       // Based on click-expandable tree
                                $pagetree = t3lib_div::makeInstance('localPageTree');
 
-                               $tree = $pagetree->ext_tree($inData['pagetree']['id'],$this->filterPageIds($this->export->excludeMap));
+                               $tree = $pagetree->ext_tree($inData['pagetree']['id'], $this->filterPageIds($this->export->excludeMap));
                                $this->treeHTML = $pagetree->printTree($tree);
 
                                $idH = $pagetree->buffer_idH;
                        } elseif ($inData['pagetree']['levels']==-2)    {       // Only tables on page
-                               $this->addRecordsForPid($inData['pagetree']['id'],$inData['pagetree']['tables'],$inData['pagetree']['maxNumber']);
+                               $this->addRecordsForPid($inData['pagetree']['id'], $inData['pagetree']['tables'], $inData['pagetree']['maxNumber']);
                        } else {        // Based on depth
                                        // Drawing tree:
                                        // If the ID is zero, export root
@@ -479,7 +479,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                                'title' => 'ROOT'
                                        );
                                } else {
-                                       $sPage = t3lib_BEfunc::getRecordWSOL('pages',$inData['pagetree']['id'],'*',' AND '.$this->perms_clause);
+                                       $sPage = t3lib_BEfunc::getRecordWSOL('pages', $inData['pagetree']['id'], '*', ' AND '.$this->perms_clause);
                                }
                                if (is_array($sPage)) {
                                        $pid = $inData['pagetree']['id'];
@@ -487,10 +487,10 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                        $tree->init('AND '.$this->perms_clause.$this->filterPageIds($this->export->excludeMap));
 
                                        $HTML = t3lib_iconWorks::getSpriteIconForRecord('pages', $sPage);
-                                       $tree->tree[] = Array('row'=>$sPage,'HTML'=>$HTML);
+                                       $tree->tree[] = Array('row'=>$sPage, 'HTML'=>$HTML);
                                        $tree->buffer_idH = array();
                                        if ($inData['pagetree']['levels']>0) {
-                                               $tree->getTree($pid,$inData['pagetree']['levels'],'');
+                                               $tree->getTree($pid, $inData['pagetree']['levels'], '');
                                        }
 
                                        $idH = array();
@@ -507,8 +507,8 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        if (is_array($idH)) {
                                $flatList = $this->export->setPageTree($idH);   // Sets the pagetree and gets a 1-dim array in return with the pages (in correct submission order BTW...)
                                foreach ($flatList as $k => $value) {
-                                       $this->export->export_addRecord('pages',t3lib_BEfunc::getRecord('pages',$k));
-                                       $this->addRecordsForPid($k,$inData['pagetree']['tables'],$inData['pagetree']['maxNumber']);
+                                       $this->export->export_addRecord('pages', t3lib_BEfunc::getRecord('pages', $k));
+                                       $this->addRecordsForPid($k, $inData['pagetree']['tables'], $inData['pagetree']['maxNumber']);
                                }
                        }
                }
@@ -640,9 +640,9 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                );
 
                        // Add hidden fields and create tabs:
-               $content = $this->doc->getDynTabMenu($menuItems,'tx_impexp_export',-1);
+               $content = $this->doc->getDynTabMenu($menuItems, 'tx_impexp_export', -1);
                $content.= '<input type="hidden" name="tx_impexp[action]" value="export" />';
-               $this->content.= $this->doc->section('',$content,0,1);
+               $this->content.= $this->doc->section('', $content, 0, 1);
 
                        // Output Overview:
                $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('execlistqu_structureToBeExported'), $overViewContent, 0, 1);
@@ -660,11 +660,11 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
        function addRecordsForPid($k, $tables, $maxNumber) {
                if (is_array($tables)) {
                        foreach ($GLOBALS['TCA'] as $table => $value) {
-                               if ($table!='pages' && (in_array($table,$tables) || in_array('_ALL',$tables))) {
-                                       if ($GLOBALS['BE_USER']->check('tables_select',$table) && !$GLOBALS['TCA'][$table]['ctrl']['is_static']) {
-                                               $res = $this->exec_listQueryPid($table,$k,t3lib_utility_Math::forceIntegerInRange($maxNumber,1));
+                               if ($table!='pages' && (in_array($table, $tables) || in_array('_ALL', $tables))) {
+                                       if ($GLOBALS['BE_USER']->check('tables_select', $table) && !$GLOBALS['TCA'][$table]['ctrl']['is_static']) {
+                                               $res = $this->exec_listQueryPid($table, $k, t3lib_utility_Math::forceIntegerInRange($maxNumber, 1));
                                                while($subTrow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
-                                                       $this->export->export_addRecord($table,$subTrow);
+                                                       $this->export->export_addRecord($table, $subTrow);
                                                }
                                        }
                                }
@@ -680,7 +680,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         * @param       integer         Max number of records to select
         * @return      pointer         SQL resource pointer
         */
-       function exec_listQueryPid($table,$pid,$limit) {
+       function exec_listQueryPid($table, $pid, $limit) {
                $orderBy = ($GLOBALS['TCA'][$table]['ctrl']['sortby']
                        ? 'ORDER BY ' . $GLOBALS['TCA'][$table]['ctrl']['sortby']
                        : $GLOBALS['TCA'][$table]['ctrl']['default_sortby']);
@@ -728,20 +728,20 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                        $row[] = '
                                <tr class="tableheader bgColor5">
-                                       <td colspan="2">'.$LANG->getLL('makeconfig_exportPagetreeConfiguration',1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeCfg', $GLOBALS['BACK_PATH'],'').'</td>
+                                       <td colspan="2">'.$LANG->getLL('makeconfig_exportPagetreeConfiguration', 1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeCfg', $GLOBALS['BACK_PATH'], '').'</td>
                                </tr>';
 
                        $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_pageId',1).'</strong></td>
+                                       <td><strong>'.$LANG->getLL('makeconfig_pageId', 1).'</strong></td>
                                        <td>'.htmlspecialchars($inData['pagetree']['id']).
                                                '<input type="hidden" value="'.htmlspecialchars($inData['pagetree']['id']).'" name="tx_impexp[pagetree][id]" /></td>
                                </tr>';
 
                        $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_tree',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeDisplay', $GLOBALS['BACK_PATH'],'').'</td>
-                                       <td>'.($this->treeHTML ? $this->treeHTML : $LANG->getLL('makeconfig_noTreeExportedOnly',1)).'</td>
+                                       <td><strong>'.$LANG->getLL('makeconfig_tree', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeDisplay', $GLOBALS['BACK_PATH'], '').'</td>
+                                       <td>'.($this->treeHTML ? $this->treeHTML : $LANG->getLL('makeconfig_noTreeExportedOnly', 1)).'</td>
                                </tr>';
 
                        $opt = array(
@@ -756,15 +756,15 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        );
                        $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_levels',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeMode', $GLOBALS['BACK_PATH'],'').'</td>
-                                       <td>'.$this->renderSelectBox('tx_impexp[pagetree][levels]',$inData['pagetree']['levels'],$opt).'</td>
+                                       <td><strong>'.$LANG->getLL('makeconfig_levels', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeMode', $GLOBALS['BACK_PATH'], '').'</td>
+                                       <td>'.$this->renderSelectBox('tx_impexp[pagetree][levels]', $inData['pagetree']['levels'], $opt).'</td>
                                </tr>';
 
                        $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_includeTables',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeRecordLimit', $GLOBALS['BACK_PATH'],'').'</td>
-                                       <td>'.$this->tableSelector('tx_impexp[pagetree][tables]',$inData['pagetree']['tables'],'pages').'<br/>
-                                               '.$LANG->getLL('makeconfig_maxNumberOfRecords',1).'<br/>
+                                       <td><strong>'.$LANG->getLL('makeconfig_includeTables', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'pageTreeRecordLimit', $GLOBALS['BACK_PATH'], '').'</td>
+                                       <td>'.$this->tableSelector('tx_impexp[pagetree][tables]', $inData['pagetree']['tables'], 'pages').'<br/>
+                                               '.$LANG->getLL('makeconfig_maxNumberOfRecords', 1).'<br/>
                                                <input type="text" name="tx_impexp[pagetree][maxNumber]" value="'.htmlspecialchars($inData['pagetree']['maxNumber']).'"'.$this->doc->formWidth(10).' /><br/>
                                        </td>
                                </tr>';
@@ -774,20 +774,20 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                if (is_array($inData['record'])) {
                        $row[] = '
                                <tr class="tableheader bgColor5">
-                                       <td colspan="2">'.$LANG->getLL('makeconfig_exportSingleRecord',1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'singleRecord', $GLOBALS['BACK_PATH'],'').'</td>
+                                       <td colspan="2">'.$LANG->getLL('makeconfig_exportSingleRecord', 1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'singleRecord', $GLOBALS['BACK_PATH'], '').'</td>
                                </tr>';
                        foreach($inData['record'] as $ref) {
                                $rParts = explode(':', $ref);
                                $tName = $rParts[0];
                                $rUid = $rParts[1];
                                $nameSuggestion.= $tName.'_'.$rUid;
-                               $rec = t3lib_BEfunc::getRecordWSOL($tName,$rUid);
+                               $rec = t3lib_BEfunc::getRecordWSOL($tName, $rUid);
 
                                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_record',1).'</strong></td>
+                                       <td><strong>'.$LANG->getLL('makeconfig_record', 1).'</strong></td>
                                        <td>' . t3lib_iconworks::getSpriteIconForRecord($tName, $rec) .
-                                               t3lib_BEfunc::getRecordTitle($tName,$rec,TRUE).
+                                               t3lib_BEfunc::getRecordTitle($tName, $rec, TRUE).
                                                '<input type="hidden" name="tx_impexp[record][]" value="'.htmlspecialchars($tName.':'.$rUid).'" /></td>
                                </tr>';
                        }
@@ -797,7 +797,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                if (is_array($inData['list'])) {
                        $row[] = '
                                <tr class="tableheader bgColor5">
-                                       <td colspan="2">'.$LANG->getLL('makeconfig_exportTablesFromPages',1).'</td>
+                                       <td colspan="2">'.$LANG->getLL('makeconfig_exportTablesFromPages', 1).'</td>
                                </tr>';
 
                                // Display information about pages from which the export takes place
@@ -821,13 +821,13 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        }
                        $row[] = '
                        <tr class="bgColor4">
-                               <td><strong>'.$LANG->getLL('makeconfig_tablePids',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'tableList', $GLOBALS['BACK_PATH'],'').'</td>
+                               <td><strong>'.$LANG->getLL('makeconfig_tablePids', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'tableList', $GLOBALS['BACK_PATH'], '').'</td>
                                <td>'.$tblList.'</td>
                        </tr>';
 
                        $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_maxNumberOfRecords',1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'tableListMaxNumber', $GLOBALS['BACK_PATH'],'').'</strong></td>
+                                       <td><strong>'.$LANG->getLL('makeconfig_maxNumberOfRecords', 1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'tableListMaxNumber', $GLOBALS['BACK_PATH'], '').'</strong></td>
                                        <td>
                                                <input type="text" name="tx_impexp[listCfg][maxNumber]" value="'.htmlspecialchars($inData['listCfg']['maxNumber']).'"'.$this->doc->formWidth(10).' /><br/>
                                        </td>
@@ -837,22 +837,22 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                $row[] = '
                        <tr class="tableheader bgColor5">
-                               <td colspan="2">'.$LANG->getLL('makeconfig_relationsAndExclusions',1).'</td>
+                               <td colspan="2">'.$LANG->getLL('makeconfig_relationsAndExclusions', 1).'</td>
                        </tr>';
 
                        // Add relation selector:
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_includeRelationsToTables',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'inclRelations', $GLOBALS['BACK_PATH'],'').'</td>
-                                       <td>'.$this->tableSelector('tx_impexp[external_ref][tables]',$inData['external_ref']['tables']).'</td>
+                                       <td><strong>'.$LANG->getLL('makeconfig_includeRelationsToTables', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'inclRelations', $GLOBALS['BACK_PATH'], '').'</td>
+                                       <td>'.$this->tableSelector('tx_impexp[external_ref][tables]', $inData['external_ref']['tables']).'</td>
                                </tr>';
 
                        // Add static relation selector:
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_useStaticRelationsFor',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'staticRelations', $GLOBALS['BACK_PATH'],'').'</td>
-                                       <td>'.$this->tableSelector('tx_impexp[external_static][tables]',$inData['external_static']['tables']).'<br/>
-                                               <label for="checkShowStaticRelations">'.$LANG->getLL('makeconfig_showStaticRelations',1).'</label> <input type="checkbox" name="tx_impexp[showStaticRelations]" id="checkShowStaticRelations" value="1"'.($inData['showStaticRelations'] ? ' checked="checked"' : '').' />
+                                       <td><strong>'.$LANG->getLL('makeconfig_useStaticRelationsFor', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'staticRelations', $GLOBALS['BACK_PATH'], '').'</td>
+                                       <td>'.$this->tableSelector('tx_impexp[external_static][tables]', $inData['external_static']['tables']).'<br/>
+                                               <label for="checkShowStaticRelations">'.$LANG->getLL('makeconfig_showStaticRelations', 1).'</label> <input type="checkbox" name="tx_impexp[showStaticRelations]" id="checkShowStaticRelations" value="1"'.($inData['showStaticRelations'] ? ' checked="checked"' : '').' />
                                                </td>
                                </tr>';
 
@@ -865,9 +865,9 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                }
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeconfig_excludeElements',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'excludedElements', $GLOBALS['BACK_PATH'],'').'</td>
+                                       <td><strong>'.$LANG->getLL('makeconfig_excludeElements', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'excludedElements', $GLOBALS['BACK_PATH'], '').'</td>
                                        <td>'.$excludeHiddenFields.'
-                                       '.(count($inData['exclude']) ? '<em>'.implode(', ',array_keys($inData['exclude'])).'</em><hr/><label for="checkExclude">'.$LANG->getLL('makeconfig_clearAllExclusions',1).'</label> <input type="checkbox" name="tx_impexp[exclude]" id="checkExclude" value="1" />' : $LANG->getLL('makeconfig_noExcludedElementsYet',1)).'
+                                       '.(count($inData['exclude']) ? '<em>'.implode(', ',array_keys($inData['exclude'])).'</em><hr/><label for="checkExclude">'.$LANG->getLL('makeconfig_clearAllExclusions', 1).'</label> <input type="checkbox" name="tx_impexp[exclude]" id="checkExclude" value="1" />' : $LANG->getLL('makeconfig_noExcludedElementsYet', 1)).'
                                        </td>
                                </tr>';
 
@@ -877,8 +877,8 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                <tr class="bgColor4">
                                        <td>&nbsp;</td>
                                        <td>
-                                               <input type="submit" value="'.$LANG->getLL('makeadvanc_update',1).'" />
-                                               <input type="hidden" name="tx_impexp[download_export_name]" value="'.substr($nameSuggestion,0,30).'" />
+                                               <input type="submit" value="'.$LANG->getLL('makeadvanc_update', 1).'" />
+                                               <input type="hidden" name="tx_impexp[download_export_name]" value="'.substr($nameSuggestion, 0, 30).'" />
                                        </td>
                                </tr>';
 
@@ -897,11 +897,11 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // Soft references
                $row[] = '
                        <tr class="tableheader bgColor5">
-                               <td colspan="2">'.$LANG->getLL('makeadvanc_softReferences',1).'</td>
+                               <td colspan="2">'.$LANG->getLL('makeadvanc_softReferences', 1).'</td>
                        </tr>';
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><label for="checkExcludeHTMLfileResources"><strong>'.$LANG->getLL('makeadvanc_excludeHtmlCssFile',1).'</strong></label>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'htmlCssResources', $GLOBALS['BACK_PATH'],'').'</td>
+                                       <td><label for="checkExcludeHTMLfileResources"><strong>'.$LANG->getLL('makeadvanc_excludeHtmlCssFile', 1).'</strong></label>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'htmlCssResources', $GLOBALS['BACK_PATH'], '').'</td>
                                        <td><input type="checkbox" name="tx_impexp[excludeHTMLfileResources]" id="checkExcludeHTMLfileResources" value="1"'.($inData['excludeHTMLfileResources'] ? ' checked="checked"' : '').' /></td>
                                </tr>';
 
@@ -909,12 +909,12 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // Extensions
                $row[] = '
                        <tr class="tableheader bgColor5">
-                               <td colspan="2">'.$LANG->getLL('makeadvanc_extensionDependencies',1).'</td>
+                               <td colspan="2">'.$LANG->getLL('makeadvanc_extensionDependencies', 1).'</td>
                        </tr>';
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makeadvanc_selectExtensionsThatThe',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'extensionDependencies', $GLOBALS['BACK_PATH'],'').'</td>
-                                       <td>'.$this->extensionSelector('tx_impexp[extension_dep]',$inData['extension_dep']).'</td>
+                                       <td><strong>'.$LANG->getLL('makeadvanc_selectExtensionsThatThe', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'extensionDependencies', $GLOBALS['BACK_PATH'], '').'</td>
+                                       <td>'.$this->extensionSelector('tx_impexp[extension_dep]', $inData['extension_dep']).'</td>
                                </tr>';
 
 
@@ -924,8 +924,8 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                <tr class="bgColor4">
                                        <td>&nbsp;</td>
                                        <td>
-                                               <input type="submit" value="'.$LANG->getLL('makesavefo_update',1).'" />
-                                               <input type="hidden" name="tx_impexp[download_export_name]" value="'.substr($nameSuggestion,0,30).'" />
+                                               <input type="submit" value="'.$LANG->getLL('makesavefo_update', 1).'" />
+                                               <input type="hidden" name="tx_impexp[download_export_name]" value="'.substr($nameSuggestion, 0, 30).'" />
                                        </td>
                                </tr>';
 
@@ -945,7 +945,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // Presets:
                $row[] = '
                        <tr class="tableheader bgColor5">
-                               <td colspan="2">'.$LANG->getLL('makesavefo_presets',1).'</td>
+                               <td colspan="2">'.$LANG->getLL('makesavefo_presets', 1).'</td>
                        </tr>';
 
                $opt = array('');
@@ -966,19 +966,19 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makesavefo_presets',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'presets', $GLOBALS['BACK_PATH'],'').'</td>
+                                       <td><strong>'.$LANG->getLL('makesavefo_presets', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'presets', $GLOBALS['BACK_PATH'], '').'</td>
                                        <td>
-                                               '.$LANG->getLL('makesavefo_selectPreset',1).'<br/>
-                                               '.$this->renderSelectBox('preset[select]','',$opt).'
+                                               '.$LANG->getLL('makesavefo_selectPreset', 1).'<br/>
+                                               '.$this->renderSelectBox('preset[select]', '', $opt).'
                                                <br/>
-                                               <input type="submit" value="'.$LANG->getLL('makesavefo_load',1).'" name="preset[load]" />
-                                               <input type="submit" value="'.$LANG->getLL('makesavefo_save',1).'" name="preset[save]" onclick="return confirm(\''.$LANG->getLL('makesavefo_areYouSure',1).'\');" />
-                                               <input type="submit" value="'.$LANG->getLL('makesavefo_delete',1).'" name="preset[delete]" onclick="return confirm(\''.$LANG->getLL('makesavefo_areYouSure',1).'\');" />
-                                               <input type="submit" value="'.$LANG->getLL('makesavefo_merge',1).'" name="preset[merge]" onclick="return confirm(\''.$LANG->getLL('makesavefo_areYouSure',1).'\');" />
+                                               <input type="submit" value="'.$LANG->getLL('makesavefo_load', 1).'" name="preset[load]" />
+                                               <input type="submit" value="'.$LANG->getLL('makesavefo_save', 1).'" name="preset[save]" onclick="return confirm(\''.$LANG->getLL('makesavefo_areYouSure', 1).'\');" />
+                                               <input type="submit" value="'.$LANG->getLL('makesavefo_delete', 1).'" name="preset[delete]" onclick="return confirm(\''.$LANG->getLL('makesavefo_areYouSure', 1).'\');" />
+                                               <input type="submit" value="'.$LANG->getLL('makesavefo_merge', 1).'" name="preset[merge]" onclick="return confirm(\''.$LANG->getLL('makesavefo_areYouSure', 1).'\');" />
                                                <br/>
-                                               '.$LANG->getLL('makesavefo_titleOfNewPreset',1).'
+                                               '.$LANG->getLL('makesavefo_titleOfNewPreset', 1).'
                                                <input type="text" name="tx_impexp[preset][title]" value="'.htmlspecialchars($inData['preset']['title']).'"'.$this->doc->formWidth(30).' /><br/>
-                                               <label for="checkPresetPublic">'.$LANG->getLL('makesavefo_public',1).'</label>
+                                               <label for="checkPresetPublic">'.$LANG->getLL('makesavefo_public', 1).'</label>
                                                <input type="checkbox" name="tx_impexp[preset][public]" id="checkPresetPublic" value="1"'.($inData['preset']['public'] ? ' checked="checked"' : '').' /><br/>
                                        </td>
                                </tr>';
@@ -986,30 +986,30 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // Output options:
                $row[] = '
                        <tr class="tableheader bgColor5">
-                               <td colspan="2">'.$LANG->getLL('makesavefo_outputOptions',1).'</td>
+                               <td colspan="2">'.$LANG->getLL('makesavefo_outputOptions', 1).'</td>
                        </tr>';
 
                        // Meta data:
                $tempDir = $this->userTempFolder();
                if ($tempDir) {
-                       $thumbnails = t3lib_div::getFilesInDir($tempDir,'png,gif,jpg');
-                       array_unshift($thumbnails,'');
+                       $thumbnails = t3lib_div::getFilesInDir($tempDir, 'png,gif,jpg');
+                       array_unshift($thumbnails, '');
                } else $thumbnails = FALSE;
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makesavefo_metaData',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'metadata', $GLOBALS['BACK_PATH'],'').'</td>
+                                       <td><strong>'.$LANG->getLL('makesavefo_metaData', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'metadata', $GLOBALS['BACK_PATH'], '').'</td>
                                        <td>
-                                                       '.$LANG->getLL('makesavefo_title',1).' <br/>
+                                                       '.$LANG->getLL('makesavefo_title', 1).' <br/>
                                                        <input type="text" name="tx_impexp[meta][title]" value="'.htmlspecialchars($inData['meta']['title']).'"'.$this->doc->formWidth(30).' /><br/>
-                                                       '.$LANG->getLL('makesavefo_description',1).' <br/>
+                                                       '.$LANG->getLL('makesavefo_description', 1).' <br/>
                                                        <input type="text" name="tx_impexp[meta][description]" value="'.htmlspecialchars($inData['meta']['description']).'"'.$this->doc->formWidth(30).' /><br/>
-                                                       '.$LANG->getLL('makesavefo_notes',1).' <br/>
-                                                       <textarea name="tx_impexp[meta][notes]"'.$this->doc->formWidth(30,1).'>'.t3lib_div::formatForTextarea($inData['meta']['notes']).'</textarea><br/>
+                                                       '.$LANG->getLL('makesavefo_notes', 1).' <br/>
+                                                       <textarea name="tx_impexp[meta][notes]"'.$this->doc->formWidth(30, 1).'>'.t3lib_div::formatForTextarea($inData['meta']['notes']).'</textarea><br/>
                                                        '.(is_array($thumbnails) ? '
-                                                       '.$LANG->getLL('makesavefo_thumbnail',1).'<br/>
-                                                       '.$this->renderSelectBox('tx_impexp[meta][thumbnail]',$inData['meta']['thumbnail'],$thumbnails).'<br/>
-                                                       '.($inData['meta']['thumbnail'] ? '<img src="'.$this->doc->backPath.'../'.substr($tempDir,strlen(PATH_site)).$thumbnails[$inData['meta']['thumbnail']].'" vspace="5" style="border: solid black 1px;" alt="" /><br/>' : '').'
-                                                       '.$LANG->getLL('makesavefo_uploadThumbnail',1).'<br/>
+                                                       '.$LANG->getLL('makesavefo_thumbnail', 1).'<br/>
+                                                       '.$this->renderSelectBox('tx_impexp[meta][thumbnail]', $inData['meta']['thumbnail'], $thumbnails).'<br/>
+                                                       '.($inData['meta']['thumbnail'] ? '<img src="'.$this->doc->backPath.'../'.substr($tempDir, strlen(PATH_site)).$thumbnails[$inData['meta']['thumbnail']].'" vspace="5" style="border: solid black 1px;" alt="" /><br/>' : '').'
+                                                       '.$LANG->getLL('makesavefo_uploadThumbnail', 1).'<br/>
                                                        <input type="file" name="upload_1" '.$this->doc->formWidth(30).' size="30" /><br/>
                                                                <input type="hidden" name="file[upload][1][target]" value="'.htmlspecialchars($tempDir).'" />
                                                                <input type="hidden" name="file[upload][1][data]" value="1" /><br />
@@ -1027,11 +1027,11 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                $opt['xml'] = $LANG->getLL('makesavefo_xml');
                $row[] = '
                                <tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('makesavefo_fileFormat',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'fileFormat', $GLOBALS['BACK_PATH'],'').'</td>
-                                       <td>'.$this->renderSelectBox('tx_impexp[filetype]',$inData['filetype'],$opt).'<br/>
-                                               '.$LANG->getLL('makesavefo_maxSizeOfFiles',1).'<br/>
+                                       <td><strong>'.$LANG->getLL('makesavefo_fileFormat', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'fileFormat', $GLOBALS['BACK_PATH'], '').'</td>
+                                       <td>'.$this->renderSelectBox('tx_impexp[filetype]', $inData['filetype'], $opt).'<br/>
+                                               '.$LANG->getLL('makesavefo_maxSizeOfFiles', 1).'<br/>
                                                <input type="text" name="tx_impexp[maxFileSize]" value="'.htmlspecialchars($inData['maxFileSize']).'"'.$this->doc->formWidth(10).' /><br/>
-                                               '.($savePath ? sprintf($LANG->getLL('makesavefo_filenameSavedInS',1),substr($savePath,strlen(PATH_site))).'<br/>
+                                               '.($savePath ? sprintf($LANG->getLL('makesavefo_filenameSavedInS', 1), substr($savePath,strlen(PATH_site))).'<br/>
                                                <input type="text" name="tx_impexp[filename]" value="'.htmlspecialchars($inData['filename']).'"'.$this->doc->formWidth(30).' /><br/>' : '').'
                                        </td>
                                </tr>';
@@ -1041,8 +1041,8 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                $row[] = '
                                <tr class="bgColor4">
                                        <td>&nbsp;</td>
-                                       <td><input type="submit" value="'.$LANG->getLL('makesavefo_update',1).'" /> - <input type="submit" value="'.$LANG->getLL('makesavefo_downloadExport',1).'" name="tx_impexp[download_export]" />'.
-                                               ($savePath ? ' - <input type="submit" value="'.$LANG->getLL('importdata_saveToFilename',1).'" name="tx_impexp[save_export]" />' : '').'</td>
+                                       <td><input type="submit" value="'.$LANG->getLL('makesavefo_update', 1).'" /> - <input type="submit" value="'.$LANG->getLL('makesavefo_downloadExport', 1).'" name="tx_impexp[download_export]" />'.
+                                               ($savePath ? ' - <input type="submit" value="'.$LANG->getLL('importdata_saveToFilename', 1).'" name="tx_impexp[save_export]" />' : '').'</td>
                                </tr>';
        }
 
@@ -1077,7 +1077,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                if (($this->id && $access) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) {
                        if ($GLOBALS['BE_USER']->user['admin'] && !$this->id) {
-                               $this->pageinfo=array('title' => '[root-level]','uid'=>0,'pid'=>0);
+                               $this->pageinfo=array('title' => '[root-level]', 'uid'=>0, 'pid'=>0);
                        }
 
                        if ($inData['new_import']) {
@@ -1086,7 +1086,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                        /** @var $import tx_impexp */
                        $import = t3lib_div::makeInstance('tx_impexp');
-                       $import->init(0,'import');
+                       $import->init(0, 'import');
                        $import->update = $inData['do_update'];
                        $import->import_mode = $inData['import_mode'];
                        $import->enableLogging = $inData['enableLogging'];
@@ -1122,79 +1122,79 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        $row = array();
                        $opt = array('');
                        foreach($filesInDir as $file) {
-                               $opt[$file] = substr($file,strlen(PATH_site));
+                               $opt[$file] = substr($file, strlen(PATH_site));
                        }
 
                        $row[] = '<tr class="bgColor5">
-                                       <td colspan="2"><strong>'.$LANG->getLL('importdata_selectFileToImport',1).'</strong></td>
+                                       <td colspan="2"><strong>'.$LANG->getLL('importdata_selectFileToImport', 1).'</strong></td>
                                </tr>';
 
                        $row[] = '<tr class="bgColor4">
-                               <td><strong>'.$LANG->getLL('importdata_file',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'importFile', $GLOBALS['BACK_PATH'],'').'</td>
+                               <td><strong>'.$LANG->getLL('importdata_file', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'importFile', $GLOBALS['BACK_PATH'], '').'</td>
                                <td>'.
-                                       $this->renderSelectBox('tx_impexp[file]',$inData['file'],$opt).'<br />'.sprintf($LANG->getLL('importdata_fromPathS',1),$path).
-                                       (!$import->compress ? '<br /><span class="typo3-red">'.$LANG->getLL('importdata_noteNoDecompressorAvailable',1).'</span>':'').
+                                       $this->renderSelectBox('tx_impexp[file]', $inData['file'], $opt).'<br />'.sprintf($LANG->getLL('importdata_fromPathS', 1),$path).
+                                       (!$import->compress ? '<br /><span class="typo3-red">'.$LANG->getLL('importdata_noteNoDecompressorAvailable', 1).'</span>':'').
                                '</td>
                                </tr>';
 
                        $row[] = '<tr class="bgColor5">
-                                       <td colspan="2"><strong>'.$LANG->getLL('importdata_importOptions',1).'</strong></td>
+                                       <td colspan="2"><strong>'.$LANG->getLL('importdata_importOptions', 1).'</strong></td>
                                </tr>';
 
                        $row[] = '<tr class="bgColor4">
-                               <td><strong>'.$LANG->getLL('importdata_update',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'update', $GLOBALS['BACK_PATH'],'').'</td>
+                               <td><strong>'.$LANG->getLL('importdata_update', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'update', $GLOBALS['BACK_PATH'], '').'</td>
                                <td>
                                        <input type="checkbox" name="tx_impexp[do_update]" id="checkDo_update" value="1"'.($inData['do_update'] ? ' checked="checked"' : '').' />
-                                       <label for="checkDo_update">'.$LANG->getLL('importdata_updateRecords',1).'</label><br/>
-                               <em>('.$LANG->getLL('importdata_thisOptionRequiresThat',1).')</em>'.
+                                       <label for="checkDo_update">'.$LANG->getLL('importdata_updateRecords', 1).'</label><br/>
+                               <em>('.$LANG->getLL('importdata_thisOptionRequiresThat', 1).')</em>'.
                                ($inData['do_update'] ?
                                '       <hr/>
                                        <input type="checkbox" name="tx_impexp[global_ignore_pid]" id="checkGlobal_ignore_pid" value="1"'.($inData['global_ignore_pid'] ? ' checked="checked"' : '').' />
-                                       <label for="checkGlobal_ignore_pid">'.$LANG->getLL('importdata_ignorePidDifferencesGlobally',1).'</label><br/>
-                                       <em>('.$LANG->getLL('importdata_ifYouSetThis',1).')</em>
+                                       <label for="checkGlobal_ignore_pid">'.$LANG->getLL('importdata_ignorePidDifferencesGlobally', 1).'</label><br/>
+                                       <em>('.$LANG->getLL('importdata_ifYouSetThis', 1).')</em>
                                        ' : ''
                                ).'</td>
                                </tr>';
 
                        $row[] = '<tr class="bgColor4">
-                               <td><strong>'.$LANG->getLL('importdata_options',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'options', $GLOBALS['BACK_PATH'],'').'</td>
+                               <td><strong>'.$LANG->getLL('importdata_options', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'options', $GLOBALS['BACK_PATH'], '').'</td>
                                <td>
                                        <input type="checkbox" name="tx_impexp[notShowDiff]" id="checkNotShowDiff" value="1"'.($inData['notShowDiff'] ? ' checked="checked"' : '').' />
-                                       <label for="checkNotShowDiff">'.$LANG->getLL('importdata_doNotShowDifferences',1).'</label><br/>
-                                       <em>('.$LANG->getLL('importdata_greenValuesAreFrom',1).')</em>
+                                       <label for="checkNotShowDiff">'.$LANG->getLL('importdata_doNotShowDifferences', 1).'</label><br/>
+                                       <em>('.$LANG->getLL('importdata_greenValuesAreFrom', 1).')</em>
                                        <br/><br/>
 
                                        '.($GLOBALS['BE_USER']->isAdmin() ? '
                                        <input type="checkbox" name="tx_impexp[allowPHPScripts]" id="checkAllowPHPScripts" value="1"'.($inData['allowPHPScripts'] ? ' checked="checked"' : '').' />
-                                       <label for="checkAllowPHPScripts">'.$LANG->getLL('importdata_allowToWriteBanned',1).'</label><br/>' : '').
+                                       <label for="checkAllowPHPScripts">'.$LANG->getLL('importdata_allowToWriteBanned', 1).'</label><br/>' : '').
 
                                        (!$inData['do_update'] && $GLOBALS['BE_USER']->isAdmin() ? '
                                        <br/>
                                        <input type="checkbox" name="tx_impexp[force_all_UIDS]" id="checkForce_all_UIDS" value="1"'.($inData['force_all_UIDS'] ? ' checked="checked"' : '').' />
-                                       <label for="checkForce_all_UIDS"><span class="typo3-red">'.$LANG->getLL('importdata_force_all_UIDS',1).'</span></label><br/>
-                                       <em>('.$LANG->getLL('importdata_force_all_UIDS_descr',1).')</em>' : '').
+                                       <label for="checkForce_all_UIDS"><span class="typo3-red">'.$LANG->getLL('importdata_force_all_UIDS', 1).'</span></label><br/>
+                                       <em>('.$LANG->getLL('importdata_force_all_UIDS_descr', 1).')</em>' : '').
                                        '
                                </td>
                                </tr>';
 
                        $row[] = '<tr class="bgColor4">
-                               <td><strong>'.$LANG->getLL('importdata_action',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'action', $GLOBALS['BACK_PATH'],'').'</td>
+                               <td><strong>'.$LANG->getLL('importdata_action', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'action', $GLOBALS['BACK_PATH'], '').'</td>
                                <td>'.
-                                       (!$inData['import_file'] ? '<input type="submit" value="'.$LANG->getLL('importdata_preview',1).'" />'.($inData['file'] ? ' - <input type="submit" value="'.($inData['do_update']?$LANG->getLL('importdata_update_299e',1):$LANG->getLL('importdata_import',1)).'" name="tx_impexp[import_file]" onclick="return confirm(\''.$LANG->getLL('importdata_areYouSure',1).'\');" />':''):'<input type="submit" name="tx_impexp[new_import]" value="'.$LANG->getLL('importdata_newImport',1).'" />').'
+                                       (!$inData['import_file'] ? '<input type="submit" value="'.$LANG->getLL('importdata_preview', 1).'" />'.($inData['file'] ? ' - <input type="submit" value="'.($inData['do_update']?$LANG->getLL('importdata_update_299e', 1):$LANG->getLL('importdata_import', 1)).'" name="tx_impexp[import_file]" onclick="return confirm(\''.$LANG->getLL('importdata_areYouSure', 1).'\');" />':''):'<input type="submit" name="tx_impexp[new_import]" value="'.$LANG->getLL('importdata_newImport', 1).'" />').'
                                        <input type="hidden" name="tx_impexp[action]" value="import" /></td>
                                </tr>';
 
                        $row[] = '<tr class="bgColor4">
-                               <td><strong>'.$LANG->getLL('importdata_enableLogging',1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'enableLogging', $GLOBALS['BACK_PATH'],'').'</td>
+                               <td><strong>'.$LANG->getLL('importdata_enableLogging', 1).'</strong>'.t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'enableLogging', $GLOBALS['BACK_PATH'], '').'</td>
                                <td>
                                        <input type="checkbox" name="tx_impexp[enableLogging]" id="checkEnableLogging" value="1"'.($inData['enableLogging'] ? ' checked="checked"' : '').' />
-                                       <label for="checkEnableLogging">'.$LANG->getLL('importdata_writeIndividualDbActions',1).'</label><br/>
-                                       <em>('.$LANG->getLL('importdata_thisIsDisabledBy',1).')</em>
+                                       <label for="checkEnableLogging">'.$LANG->getLL('importdata_writeIndividualDbActions', 1).'</label><br/>
+                                       <em>('.$LANG->getLL('importdata_thisIsDisabledBy', 1).')</em>
                                </td>
                                </tr>';
 
                        $menuItems[] = array(
-                               'label' => $LANG->getLL('importdata_import',1),
+                               'label' => $LANG->getLL('importdata_import', 1),
                                'content' => '
                                        <table border="0" cellpadding="1" cellspacing="1">
                                                '.implode('
@@ -1209,26 +1209,26 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                $row = array();
 
                                $row[] = '<tr class="bgColor5">
-                                               <td colspan="2"><strong>'.$LANG->getLL('importdata_uploadFileFromLocal',1).'</strong></td>
+                                               <td colspan="2"><strong>'.$LANG->getLL('importdata_uploadFileFromLocal', 1).'</strong></td>
                                        </tr>';
 
                                $row[] = '<tr class="bgColor4">
-                                               <td>'.$LANG->getLL('importdata_browse',1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'upload', $GLOBALS['BACK_PATH'],'').'</td>
+                                               <td>'.$LANG->getLL('importdata_browse', 1).t3lib_BEfunc::cshItem('xMOD_tx_impexp', 'upload', $GLOBALS['BACK_PATH'], '').'</td>
                                                <td>
 
                                                                <input type="file" name="upload_1"'.$this->doc->formWidth(35).' size="40" />
                                                                <input type="hidden" name="file[upload][1][target]" value="'.htmlspecialchars($tempFolder).'" />
                                                                <input type="hidden" name="file[upload][1][data]" value="1" /><br />
 
-                                                               <input type="submit" name="_upload" value="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.submit',1).'" />
-                                                               <input type="checkbox" name="overwriteExistingFiles" id="checkOverwriteExistingFiles" value="1" checked="checked" /> <label for="checkOverwriteExistingFiles">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.php:overwriteExistingFiles',1).'</label>
+                                                               <input type="submit" name="_upload" value="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:file_upload.php.submit', 1).'" />
+                                                               <input type="checkbox" name="overwriteExistingFiles" id="checkOverwriteExistingFiles" value="1" checked="checked" /> <label for="checkOverwriteExistingFiles">'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.php:overwriteExistingFiles', 1).'</label>
                                                </td>
                                        </tr>';
 
                                if (t3lib_div::_POST('_upload')) {
                                        $row[] = '<tr class="bgColor4">
-                                                       <td>'.$LANG->getLL('importdata_uploadStatus',1).'</td>
-                                                       <td>'.($this->fileProcessor->internalUploadMap[1] ? $LANG->getLL('importdata_success',1).' '.substr($this->fileProcessor->internalUploadMap[1],strlen(PATH_site)) : '<span class="typo3-red">'.$LANG->getLL('importdata_failureNoFileUploaded',1).'</span>').'</td>
+                                                       <td>'.$LANG->getLL('importdata_uploadStatus', 1).'</td>
+                                                       <td>'.($this->fileProcessor->internalUploadMap[1] ? $LANG->getLL('importdata_success', 1).' '.substr($this->fileProcessor->internalUploadMap[1], strlen(PATH_site)) : '<span class="typo3-red">'.$LANG->getLL('importdata_failureNoFileUploaded', 1).'</span>').'</td>
                                                </tr>';
                                }
 
@@ -1251,7 +1251,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        $inFile = t3lib_div::getFileAbsFileName($inData['file']);
                        if ($inFile && @is_file($inFile)) {
                                $trow = array();
-                               if ($import->loadFile($inFile,1)) {
+                               if ($import->loadFile($inFile, 1)) {
 
                                                // Check extension dependencies:
                                        $extKeysToInstall = array();
@@ -1268,10 +1268,10 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                                unset($passParams['import_mode']);
                                                unset($passParams['import_file']);
 
-                                               $thisScriptUrl = t3lib_div::getIndpEnv('REQUEST_URI').'?M=xMOD_tximpexp&id='.$this->id.t3lib_div::implodeArrayForUrl('tx_impexp',$passParams);
+                                               $thisScriptUrl = t3lib_div::getIndpEnv('REQUEST_URI').'?M=xMOD_tximpexp&id='.$this->id.t3lib_div::implodeArrayForUrl('tx_impexp', $passParams);
                                                $emURL = $this->doc->backPath . t3lib_extMgm::extRelPath('em') . 'classes/index.php?CMD[requestInstallExtensions]=' .
                                                        implode(',', $extKeysToInstall) . '&returnUrl=' . rawurlencode($thisScriptUrl);
-                                               $extensionInstallationMessage = 'Before you can install this T3D file you need to install the extensions "'.implode('", "',$extKeysToInstall).'". Clicking Import will first take you to the Extension Manager so these dependencies can be resolved.';
+                                               $extensionInstallationMessage = 'Before you can install this T3D file you need to install the extensions "'.implode('", "', $extKeysToInstall).'". Clicking Import will first take you to the Extension Manager so these dependencies can be resolved.';
                                        }
 
                                        if ($inData['import_file']) {
@@ -1289,39 +1289,39 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                                        // Meta data output:
                                $trow[] = '<tr class="bgColor5">
-                                               <td colspan="2"><strong>'.$LANG->getLL('importdata_metaData',1).'</strong></td>
+                                               <td colspan="2"><strong>'.$LANG->getLL('importdata_metaData', 1).'</strong></td>
                                        </tr>';
 
                                $opt = array('');
                                foreach($filesInDir as $file) {
-                                       $opt[$file] = substr($file,strlen(PATH_site));
+                                       $opt[$file] = substr($file, strlen(PATH_site));
                                }
 
                                $trow[] = '<tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('importdata_title',1).'</strong></td>
+                                       <td><strong>'.$LANG->getLL('importdata_title', 1).'</strong></td>
                                        <td width="95%">'.nl2br(htmlspecialchars($import->dat['header']['meta']['title'])).'</td>
                                        </tr>';
 
                                $trow[] = '<tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('importdata_description',1).'</strong></td>
+                                       <td><strong>'.$LANG->getLL('importdata_description', 1).'</strong></td>
                                        <td width="95%">'.nl2br(htmlspecialchars($import->dat['header']['meta']['description'])).'</td>
                                        </tr>';
 
                                $trow[] = '<tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('importdata_notes',1).'</strong></td>
+                                       <td><strong>'.$LANG->getLL('importdata_notes', 1).'</strong></td>
                                        <td width="95%">'.nl2br(htmlspecialchars($import->dat['header']['meta']['notes'])).'</td>
                                        </tr>';
 
                                $trow[] = '<tr class="bgColor4">
-                                       <td><strong>'.$LANG->getLL('importdata_packager',1).'</strong></td>
+                                       <td><strong>'.$LANG->getLL('importdata_packager', 1).'</strong></td>
                                        <td width="95%">'.nl2br(htmlspecialchars($import->dat['header']['meta']['packager_name'].' ('.$import->dat['header']['meta']['packager_username'].')')).'<br/>
-                                               '.$LANG->getLL('importdata_email',1).' '.$import->dat['header']['meta']['packager_email'].'</td>
+                                               '.$LANG->getLL('importdata_email', 1).' '.$import->dat['header']['meta']['packager_email'].'</td>
                                        </tr>';
 
                                        // Thumbnail icon:
                                if (is_array($import->dat['header']['thumbnail'])) {
                                        $pI = pathinfo($import->dat['header']['thumbnail']['filename']);
-                                       if (t3lib_div::inList('gif,jpg,png,jpeg',strtolower($pI['extension']))) {
+                                       if (t3lib_div::inList('gif,jpg,png,jpeg', strtolower($pI['extension']))) {
 
                                                        // Construct filename and write it:
                                                $fileName = PATH_site.
@@ -1331,10 +1331,10 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                                        // Check that the image really is an image and not a malicious PHP script...
                                                if (getimagesize($fileName)) {
                                                                // Create icon tag:
-                                                       $iconTag = '<img src="'.$this->doc->backPath.'../'.substr($fileName,strlen(PATH_site)).'" '.$import->dat['header']['thumbnail']['imgInfo'][3].' vspace="5" style="border: solid black 1px;" alt="" />';
+                                                       $iconTag = '<img src="'.$this->doc->backPath.'../'.substr($fileName, strlen(PATH_site)).'" '.$import->dat['header']['thumbnail']['imgInfo'][3].' vspace="5" style="border: solid black 1px;" alt="" />';
 
                                                        $trow[] = '<tr class="bgColor4">
-                                                               <td><strong>'.$LANG->getLL('importdata_icon',1).'</strong></td>
+                                                               <td><strong>'.$LANG->getLL('importdata_icon', 1).'</strong></td>
                                                                <td>'.$iconTag.'</td>
                                                                </tr>';
                                                } else {
@@ -1363,16 +1363,16 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        );
 
                                // Output tabs:
-                       $content = $this->doc->getDynTabMenu($menuItems,'tx_impexp_import',-1);
+                       $content = $this->doc->getDynTabMenu($menuItems, 'tx_impexp_import', -1);
                        if ($extensionInstallationMessage) {
                                $content = '<div style="border: 1px black solid; margin: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;">'.$this->doc->icons(1).htmlspecialchars($extensionInstallationMessage).'</div>'.$content;
                        }
-                       $this->content.= $this->doc->section('',$content,0,1);
+                       $this->content.= $this->doc->section('', $content, 0, 1);
 
 
                                // Print overview:
                        if ($overviewContent) {
-                               $this->content.= $this->doc->section($inData['import_file'] ? $LANG->getLL('importdata_structureHasBeenImported',1) : $LANG->getLL('filterpage_structureToBeImported',1), $overviewContent, 0, 1);
+                               $this->content.= $this->doc->section($inData['import_file'] ? $LANG->getLL('importdata_structureHasBeenImported', 1) : $LANG->getLL('filterpage_structureToBeImported', 1), $overviewContent, 0, 1);
                        }
                }
        }
@@ -1417,7 +1417,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                                'item_uid' => $inData['pagetree']['id'],
                                                'preset_data' => serialize($inData)
                                        );
-                                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_impexp_presets','uid='.intval($preset['uid']),$fields_values);
+                                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_impexp_presets','uid='.intval($preset['uid']), $fields_values);
                                        $msg = 'Preset #'.$preset['uid'].' saved!';
                                } else {
                                        $msg = 'ERROR: The preset was not saved because you were not the owner of it!';
@@ -1431,7 +1431,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                                        'item_uid' => $inData['pagetree']['id'],
                                        'preset_data' => serialize($inData)
                                );
-                               $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_impexp_presets',$fields_values);
+                               $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_impexp_presets', $fields_values);
                                $msg = 'New preset "' . htmlspecialchars($inData['preset']['title']) . '" is created';
                        }
                }
@@ -1441,7 +1441,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        $preset = $this->getPreset($presetData['select']);
                        if (is_array($preset))  {       // Update existing
                                if ($GLOBALS['BE_USER']->isAdmin() || $preset['user_uid'] === $GLOBALS['BE_USER']->user['uid']) {
-                                       $GLOBALS['TYPO3_DB']->exec_DELETEquery('tx_impexp_presets','uid='.intval($preset['uid']));
+                                       $GLOBALS['TYPO3_DB']->exec_DELETEquery('tx_impexp_presets', 'uid='.intval($preset['uid']));
                                        $msg = 'Preset #'.$preset['uid'].' deleted!';
                                } else {
                                        $msg = 'ERROR: You were not the owner of the preset so you could not delete it.';
@@ -1486,7 +1486,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
 
                        // Show message:
                if (strlen($msg)) {
-                       $this->content.= $this->doc->section('Presets',$msg,0,1,$err ? 3 : 1);
+                       $this->content.= $this->doc->section('Presets', $msg, 0, 1, $err ? 3 : 1);
                }
        }
 
@@ -1575,7 +1575,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                $httpHost = t3lib_div::getIndpEnv('TYPO3_HOST_ONLY');
                if ($httpHost != $refInfo['host'] && $this->vC != $GLOBALS['BE_USER']->veriCode()
                        && !$GLOBALS['$TYPO3_CONF_VARS']['SYS']['doNotCheckReferer']) {
-                       $this->fileProcessor->writeLog(0,2,1,'Referer host "%s" and server host "%s" did not match!',array($refInfo['host'],$httpHost));
+                       $this->fileProcessor->writeLog(0, 2, 1, 'Referer host "%s" and server host "%s" did not match!', array($refInfo['host'], $httpHost));
                } else {
                        $this->fileProcessor->start($file);
                        $this->fileProcessor->processData();
@@ -1590,18 +1590,18 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         * @param       array           Options to display (key/value pairs)
         * @return      string          HTML select element
         */
-       function renderSelectBox($prefix,$value,$optValues) {
+       function renderSelectBox($prefix, $value, $optValues) {
                $opt = array();
                $isSelFlag = 0;
                foreach ($optValues as $k => $v) {
-                       $sel = (!strcmp($k,$value) ? ' selected="selected"' : '');
+                       $sel = (!strcmp($k, $value) ? ' selected="selected"' : '');
                        if ($sel)       $isSelFlag++;
                        $opt[] = '<option value="'.htmlspecialchars($k).'"'.$sel.'>'.htmlspecialchars($v).'</option>';
                }
-               if (!$isSelFlag && strcmp('',$value)) {
+               if (!$isSelFlag && strcmp('', $value)) {
                        $opt[] = '<option value="'.htmlspecialchars($value).'" selected="selected">'.htmlspecialchars("['".$value."']").'</option>';
                }
-               return '<select name="'.$prefix.'">'.implode('',$opt).'</select>';
+               return '<select name="'.$prefix.'">'.implode('', $opt).'</select>';
        }
 
        /**
@@ -1612,15 +1612,15 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         * @param       string          Table names (and the string "_ALL") to exclude. Comma list
         * @return      string          HTML select element
         */
-       function tableSelector($prefix,$value,$excludeList='') {
+       function tableSelector($prefix, $value, $excludeList='') {
                $optValues = array();
 
-               if (!t3lib_div::inList($excludeList,'_ALL')) {
+               if (!t3lib_div::inList($excludeList, '_ALL')) {
                        $optValues['_ALL'] = '[' . $GLOBALS['LANG']->getLL('ALL_tables').']';
                }
 
                foreach ($GLOBALS['TCA'] as $table => $_) {
-                       if ($GLOBALS['BE_USER']->check('tables_select',$table) && !t3lib_div::inList($excludeList,$table)) {
+                       if ($GLOBALS['BE_USER']->check('tables_select', $table) && !t3lib_div::inList($excludeList, $table)) {
                                $optValues[$table] = $table;
                        }
                }
@@ -1630,11 +1630,11 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                $opt[] = '<option value=""></option>';
                foreach ($optValues as $k => $v) {
                        if (is_array($value)) {
-                               $sel = in_array($k,$value)?' selected="selected"':'';
+                               $sel = in_array($k, $value)?' selected="selected"':'';
                        }
                        $opt[] = '<option value="'.htmlspecialchars($k).'"'.$sel.'>'.htmlspecialchars($v).'</option>';
                }
-               return '<select name="'.$prefix.'[]" multiple="multiple" size="'.t3lib_utility_Math::forceIntegerInRange(count($opt),5,10).'">'.implode('',$opt).'</select>';
+               return '<select name="'.$prefix.'[]" multiple="multiple" size="'.t3lib_utility_Math::forceIntegerInRange(count($opt), 5, 10).'">'.implode('', $opt).'</select>';
        }
 
        /**
@@ -1644,7 +1644,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
         * @param       array           The current values selected
         * @return      string          HTML select element
         */
-       function extensionSelector($prefix,$value) {
+       function extensionSelector($prefix, $value) {
                global $TYPO3_LOADED_EXT;
 
                $extTrav = array_keys($TYPO3_LOADED_EXT);
@@ -1655,12 +1655,12 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                foreach($extTrav as $v) {
                        if ($v!=='_CACHEFILE') {
                                if (is_array($value)) {
-                                       $sel = in_array($v,$value)?' selected="selected"':'';
+                                       $sel = in_array($v, $value)?' selected="selected"':'';
                                }
                                $opt[] = '<option value="'.htmlspecialchars($v).'"'.$sel.'>'.htmlspecialchars($v).'</option>';
                        }
                }
-               return '<select name="'.$prefix.'[]" multiple="multiple" size="'.t3lib_utility_Math::forceIntegerInRange(count($opt),5,10).'">'.implode('',$opt).'</select>';
+               return '<select name="'.$prefix.'[]" multiple="multiple" size="'.t3lib_utility_Math::forceIntegerInRange(count($opt), 5, 10).'">'.implode('', $opt).'</select>';
        }
 
        /**
@@ -1677,7 +1677,7 @@ class SC_mod_tools_log_index extends t3lib_SCbase {
                        // Traverse
                $pageIds = array();
                foreach($exclude as $element) {
-                       list($table,$uid) = explode(':', $element);
+                       list($table, $uid) = explode(':', $element);
                        if ($table==='pages') {
                                $pageIds[] = intval($uid);
                        }
index 46fa68d..6dc0afb 100755 (executable)
  *     $this->export->relOnlyTables[]="tt_news";       // exclusively includes. See comment in the class
  *
  *             // Adding records:
- *     $this->export->export_addRecord("pages",$this->pageinfo);
- *     $this->export->export_addRecord("pages",t3lib_BEfunc::getRecord("pages",38));
- *     $this->export->export_addRecord("pages",t3lib_BEfunc::getRecord("pages",39));
- *     $this->export->export_addRecord("tt_content",t3lib_BEfunc::getRecord("tt_content",12));
- *     $this->export->export_addRecord("tt_content",t3lib_BEfunc::getRecord("tt_content",74));
- *     $this->export->export_addRecord("sys_template",t3lib_BEfunc::getRecord("sys_template",20));
+ *     $this->export->export_addRecord("pages", $this->pageinfo);
+ *     $this->export->export_addRecord("pages", t3lib_BEfunc::getRecord("pages", 38));
+ *     $this->export->export_addRecord("pages", t3lib_BEfunc::getRecord("pages", 39));
+ *     $this->export->export_addRecord("tt_content", t3lib_BEfunc::getRecord("tt_content", 12));
+ *     $this->export->export_addRecord("tt_content", t3lib_BEfunc::getRecord("tt_content", 74));
+ *     $this->export->export_addRecord("sys_template", t3lib_BEfunc::getRecord("sys_template", 20));
  *
  *             // Adding all the relations (recursively in 5 levels so relations has THEIR relations registered as well)
  *     for($a=0;$a<5;$a++) {
@@ -135,7 +135,7 @@ class tx_impexp {
         * @param       string          Mode of usage, either "import" or "export"
         * @return      void
         */
-       function init($dontCompress=0,$mode='') {
+       function init($dontCompress=0, $mode='') {
                $this->compress = function_exists('gzcompress');
                $this->dontCompress = $dontCompress;
 
@@ -205,7 +205,7 @@ class tx_impexp {
         * @param       string          Email of the packager
         * @return      void
         */
-       function setMetaData($title,$description,$notes,$packager_username,$packager_name,$packager_email) {
+       function setMetaData($title, $description, $notes, $packager_username, $packager_name, $packager_email) {
                $this->dat['header']['meta'] = array(
                        'title' => $title,
                        'description' => $description,
@@ -296,13 +296,13 @@ class tx_impexp {
         * @return      array           Array with uid-uid pairs for all pages in the page tree.
         * @see flatInversePageTree_pid()
         */
-       function flatInversePageTree($idH,$a=array()) {
+       function flatInversePageTree($idH, $a=array()) {
                if (is_array($idH)) {
                        $idH = array_reverse($idH);
                        foreach ($idH as $k => $v) {
                                $a[$v['uid']] = $v['uid'];
                                if (is_array($v['subrow'])) {
-                                       $a = $this->flatInversePageTree($v['subrow'],$a);
+                                       $a = $this->flatInversePageTree($v['subrow'], $a);
                                }
                        }
                }
@@ -318,13 +318,13 @@ class tx_impexp {
         * @return      array           Array with uid-pid pairs for all pages in the page tree.
         * @see flatInversePageTree()
         */
-       function flatInversePageTree_pid($idH,$a=array(),$pid=-1) {
+       function flatInversePageTree_pid($idH, $a=array(), $pid=-1) {
                if (is_array($idH)) {
                        $idH = array_reverse($idH);
                        foreach ($idH as $k => $v) {
                                $a[$v['uid']] = $pid;
                                if (is_array($v['subrow'])) {
-                                       $a = $this->flatInversePageTree_pid($v['subrow'],$a,$v['uid']);
+                                       $a = $this->flatInversePageTree_pid($v['subrow'], $a, $v['uid']);
                                }
                        }
                }
@@ -356,11 +356,11 @@ class tx_impexp {
         * @param       integer         (Internal) if the record is added as a relation, this is set to the "level" it was on.
         * @return      void
         */
-       function export_addRecord($table,$row,$relationLevel=0) {
+       function export_addRecord($table, $row, $relationLevel=0) {
 
-               t3lib_BEfunc::workspaceOL($table,$row);
+               t3lib_BEfunc::workspaceOL($table, $row);
 
-               if (strcmp($table,'') && is_array($row) && $row['uid']>0 && !$this->excludeMap[$table.':'.$row['uid']]) {
+               if (strcmp($table, '') && is_array($row) && $row['uid']>0 && !$this->excludeMap[$table.':'.$row['uid']]) {
                        if ($this->checkPID($table==='pages' ? $row['uid'] : $row['pid'])) {
                                if (!isset($this->dat['records'][$table.':'.$row['uid']])) {
 
@@ -368,7 +368,7 @@ class tx_impexp {
                                        $headerInfo = array();
                                        $headerInfo['uid'] = $row['uid'];
                                        $headerInfo['pid'] = $row['pid'];
-                                       $headerInfo['title'] = t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle($table,$row),40);
+                                       $headerInfo['title'] = t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle($table, $row), 40);
                                        $headerInfo['size'] = strlen(serialize($row));
                                        if ($relationLevel) {
                                                $headerInfo['relationLevel'] = $relationLevel;
@@ -390,8 +390,8 @@ class tx_impexp {
                                                        // Data:
                                                $this->dat['records'][$table.':'.$row['uid']] = array();
                                                $this->dat['records'][$table.':'.$row['uid']]['data'] = $row;
-                                               $this->dat['records'][$table.':'.$row['uid']]['rels'] = $refIndexObj->getRelations($table,$row);
-                                               $this->errorLog = array_merge($this->errorLog,$refIndexObj->errorLog);  // Merge error logs.
+                                               $this->dat['records'][$table.':'.$row['uid']]['rels'] = $refIndexObj->getRelations($table, $row);
+                                               $this->errorLog = array_merge($this->errorLog, $refIndexObj->errorLog); // Merge error logs.
 
                                                        // Add information about the relations in the record in the header:
                                                $this->dat['header']['records'][$table][$row['uid']]['rels'] = $this->flatDBrels($this->dat['records'][$table.':'.$row['uid']]['rels']);
@@ -486,9 +486,9 @@ class tx_impexp {
                        foreach($addR as $fI) {
 
                                        // Get and set record:
-                               $row = t3lib_BEfunc::getRecord($fI['table'],$fI['id']);
+                               $row = t3lib_BEfunc::getRecord($fI['table'], $fI['id']);
                                if (is_array($row)) {
-                                       $this->export_addRecord($fI['table'],$row,$relationLevel+1);
+                                       $this->export_addRecord($fI['table'], $row, $relationLevel+1);
                                }
 
                                        // Set status message
@@ -519,7 +519,7 @@ class tx_impexp {
                $rId = $fI['table'].':'.$fI['id'];
                if (isset($GLOBALS['TCA'][$fI['table']])
                                && !$this->isTableStatic($fI['table'])
-                               && !$this->isExcluded($fI['table'],$fI['id'])
+                               && !$this->isExcluded($fI['table'], $fI['id'])
                                && (!$tokenID || $this->includeSoftref($tokenID))
                                && $this->inclRelation($fI['table'])
                                )       {
@@ -657,7 +657,7 @@ class tx_impexp {
 
                                        // ... and for the recordlisting, why not let us know WHICH relations there was...
                                if ($recordRef && $recordRef!=='_SOFTREF_') {
-                                       $refParts = explode(':',$recordRef,2);
+                                       $refParts = explode(':', $recordRef, 2);
                                        if (!is_array($this->dat['header']['records'][$refParts[0]][$refParts[1]]['filerefs'])) {
                                                $this->dat['header']['records'][$refParts[0]][$refParts[1]]['filerefs'] = array();
                                        }
@@ -702,14 +702,14 @@ class tx_impexp {
                                                // Files with external media?
                                                // This is only done with files grabbed by a softreference parser since it is deemed improbable that hard-referenced files should undergo this treatment.
                                        $html_fI = pathinfo(basename($fI['ID_absFile']));
-                                       if ($this->includeExtFileResources && t3lib_div::inList($this->extFileResourceExtensions,strtolower($html_fI['extension']))) {
+                                       if ($this->includeExtFileResources && t3lib_div::inList($this->extFileResourceExtensions, strtolower($html_fI['extension']))) {
                                                $uniquePrefix = '###' . md5($GLOBALS['EXEC_TIME']) . '###';
 
                                                if (strtolower($html_fI['extension'])==='css') {
                                                        $prefixedMedias = explode($uniquePrefix, preg_replace('/(url[[:space:]]*\([[:space:]]*["\']?)([^"\')]*)(["\']?[[:space:]]*\))/i', '\1'.$uniquePrefix.'\2'.$uniquePrefix.'\3', $fileRec['content']));
                                                } else {        // html, htm:
                                                        $htmlParser = t3lib_div::makeInstance('t3lib_parsehtml');
-                                                       $prefixedMedias = explode($uniquePrefix, $htmlParser->prefixResourcePath($uniquePrefix,$fileRec['content'],array(),$uniquePrefix));
+                                                       $prefixedMedias = explode($uniquePrefix, $htmlParser->prefixResourcePath($uniquePrefix, $fileRec['content'], array(), $uniquePrefix));
                                                }
 
                                                $htmlResourceCaptured = FALSE;
@@ -717,7 +717,7 @@ class tx_impexp {
                                                        if ($k%2) {
                                                                $EXTres_absPath = t3lib_div::resolveBackPath(dirname($fI['ID_absFile']).'/'.$v);
                                                                $EXTres_absPath = t3lib_div::getFileAbsFileName($EXTres_absPath);
-                                                               if ($EXTres_absPath && t3lib_div::isFirstPartOfStr($EXTres_absPath,PATH_site.$this->fileadminFolderName.'/') && @is_file($EXTres_absPath)) {
+                                                               if ($EXTres_absPath && t3lib_div::isFirstPartOfStr($EXTres_absPath, PATH_site.$this->fileadminFolderName.'/') && @is_file($EXTres_absPath)) {
 
                                                                        $htmlResourceCaptured = TRUE;
                                                                        $EXTres_ID = md5($EXTres_absPath);
@@ -798,7 +798,7 @@ class tx_impexp {
                                        if (is_array($elements)) {
                                                foreach($elements as $subKey => $el) {
                                                        $lKey = $field.':'.$spKey.':'.$subKey;
-                                                       $list[$lKey] = array_merge(array('field' => $field, 'spKey' => $spKey),$el);
+                                                       $list[$lKey] = array_merge(array('field' => $field, 'spKey' => $spKey), $el);
 
                                                                // Add file_ID key to header - slightly "risky" way of doing this because if the calculation changes for the same value in $this->records[...] this will not work anymore!
                                                        if ($el['subst'] && $el['subst']['relFileName']) {
@@ -814,7 +814,7 @@ class tx_impexp {
                                                foreach($subSoftrefs['keys'] as $spKey => $elements) {
                                                        foreach($elements as $subKey => $el) {
                                                                $lKey = $field.':'.$structurePath.':'.$spKey.':'.$subKey;
-                                                               $list[$lKey] = array_merge(array('field' => $field, 'spKey' => $spKey, 'structurePath' => $structurePath),$el);
+                                                               $list[$lKey] = array_merge(array('field' => $field, 'spKey' => $spKey, 'structurePath' => $structurePath), $el);
 
                                                                        // Add file_ID key to header - slightly "risky" way of doing this because if the calculation changes for the same value in $this->records[...] this will not work anymore!
                                                                if ($el['subst'] && $el['subst']['relFileName']) {
@@ -861,13 +861,13 @@ class tx_impexp {
                        $out = '';
 
                        // adding header:
-                       $out.= $this->addFilePart(serialize($this->dat['header']),$compress);
+                       $out.= $this->addFilePart(serialize($this->dat['header']), $compress);
 
                        // adding records:
-                       $out.= $this->addFilePart(serialize($this->dat['records']),$compress);
+                       $out.= $this->addFilePart(serialize($this->dat['records']), $compress);
 
                        // adding files:
-                       $out.= $this->addFilePart(serialize($this->dat['files']),$compress);
+                       $out.= $this->addFilePart(serialize($this->dat['files']), $compress);
                }
 
                return $out;
@@ -960,7 +960,7 @@ class tx_impexp {
                        // Creating XML file from $outputArray:
                $charset = $this->dat['header']['charset'] ? $this->dat['header']['charset'] : 'utf-8';
                $XML = '<?xml version="1.0" encoding="'.$charset.'" standalone="yes" ?>'.LF;
-               $XML.= t3lib_div::array2xml($this->dat,'',0,'T3RecordDocument',0,$options);
+               $XML.= t3lib_div::array2xml($this->dat, '', 0, 'T3RecordDocument', 0, $options);
 
                return $XML;
        }
@@ -985,7 +985,7 @@ class tx_impexp {
                if ($compress)  $data = gzcompress($data);
                return md5($data).':'.
                                ($compress?'1':'0').':'.
-                               str_pad(strlen($data),10,'0',STR_PAD_LEFT).':'.
+                               str_pad(strlen($data), 10, '0', STR_PAD_LEFT).':'.
                                $data.':';
        }
 
@@ -1072,7 +1072,7 @@ class tx_impexp {
                                        $thisRec = $this->dat['header']['records']['pages'][$uid];
                                                // PID: Set the main $pid, unless a NEW-id is found
                                        $setPid = isset($this->import_newId_pids[$thisRec['pid']])      ? $this->import_newId_pids[$thisRec['pid']] : $pid;
-                                       $this->addSingle('pages',$uid,$setPid);
+                                       $this->addSingle('pages', $uid, $setPid);
                                        unset($pageRecords[$uid]);
                                }
                        }
@@ -1081,7 +1081,7 @@ class tx_impexp {
                        if (count($pageRecords)) {
                                $remainingPageUids = array_keys($pageRecords);
                                foreach($remainingPageUids as $pUid) {
-                                       $this->addSingle('pages',$pUid,$pid);
+                                       $this->addSingle('pages', $pUid, $pid);
                                }
                        }
 
@@ -1092,7 +1092,7 @@ class tx_impexp {
                                'data' => &$this->import_data,
                        ));
                        $tce->suggestedInsertUids = $this->suggestedInsertUids;
-                       $tce->start($this->import_data,Array());
+                       $tce->start($this->import_data, Array());
                        $tce->process_datamap();
                        $this->callHook('after_writeRecordsPages', array(
                                'tce' => &$tce
@@ -1125,7 +1125,7 @@ class tx_impexp {
 
                foreach($pidsFromTree as $origPid => $newPid) {
                        if ($newPid>=0 && $this->dontIgnorePid('pages', $origPid)) {
-                               if (substr($this->import_newId_pids[$origPid],0,3)==='NEW')     {       // If the page had a new id (because it was created) use that instead!
+                               if (substr($this->import_newId_pids[$origPid], 0, 3)==='NEW')   {       // If the page had a new id (because it was created) use that instead!
 
                                        if ($this->import_mapId['pages'][$origPid]) {
                                                $mappedPid = $this->import_mapId['pages'][$origPid];
@@ -1144,7 +1144,7 @@ class tx_impexp {
                                'tce' => &$tce,
                                'data' => &$cmd_data,
                        ));
-                       $tce->start(Array(),$cmd_data);
+                       $tce->start(Array(), $cmd_data);
                        $tce->process_cmdmap();
                        $this->callHook('after_writeRecordsPagesOrder', array(
                                'tce' => &$tce,
@@ -1175,7 +1175,7 @@ class tx_impexp {
                                                }
 
                                                        // Add record:
-                                               $this->addSingle($table,$uid,$setPid);
+                                               $this->addSingle($table, $uid, $setPid);
                                        }
                                }
                        }
@@ -1189,7 +1189,7 @@ class tx_impexp {
                ));
                $tce->suggestedInsertUids = $this->suggestedInsertUids;
                $tce->reverseOrder=1;   // Because all records are being submitted in their correct order with positive pid numbers - and so we should reverse submission order internally.
-               $tce->start($this->import_data,Array());
+               $tce->start($this->import_data, Array());
                $tce->process_datamap();
                $this->callHook('after_writeRecordsRecords', array(
                        'tce' => &$tce,
@@ -1248,7 +1248,7 @@ class tx_impexp {
                                'tce' => &$tce,
                                'data' => &$cmd_data,
                        ));
-                       $tce->start(Array(),$cmd_data);
+                       $tce->start(Array(), $cmd_data);
                        $tce->process_cmdmap();
                        $this->callHook('after_writeRecordsRecordsOrder', array(
                                'tce' => &$tce,
@@ -1266,12 +1266,12 @@ class tx_impexp {
         * @return      void
         * @see writeRecords()
         */
-       function addSingle($table,$uid,$pid) {
+       function addSingle($table, $uid, $pid) {
                if ($this->import_mode[$table.':'.$uid]!=='exclude') {
                        $record = $this->dat['records'][$table.':'.$uid]['data'];
                        if (is_array($record)) {
 
-                               if ($this->update && $this->doesRecordExist($table,$uid) && $this->import_mode[$table.':'.$uid]!=='as_new') {
+                               if ($this->update && $this->doesRecordExist($table, $uid) && $this->import_mode[$table.':'.$uid]!=='as_new') {
                                        $ID = $uid;
                                } else {
                                        $ID = uniqid('NEW');
@@ -1320,7 +1320,7 @@ class tx_impexp {
                                        }
                                }
                        } elseif ($table.':'.$uid != 'pages:0') {       // On root level we don't want this error message.
-                               $this->error('Error: no record was found in data array!',1);
+                               $this->error('Error: no record was found in data array!', 1);
                        }
                }
        }
@@ -1340,7 +1340,7 @@ class tx_impexp {
                                        $this->import_mapId[$table][$old_uid] = $substNEWwithIDs[$id];
                                } elseif ($this->update) {
                                        $this->import_mapId[$table][$old_uid] = $id;    // Map same ID to same ID....
-                               } else $this->error('Possible error: '.$table.':'.$old_uid.' had no new id assigned to it. This indicates that the record was not added to database during import. Please check changelog!',1);
+                               } else $this->error('Possible error: '.$table.':'.$old_uid.' had no new id assigned to it. This indicates that the record was not added to database during import. Please check changelog!', 1);
                        }
                }
        }
@@ -1371,9 +1371,9 @@ class tx_impexp {
                                t3lib_div::unlink_tempfile($fileName);
                                clearstatcache();
                                if (is_file($fileName)) {
-                                       $this->error('Error: '.$fileName.' was NOT unlinked as it should have been!',1);
+                                       $this->error('Error: '.$fileName.' was NOT unlinked as it should have been!', 1);
                                }
-                       } else $this->error('Error: '.$fileName.' was not in temp-path. Not removed!',1);
+                       } else $this->error('Error: '.$fileName.' was not in temp-path. Not removed!', 1);
                }
                $this->unlinkFiles = array();
        }
@@ -1413,7 +1413,7 @@ class tx_impexp {
 
                                // If the record has been written and received a new id, then proceed:
                        if (is_array($this->import_mapId[$table]) && isset($this->import_mapId[$table][$uid])) {
-                               $thisNewUid = t3lib_BEfunc::wsMapId($table,$this->import_mapId[$table][$uid]);
+                               $thisNewUid = t3lib_BEfunc::wsMapId($table, $this->import_mapId[$table][$uid]);
 
                                if (is_array($this->dat['records'][$table.':'.$uid]['rels'])) {
 
@@ -1423,7 +1423,7 @@ class tx_impexp {
                                                        case 'db':
                                                                if (is_array($config['itemArray']) && count($config['itemArray'])) {
                                                                        $valArray = $this->setRelations_db($config['itemArray']);
-                                                                       $updateData[$table][$thisNewUid][$field] = implode(',',$valArray);      // List of [table]_[uid]
+                                                                       $updateData[$table][$thisNewUid][$field] = implode(',', $valArray);     // List of [table]_[uid]
                                                                }
                                                        break;
                                                        case 'file':
@@ -1432,13 +1432,13 @@ class tx_impexp {
                                                                        foreach($config['newValueFiles'] as $fI) {
                                                                                $valArr[] = $this->import_addFileNameToBeCopied($fI);
                                                                        }
-                                                                       $updateData[$table][$thisNewUid][$field] = implode(',',$valArr);        // List of absolute files
+                                                                       $updateData[$table][$thisNewUid][$field] = implode(',', $valArr);       // List of absolute files
                                                                }
                                                        break;
                                                }
                                        }
-                               } else $this->error('Error: no record was found in data array!',1);
-                       } else $this->error('Error: this records is NOT created it seems! ('.$table.':'.$uid.')',1);
+                               } else $this->error('Error: no record was found in data array!', 1);
+                       } else $this->error('Error: this records is NOT created it seems! ('.$table.':'.$uid.')', 1);
                }
                if (count($updateData)) {
                        $tce = $this->getNewTCE();
@@ -1446,7 +1446,7 @@ class tx_impexp {
                                'tce' => &$tce,
                                'data' => &$updateData,
                        ));
-                       $tce->start($updateData,Array());
+                       $tce->start($updateData, Array());
                        $tce->process_datamap();
                        $this->callHook('after_setRelations', array(
                                'tce' => &$tce,
@@ -1472,7 +1472,7 @@ class tx_impexp {
                                $valArray[] = $relDat['table'].'_'.$relDat['id'];
                        } else {
 
-                               $this->error('Lost relation: '.$relDat['table'].':'.$relDat['id'],1);
+                               $this->error('Lost relation: '.$relDat['table'].':'.$relDat['id'], 1);
                        }
                }
 
@@ -1488,7 +1488,7 @@ class tx_impexp {
        function import_addFileNameToBeCopied($fI) {
                if (is_array($this->dat['files'][$fI['ID']])) {
                        $tmpFile = t3lib_div::tempnam('import_temp_');
-                       t3lib_div::writeFile($tmpFile,$this->dat['files'][$fI['ID']]['content']);
+                       t3lib_div::writeFile($tmpFile, $this->dat['files'][$fI['ID']]['content']);
                        clearstatcache();
                        if (@is_file($tmpFile)) {
                                $this->unlinkFiles[] = $tmpFile;
@@ -1497,9 +1497,9 @@ class tx_impexp {
                                        $this->alternativeFilePath[$tmpFile] = $this->dat['files'][$fI['ID']]['relFileRef'];
 
                                        return $tmpFile;
-                               } else $this->error('Error: temporary file '.$tmpFile.' had a size ('.filesize($tmpFile).') different from the original ('.$this->dat['files'][$fI['ID']]['filesize'].')',1);
-                       } else $this->error('Error: temporary file '.$tmpFile.' was not written as it should have been!',1);
-               } else $this->error('Error: No file found for ID '.$fI['ID'],1);
+                               } else $this->error('Error: temporary file '.$tmpFile.' had a size ('.filesize($tmpFile).') different from the original ('.$this->dat['files'][$fI['ID']]['filesize'].')', 1);
+                       } else $this->error('Error: temporary file '.$tmpFile.' was not written as it should have been!', 1);
+               } else $this->error('Error: No file found for ID '.$fI['ID'], 1);
        }
 
        /**
@@ -1518,7 +1518,7 @@ class tx_impexp {
 
                                // If the record has been written and received a new id, then proceed:
                        if (is_array($this->import_mapId[$table]) && isset($this->import_mapId[$table][$uid])) {
-                               $thisNewUid = t3lib_BEfunc::wsMapId($table,$this->import_mapId[$table][$uid]);
+                               $thisNewUid = t3lib_BEfunc::wsMapId($table, $this->import_mapId[$table][$uid]);
                                if (is_array($this->dat['records'][$table.':'.$uid]['rels'])) {
                                        t3lib_div::loadTCA($table);
 
@@ -1531,7 +1531,7 @@ class tx_impexp {
 
                                                                        // If there has been registered relations inside the flex form field, run processing on the content:
                                                                if (count($config['flexFormRels']['db']) || count($config['flexFormRels']['file'])) {
-                                                                       $origRecordRow = t3lib_BEfunc::getRecord($table,$thisNewUid,'*');       // This will fetch the new row for the element (which should be updated with any references to data structures etc.)
+                                                                       $origRecordRow = t3lib_BEfunc::getRecord($table, $thisNewUid, '*');     // This will fetch the new row for the element (which should be updated with any references to data structures etc.)
                                                                        $conf = $GLOBALS['TCA'][$table]['columns'][$field]['config'];
                                                                        if (is_array($origRecordRow) && is_array($conf) && $conf['type']==='flex') {
                                                                                        // Get current data structure and value array:
@@ -1545,7 +1545,7 @@ class tx_impexp {
                                                                                                        array(),        // Not used.
                                                                                                        array(),        // Not used.
                                                                                                        $dataStructArray,
-                                                                                                       array($table,$thisNewUid,$field,$config),       // Parameters.
+                                                                                                       array($table,$thisNewUid, $field, $config),     // Parameters.
                                                                                                        'remapListedDBRecords_flexFormCallBack'
                                                                                                );
                                                                                        // The return value is set as an array which means it will be processed by tcemain for file and DB references!
@@ -1557,8 +1557,8 @@ class tx_impexp {
                                                        break;
                                                }
                                        }
-                               } else $this->error('Error: no record was found in data array!',1);
-                       } else $this->error('Error: this records is NOT created it seems! ('.$table.':'.$uid.')',1);
+                               } else $this->error('Error: no record was found in data array!', 1);
+                       } else $this->error('Error: this records is NOT created it seems! ('.$table.':'.$uid.')', 1);
                }
                if (count($updateData)) {
                        $tce = $this->getNewTCE();
@@ -1566,7 +1566,7 @@ class tx_impexp {
                                'tce' => &$tce,
                                'data' => &$updateData,
                        ));
-                       $tce->start($updateData,Array());
+                       $tce->start($updateData, Array());
                        $tce->process_datamap();
                        $this->callHook('after_setFlexFormRelations', array(
                                'tce' => &$tce,
@@ -1589,7 +1589,7 @@ class tx_impexp {
        function remapListedDBRecords_flexFormCallBack($pParams, $dsConf, $dataValue, $dataValue_ext1, $dataValue_ext2, $path) {
 
                        // Extract parameters:
-               list($table,$uid,$field,$config) = $pParams;
+               list($table, $uid, $field, $config) = $pParams;
 
                        // In case the $path is used as index without a trailing slash we will remove that
                if (!is_array($config['flexFormRels']['db'][$path]) && is_array($config['flexFormRels']['db'][rtrim($path, '/')])) {
@@ -1597,14 +1597,14 @@ class tx_impexp {
                }
                if (is_array($config['flexFormRels']['db'][$path])) {
                        $valArray = $this->setRelations_db($config['flexFormRels']['db'][$path]);
-                       $dataValue = implode(',',$valArray);
+                       $dataValue = implode(',', $valArray);
                }
 
                if (is_array($config['flexFormRels']['file'][$path])) {
                        foreach($config['flexFormRels']['file'][$path] as $fI) {
                                $valArr[] = $this->import_addFileNameToBeCopied($fI);
                        }
-                       $dataValue = implode(',',$valArr);
+                       $dataValue = implode(',', $valArr);
                }
 
                return array('value' => $dataValue);
@@ -1656,7 +1656,7 @@ class tx_impexp {
                                                }
 
                                                        // The new id:
-                                               $thisNewUid = t3lib_BEfunc::wsMapId($table,$this->import_mapId[$table][$uid]);
+                                               $thisNewUid = t3lib_BEfunc::wsMapId($table, $this->import_mapId[$table][$uid]);
 
                                                        // Now, if there are any fields that require substitution to be done, lets go for that:
                                                foreach($fieldsIndex as $field => $softRefCfgs) {
@@ -1664,7 +1664,7 @@ class tx_impexp {
                                                                $conf = $GLOBALS['TCA'][$table]['columns'][$field]['config'];
                                                                if ($conf['type']==='flex') {
 
-                                                                       $origRecordRow = t3lib_BEfunc::getRecord($table,$thisNewUid,'*');       // This will fetch the new row for the element (which should be updated with any references to data structures etc.)
+                                                                       $origRecordRow = t3lib_BEfunc::getRecord($table, $thisNewUid, '*');     // This will fetch the new row for the element (which should be updated with any references to data structures etc.)
                                                                        if (is_array($origRecordRow)) {
 
                                                                                        // Get current data structure and value array:
@@ -1680,7 +1680,7 @@ class tx_impexp {
                                                                                                        array(),        // Not used.
                                                                                                        array(),        // Not used.
                                                                                                        $dataStructArray,
-                                                                                                       array($table,$uid,$field,$softRefCfgs), // Parameters (using old UID on purpose!)
+                                                                                                       array($table,$uid, $field, $softRefCfgs),       // Parameters (using old UID on purpose!)
                                                                                                        'processSoftReferences_flexFormCallBack'
                                                                                                );
 
@@ -1732,7 +1732,7 @@ class tx_impexp {
        function processSoftReferences_flexFormCallBack($pParams, $dsConf, $dataValue, $dataValue_ext1, $dataValue_ext2, $path) {
 
                        // Extract parameters:
-               list($table,$origUid,$field,$softRefCfgs)       = $pParams;
+               list($table, $origUid, $field, $softRefCfgs)    = $pParams;
 
                if (is_array($softRefCfgs)) {
 
@@ -1794,13 +1794,13 @@ class tx_impexp {
                                                case 'db':
                                                        default:
                                                                        // Trying to map database element if found in the mapID array:
-                                                               list($tempTable,$tempUid) = explode(':',$cfg['subst']['recordRef']);
+                                                               list($tempTable, $tempUid) = explode(':', $cfg['subst']['recordRef']);
                                                                if (isset($this->import_mapId[$tempTable][$tempUid])) {
-                                                                       $insertValue = t3lib_BEfunc::wsMapId($tempTable,$this->import_mapId[$tempTable][$tempUid]);
+                                                                       $insertValue = t3lib_BEfunc::wsMapId($tempTable, $this->import_mapId[$tempTable][$tempUid]);
 
                                                                                // Look if reference is to a page and the original token value was NOT an integer - then we assume is was an alias and try to look up the new one!
                                                                        if ($tempTable==='pages' && !t3lib_utility_Math::canBeInterpretedAsInteger($cfg['subst']['tokenValue'])) {
-                                                                               $recWithUniqueValue = t3lib_BEfunc::getRecord($tempTable,$insertValue, 'alias');
+                                                                               $recWithUniqueValue = t3lib_BEfunc::getRecord($tempTable, $insertValue, 'alias');
                                                                                if ($recWithUniqueValue['alias']) {
                                                                                        $insertValue = $recWithUniqueValue['alias'];
                                                                                }
@@ -1840,7 +1840,7 @@ class tx_impexp {
                        $rteOrigName = $this->getRTEoriginalFilename(basename($relFileName));
 
                                // If filename looks like an RTE file, and the directory is in "uploads/", then process as a RTE file!
-                       if ($rteOrigName && t3lib_div::isFirstPartOfStr($dirPrefix,'uploads/')) {       // RTE:
+                       if ($rteOrigName && t3lib_div::isFirstPartOfStr($dirPrefix, 'uploads/'))        {       // RTE:
 
                                        // First, find unique RTE file name:
                                if (@is_dir(PATH_site.$dirPrefix)) {
@@ -1851,7 +1851,7 @@ class tx_impexp {
 
                                                // Create copy file name:
                                        $pI = pathinfo($relFileName);
-                                       $copyDestName = dirname($origDestName).'/RTEmagicC_'.substr(basename($origDestName),10).'.'.$pI['extension'];
+                                       $copyDestName = dirname($origDestName).'/RTEmagicC_'.substr(basename($origDestName), 10).'.'.$pI['extension'];
                                        if (!@is_file($copyDestName) && !@is_file($origDestName)
                                                && $origDestName===t3lib_div::getFileAbsFileName($origDestName) && $copyDestName===t3lib_div::getFileAbsFileName($copyDestName)) {
 
@@ -1871,7 +1871,7 @@ class tx_impexp {
                        } elseif (t3lib_div::isFirstPartOfStr($dirPrefix, $this->fileadminFolderName.'/'))      {       // File in fileadmin/ folder:
 
                                        // Create file (and possible resources)
-                               $newFileName = $this->processSoftReferences_saveFile_createRelFile($dirPrefix,basename($relFileName),$cfg['file_ID'], $table, $uid);
+                               $newFileName = $this->processSoftReferences_saveFile_createRelFile($dirPrefix, basename($relFileName), $cfg['file_ID'], $table, $uid);
 
                                if (strlen($newFileName)) {
                                        $relFileName = $newFileName;
@@ -1897,7 +1897,7 @@ class tx_impexp {
 
                        // If the fileID map contains an entry for this fileID then just return the relative filename of that entry; we don't want to write another unique filename for this one!
                if ($this->fileIDMap[$fileID]) {
-                       return substr($this->fileIDMap[$fileID],strlen(PATH_site));
+                       return substr($this->fileIDMap[$fileID], strlen(PATH_site));
                }
 
                        // Verify FileMount access to dir-prefix. Returns the best alternative relative path if any
@@ -1933,8 +1933,8 @@ class tx_impexp {
                                                                $relResourceFileName = $this->dat['files'][$res_fileID]['parentRelFileName'];
                                                                $absResourceFileName = t3lib_div::resolveBackPath(PATH_site.$origDirPrefix.$relResourceFileName);
                                                                $absResourceFileName = t3lib_div::getFileAbsFileName($absResourceFileName);
-                                                               if ($absResourceFileName && t3lib_div::isFirstPartOfStr($absResourceFileName,PATH_site.$this->fileadminFolderName.'/')) {
-                                                                       $destDir = substr(dirname($absResourceFileName).'/',strlen(PATH_site));
+                                                               if ($absResourceFileName && t3lib_div::isFirstPartOfStr($absResourceFileName, PATH_site.$this->fileadminFolderName.'/')) {
+                                                                       $destDir = substr(dirname($absResourceFileName).'/', strlen(PATH_site));
                                                                        if ($this->verifyFolderAccess($destDir, TRUE) && $this->checkOrCreateDir($destDir)) {
                                                                                $this->writeFileVerify($absResourceFileName, $res_fileID);
                                                                        } else $this->error('ERROR: Could not create file in directory "'.$destDir.'"');
@@ -1946,7 +1946,7 @@ class tx_impexp {
                                                }
                                        } else {
                                                        // Create the resouces directory name (filename without extension, suffixed "_FILES")
-                                               $resourceDir = dirname($newName).'/'.preg_replace('/\.[^.]*$/','',basename($newName)).'_FILES';
+                                               $resourceDir = dirname($newName).'/'.preg_replace('/\.[^.]*$/', '', basename($newName)).'_FILES';
                                                if (t3lib_div::mkdir($resourceDir)) {
                                                        foreach($fileHeaderInfo['EXT_RES_ID'] as $res_fileID) {
                                                                if ($this->dat['files'][$res_fileID]['filename']) {
@@ -1989,7 +1989,7 @@ class tx_impexp {
                                if ($fileProcObj->checkIfAllowed($fI['fileext'], $fI['path'], $fI['file']) || ($this->allowPHPScripts && $GLOBALS['BE_USER']->isAdmin())) {
                                        if (t3lib_div::getFileAbsFileName($fileName)) {
                                                if ($this->dat['files'][$fileID]) {
-                                                       t3lib_div::writeFile($fileName,$this->dat['files'][$fileID]['content']);
+                                                       t3lib_div::writeFile($fileName, $this->dat['files'][$fileID]['content']);
                                                        $this->fileIDMap[$fileID] = $fileName;
                                                        if (md5(t3lib_div::getUrl($fileName))==$this->dat['files'][$fileID]['content_md5']) {
                                                                return TRUE;
@@ -2056,8 +2056,8 @@ class tx_impexp {
                                // If that succeeded, return the path to it:
                        if ($result) {
                                        // Remove the "fileadmin/" prefix of input path - and append the rest to the return value:
-                               if (t3lib_div::isFirstPartOfStr($dirPrefix,$this->fileadminFolderName.'/')) {
-                                       $dirPrefix = substr($dirPrefix,strlen($this->fileadminFolderName.'/'));
+                               if (t3lib_div::isFirstPartOfStr($dirPrefix, $this->fileadminFolderName.'/')) {
+                                       $dirPrefix = substr($dirPrefix, strlen($this->fileadminFolderName.'/'));
                                }
                                return substr($fileProcObj->mounts[$result]['path'].$dirPrefix,strlen(PATH_site));
                        }
@@ -2088,14 +2088,14 @@ class tx_impexp {
         * @param       boolean         If set, all information is loaded (header, records and files). Otherwise the default is to read only the header information
         * @return      boolean         TRUE if the operation went well
         */
-       function loadFile($filename,$all=0) {
+       function loadFile($filename, $all=0) {
                if (@is_file($filename)) {
                        $fI = pathinfo($filename);
                        if (strtolower($fI['extension'])=='xml') {
                                        // XML:
                                $xmlContent = t3lib_div::getUrl($filename);
                                if (strlen($xmlContent)) {
-                                       $this->dat = t3lib_div::xml2array($xmlContent,'',TRUE);
+                                       $this->dat = t3lib_div::xml2array($xmlContent, '', TRUE);
                                        if (is_array($this->dat)) {
                                                if ($this->dat['_DOCUMENT_TAG']==='T3RecordDocument' && is_array($this->dat['header']) && is_array($this->dat['records'])) {
                                                        $this->loadInit();
@@ -2105,11 +2105,11 @@ class tx_impexp {
                                } else $this->error('Error opening file: '.$filename);
                        } else {
                                        // T3D
-                               if($fd = fopen($filename,'rb')) {
-                                       $this->dat['header'] = $this->getNextFilePart($fd,1,'header');
+                               if($fd = fopen($filename, 'rb')) {
+                                       $this->dat['header'] = $this->getNextFilePart($fd, 1, 'header');
                                        if ($all) {
-                                               $this->dat['records'] = $this->getNextFilePart($fd,1,'records');
-                                               $this->dat['files'] = $this->getNextFilePart($fd,1,'files');
+                                               $this->dat['records'] = $this->getNextFilePart($fd, 1, 'records');
+                                               $this->dat['files'] = $this->getNextFilePart($fd, 1, 'files');
                                        }
                                        $this->loadInit();
                                        return TRUE;
@@ -2131,21 +2131,21 @@ class tx_impexp {
         * @access private
         * @see loadFile()
         */
-       function getNextFilePart($fd,$unserialize=0,$name='') {
+       function getNextFilePart($fd, $unserialize=0, $name='') {
                $initStrLen = 32+1+1+1+10+1;
 
                        // getting header data
                $initStr = fread($fd, $initStrLen);
-               $initStrDat = explode(':',$initStr);
-               if (strstr($initStrDat[0],'Warning') == FALSE) {
-                       if (!strcmp($initStrDat[3],'')) {
-                               $datString = fread($fd,intval($initStrDat[2]));
-                               fread($fd,1);
+               $initStrDat = explode(':', $initStr);
+               if (strstr($initStrDat[0], 'Warning') == FALSE) {
+                       if (!strcmp($initStrDat[3], '')) {
+                               $datString = fread($fd, intval($initStrDat[2]));
+                               fread($fd, 1);
                                if (!strcmp(md5($datString), $initStrDat[0])) {
                                        if ($initStrDat[1]) {
                                                if ($this->compress) {
                                                        $datString = gzuncompress($datString);
-                                               } else $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.',1);
+                                               } else $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.', 1);
                                        }
                                        return $unserialize ? unserialize($datString) : $datString;
                                } else $this->error('MD5 check failed ('.$name.')');
@@ -2163,9 +2163,9 @@ class tx_impexp {
        function loadContent($filecontent) {
                $pointer = 0;
 
-               $this->dat['header'] = $this->getNextContentPart($filecontent,$pointer,1,'header');
-               $this->dat['records'] = $this->getNextContentPart($filecontent,$pointer,1,'records');
-               $this->dat['files'] = $this->getNextContentPart($filecontent,$pointer,1,'files');
+               $this->dat['header'] = $this->getNextContentPart($filecontent, $pointer, 1, 'header');
+               $this->dat['records'] = $this->getNextContentPart($filecontent, $pointer, 1, 'records');
+               $this->dat['files'] = $this->getNextContentPart($filecontent, $pointer, 1, 'files');
                $this->loadInit();
        }
 
@@ -2178,20 +2178,20 @@ class tx_impexp {
         * @param       string          For error messages this indicates the section of the problem.
         * @return      string          Data string
         */
-       function getNextContentPart($filecontent,&$pointer,$unserialize=0,$name='') {
+       function getNextContentPart($filecontent, &$pointer, $unserialize=0, $name='') {
                $initStrLen = 32+1+1+1+10+1;
                        // getting header data
-               $initStr = substr($filecontent,$pointer,$initStrLen);
+               $initStr = substr($filecontent, $pointer, $initStrLen);
                $pointer+= $initStrLen;
-               $initStrDat = explode(':',$initStr);
-               if (!strcmp($initStrDat[3],'')) {
-                       $datString = substr($filecontent,$pointer,intval($initStrDat[2]));
+               $initStrDat = explode(':', $initStr);
+               if (!strcmp($initStrDat[3], '')) {
+                       $datString = substr($filecontent, $pointer, intval($initStrDat[2]));
                        $pointer+= intval($initStrDat[2])+1;
-                       if (!strcmp(md5($datString),$initStrDat[0])) {
+                       if (!strcmp(md5($datString), $initStrDat[0])) {
                                if ($initStrDat[1]) {
                                        if ($this->compress) {
                                                $datString = gzuncompress($datString);
-                                       } else $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.',1);
+                                       } else $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.', 1);
                                }
                                return $unserialize ? unserialize($datString) : $datString;
                        } else $this->error('MD5 check failed ('.$name.')');
@@ -2229,15 +2229,15 @@ class tx_impexp {
 
                                        // convert meta data:
                                if (is_array($this->dat['header']['meta'])) {
-                                       $LANG->csConvObj->convArray($this->dat['header']['meta'],$importCharset,$LANG->charSet);
+                                       $LANG->csConvObj->convArray($this->dat['header']['meta'], $importCharset, $LANG->charSet);
                                }
                                        // convert record headers:
                                if (is_array($this->dat['header']['records'])) {
-                                       $LANG->csConvObj->convArray($this->dat['header']['records'],$importCharset,$LANG->charSet);
+                                       $LANG->csConvObj->convArray($this->dat['header']['records'], $importCharset, $LANG->charSet);
                                }
                                        // convert records themselves:
                                if (is_array($this->dat['records'])) {
-                                       $LANG->csConvObj->convArray($this->dat['records'],$importCharset,$LANG->charSet);
+                                       $LANG->csConvObj->convArray($this->dat['records'], $importCharset, $LANG->charSet);
                                }
                        }
                } else {
@@ -2297,18 +2297,18 @@ class tx_impexp {
                        if (is_array($this->dat['header']['pagetree'])) {
                                reset($this->dat['header']['pagetree']);
                                $lines = array();
-                               $this->traversePageTree($this->dat['header']['pagetree'],$lines);
+                               $this->traversePageTree($this->dat['header']['pagetree'], $lines);
 
                                $rows = array();
                                $rows[] = '
                                <tr class="bgColor5 tableheader">
-                                       <td>'.$LANG->getLL('impexpcore_displaycon_controls',1).'</td>
-                                       <td>'.$LANG->getLL('impexpcore_displaycon_title',1).'</td>
-                                       <td>'.$LANG->getLL('impexpcore_displaycon_size',1).'</td>
-                                       <td>'.$LANG->getLL('impexpcore_displaycon_message',1).'</td>
-                                       '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_updateMode',1).'</td>' : '').'
-                                       '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_currentPath',1).'</td>' : '').'
-                                       '.($this->showDiff ? '<td>'.$LANG->getLL('impexpcore_displaycon_result',1).'</td>' : '').'
+                                       <td>'.$LANG->getLL('impexpcore_displaycon_controls', 1).'</td>
+                                       <td>'.$LANG->getLL('impexpcore_displaycon_title', 1).'</td>
+                                       <td>'.$LANG->getLL('impexpcore_displaycon_size', 1).'</td>
+                                       <td>'.$LANG->getLL('impexpcore_displaycon_message', 1).'</td>
+                                       '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_updateMode', 1).'</td>' : '').'
+                                       '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_currentPath', 1).'</td>' : '').'
+                                       '.($this->showDiff ? '<td>'.$LANG->getLL('impexpcore_displaycon_result', 1).'</td>' : '').'
                                </tr>';
 
                                foreach($lines as $r) {
@@ -2325,9 +2325,9 @@ class tx_impexp {
                                }
 
                                $out = '
-                                       <strong>'.$LANG->getLL('impexpcore_displaycon_insidePagetree',1).'</strong>
+                                       <strong>'.$LANG->getLL('impexpcore_displaycon_insidePagetree', 1).'</strong>
                                        <br /><br />
-                                       <table border="0" cellpadding="0" cellspacing="1">'.implode('',$rows).'</table>
+                                       <table border="0" cellpadding="0" cellspacing="1">'.implode('', $rows).'</table>
                                        <br /><br />';
                        }
 
@@ -2343,13 +2343,13 @@ class tx_impexp {
                                        $rows = array();
                                        $rows[] = '
                                        <tr class="bgColor5 tableheader">
-                                               <td>'.$LANG->getLL('impexpcore_displaycon_controls',1).'</td>
-                                               <td>'.$LANG->getLL('impexpcore_displaycon_title',1).'</td>
-                                               <td>'.$LANG->getLL('impexpcore_displaycon_size',1).'</td>
-                                               <td>'.$LANG->getLL('impexpcore_displaycon_message',1).'</td>
-                                               '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_updateMode',1).'</td>' : '').'
-                                               '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_currentPath',1).'</td>' : '').'
-                                               '.($this->showDiff ? '<td>'.$LANG->getLL('impexpcore_displaycon_result',1).'</td>' : '').'
+                                               <td>'.$LANG->getLL('impexpcore_displaycon_controls', 1).'</td>
+                                               <td>'.$LANG->getLL('impexpcore_displaycon_title', 1).'</td>
+                                               <td>'.$LANG->getLL('impexpcore_displaycon_size', 1).'</td>
+                                               <td>'.$LANG->getLL('impexpcore_displaycon_message', 1).'</td>
+                                               '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_updateMode', 1).'</td>' : '').'
+                                               '.($this->update ? '<td>'.$LANG->getLL('impexpcore_displaycon_currentPath', 1).'</td>' : '').'
+                                               '.($this->showDiff ? '<td>'.$LANG->getLL('impexpcore_displaycon_result', 1).'</td>' : '').'
                                        </tr>';
 
                                        foreach($lines as $r) {
@@ -2365,9 +2365,9 @@ class tx_impexp {
                                        }
 
                                        $out.= '
-                                               <strong>'.$LANG->getLL('impexpcore_singlereco_outsidePagetree',1).'</strong>
+                                               <strong>'.$LANG->getLL('impexpcore_singlereco_outsidePagetree', 1).'</strong>
                                                <br /><br />
-                                               <table border="0" cellpadding="0" cellspacing="1">'.implode('',$rows).'</table>';
+                                               <table border="0" cellpadding="0" cellspacing="1">'.implode('', $rows).'</table>';
                                }
                        }
                }
@@ -2382,18 +2382,18 @@ class tx_impexp {
         * @param       string          Pre-HTML code
         * @return      void
         */
-       function traversePageTree($pT,&$lines,$preCode='') {
+       function traversePageTree($pT, &$lines, $preCode='') {
                foreach ($pT as $k => $v) {
 
                                // Add this page:
-                       $this->singleRecordLines('pages',$k,$lines,$preCode);
+                       $this->singleRecordLines('pages', $k, $lines, $preCode);
 
                                // Subrecords:
                        if (is_array($this->dat['header']['pid_lookup'][$k])) {
                                foreach ($this->dat['header']['pid_lookup'][$k] as $t => $recUidArr) {
                                        if ($t!='pages') {
                                                foreach ($recUidArr as $ruid => $value) {
-                                                       $this->singleRecordLines($t,$ruid,$lines,$preCode.'&nbsp;&nbsp;&nbsp;&nbsp;');
+                                                       $this->singleRecordLines($t, $ruid, $lines, $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;');
                                                }
                                        }
                                }
@@ -2402,7 +2402,7 @@ class tx_impexp {
 
                                // Subpages, called recursively:
                        if (is_array($v['subrow']))             {
-                               $this->traversePageTree($v['subrow'],$lines,$preCode.'&nbsp;&nbsp;&nbsp;&nbsp;');
+                               $this->traversePageTree($v['subrow'], $lines, $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;');
                        }
                }
        }
@@ -2414,15 +2414,15 @@ class tx_impexp {
         * @param       array           Output lines array (is passed by reference and modified)
         * @return      void
         */
-       function traversePageRecords($pT,&$lines) {
+       function traversePageRecords($pT, &$lines) {
                foreach ($pT as $k => $rHeader) {
-                       $this->singleRecordLines('pages',$k,$lines,'',1);
+                       $this->singleRecordLines('pages', $k, $lines, '', 1);
                                // Subrecords:
                        if (is_array($this->dat['header']['pid_lookup'][$k])) {
                                foreach ($this->dat['header']['pid_lookup'][$k] as $t => $recUidArr) {
                                        if ($t!='pages') {
                                                foreach ($recUidArr as $ruid => $value) {
-                                                       $this->singleRecordLines($t,$ruid,$lines,'&nbsp;&nbsp;&nbsp;&nbsp;');
+                                                       $this->singleRecordLines($t, $ruid, $lines, '&nbsp;&nbsp;&nbsp;&nbsp;');
                                                }
                                        }
                                }
@@ -2438,12 +2438,12 @@ class tx_impexp {
         * @param       array           Output lines array (is passed by reference and modified)
         * @return      void
         */
-       function traverseAllRecords($pT,&$lines) {
+       function traverseAllRecords($pT, &$lines) {
                foreach ($pT as $t => $recUidArr) {
                        if ($t!='pages') {
                                $preCode = '';
                                foreach ($recUidArr as $ruid => $value) {
-                                       $this->singleRecordLines($t,$ruid,$lines,$preCode,1);
+                                       $this->singleRecordLines($t, $ruid, $lines, $preCode, 1);
                                }
                        }
                }
@@ -2459,13 +2459,13 @@ class tx_impexp {
         * @param       boolean         If you want import validation, you can set this so it checks if the import can take place on the specified page.
         * @return      void
         */
-       function singleRecordLines($table,$uid,&$lines,$preCode,$checkImportInPidRecord=0) {
+       function singleRecordLines($table, $uid, &$lines, $preCode, $checkImportInPidRecord=0) {
                global $LANG;
 
                        // Get record:
                $record = $this->dat['header']['records'][$table][$uid];
                unset($this->remainHeader['records'][$table][$uid]);
-               if (!is_array($record) && !($table==='pages' && !$uid)) $this->error('MISSING RECORD: '.$table.':'.$uid,1);
+               if (!is_array($record) && !($table==='pages' && !$uid)) $this->error('MISSING RECORD: '.$table.':'.$uid, 1);
 
                        // Begin to create the line arrays information record, pInfo:
                $pInfo = array();
@@ -2524,10 +2524,10 @@ class tx_impexp {
                                                        $optValues['respect_pid'] = $LANG->getLL('impexpcore_singlereco_respectPid');
                                                }
                                        }
-                                       if (!$recInf && $GLOBALS['BE_USER']->isAdmin()) $optValues['force_uid'] = sprintf($LANG->getLL('impexpcore_singlereco_forceUidSAdmin'),$uid);
+                                       if (!$recInf && $GLOBALS['BE_USER']->isAdmin()) $optValues['force_uid'] = sprintf($LANG->getLL('impexpcore_singlereco_forceUidSAdmin'), $uid);
                                        $optValues['exclude'] = $LANG->getLL('impexpcore_singlereco_exclude');
 
-                                       $pInfo['updateMode'] = $this->renderSelectBox('tx_impexp[import_mode]['.$table.':'.$uid.']',$this->import_mode[$table.':'.$uid],$optValues);
+                                       $pInfo['updateMode'] = $this->renderSelectBox('tx_impexp[import_mode]['.$table.':'.$uid.']',$this->import_mode[$table.':'.$uid], $optValues);
                                }
 
                                        // Diff vieiw:
@@ -2536,7 +2536,7 @@ class tx_impexp {
                                        if ($newUid = $this->import_mapId[$table][$uid]) {
                                                $diffInverse = FALSE;
                                                $recInf = $this->doesRecordExist($table, $newUid, '*');
-                                               t3lib_BEfunc::workspaceOL($table,$recInf);
+                                               t3lib_BEfunc::workspaceOL($table, $recInf);
                                        }
                                        if (is_array($recInf)) {
                                                $pInfo['showDiffContent'] = $this->compareRecords($recInf, $this->dat['records'][$table.':'.$uid]['data'], $table, $diffInverse);
@@ -2562,12 +2562,12 @@ class tx_impexp {
 
                        // File relations:
                if (is_array($record['filerefs'])) {
-                       $this->addFiles($record['filerefs'],$lines,$preCode);
+                       $this->addFiles($record['filerefs'], $lines, $preCode);
                }
 
                        // DB relations
                if (is_array($record['rels'])) {
-                       $this->addRelations($record['rels'],$lines,$preCode);
+                       $this->addRelations($record['rels'], $lines, $preCode);
                }
 
                        // Soft ref
@@ -2577,18 +2577,18 @@ class tx_impexp {
                        foreach($record['softrefs'] as $info) {
                                $pInfo = array();
                                $pInfo['preCode'] = $preCode_A. t3lib_iconWorks::getSpriteIcon('status-status-reference-soft');
-                               $pInfo['title'] = '<em>'.$info['field'].', "'.$info['spKey'].'" </em>: <span title="'.htmlspecialchars($info['matchString']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['matchString'],60)).'</span>';
+                               $pInfo['title'] = '<em>'.$info['field'].', "'.$info['spKey'].'" </em>: <span title="'.htmlspecialchars($info['matchString']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['matchString'], 60)).'</span>';
                                if ($info['subst']['type']) {
                                        if (strlen($info['subst']['title'])) {
-                                               $pInfo['title'].= '<br/>'.$preCode_B.'<strong>'.$LANG->getLL('impexpcore_singlereco_title',1).'</strong> '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['title'],60));
+                                               $pInfo['title'].= '<br/>'.$preCode_B.'<strong>'.$LANG->getLL('impexpcore_singlereco_title', 1).'</strong> '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['title'], 60));
                                        }
                                        if (strlen($info['subst']['description'])) {
-                                               $pInfo['title'].= '<br/>'.$preCode_B.'<strong>'.$LANG->getLL('impexpcore_singlereco_descr',1).'</strong> '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['description'],60));
+                                               $pInfo['title'].= '<br/>'.$preCode_B.'<strong>'.$LANG->getLL('impexpcore_singlereco_descr', 1).'</strong> '.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['subst']['description'], 60));
                                        }
                                        $pInfo['title'].= '<br/>'.$preCode_B.
-                                                                                       ($info['subst']['type'] == 'file' ? $LANG->getLL('impexpcore_singlereco_filename',1).' <strong>'.$info['subst']['relFileName'].'</strong>' : '').
-                                                                                       ($info['subst']['type'] == 'string' ? $LANG->getLL('impexpcore_singlereco_value',1).' <strong>'.$info['subst']['tokenValue'].'</strong>' : '').
-                                                                                       ($info['subst']['type'] == 'db' ? $LANG->getLL('impexpcore_softrefsel_record',1).' <strong>'.$info['subst']['recordRef'].'</strong>' : '');
+                                                                                       ($info['subst']['type'] == 'file' ? $LANG->getLL('impexpcore_singlereco_filename', 1).' <strong>'.$info['subst']['relFileName'].'</strong>' : '').
+                                                                                       ($info['subst']['type'] == 'string' ? $LANG->getLL('impexpcore_singlereco_value', 1).' <strong>'.$info['subst']['tokenValue'].'</strong>' : '').
+                                                                                       ($info['subst']['type'] == 'db' ? $LANG->getLL('impexpcore_softrefsel_record', 1).' <strong>'.$info['subst']['recordRef'].'</strong>' : '');
                                }
                                $pInfo['ref'] = 'SOFTREF';
                                $pInfo['size'] = '';
@@ -2596,7 +2596,7 @@ class tx_impexp {
                                $pInfo['type'] = 'softref';
                                $pInfo['_softRefInfo'] = $info;
                                $pInfo['type'] = 'softref';
-                               if ($info['error'] && !t3lib_div::inList('editable,exclude',$this->softrefCfg[$info['subst']['tokenID']]['mode'])) {
+                               if ($info['error'] && !t3lib_div::inList('editable,exclude', $this->softrefCfg[$info['subst']['tokenID']]['mode'])) {
                                        $pInfo['msg'].= $info['error'];
                                }
                                $lines[] = $pInfo;
@@ -2604,12 +2604,12 @@ class tx_impexp {
                                        // Add relations:
                                if ($info['subst']['type'] == 'db') {
                                        list($tempTable, $tempUid) = explode(':', $info['subst']['recordRef']);
-                                       $this->addRelations(array(array('table' => $tempTable, 'id' => $tempUid, 'tokenID' => $info['subst']['tokenID'])),$lines,$preCode_B,array(), '');
+                                       $this->addRelations(array(array('table' => $tempTable, 'id' => $tempUid, 'tokenID' => $info['subst']['tokenID'])), $lines, $preCode_B, array(), '');
                                }
 
                                        // Add files:
                                if ($info['subst']['type'] == 'file') {
-                                       $this->addFiles(array($info['file_ID']),$lines,$preCode_B, '', $info['subst']['tokenID']);
+                                       $this->addFiles(array($info['file_ID']), $lines, $preCode_B, '', $info['subst']['tokenID']);
                                }
                        }
                }
@@ -2627,7 +2627,7 @@ class tx_impexp {
         * @access private
         * @see singleRecordLines()
         */
-       function addRelations($rels,&$lines,$preCode,$recurCheck=array(),$htmlColorClass='') {
+       function addRelations($rels, &$lines, $preCode, $recurCheck=array(), $htmlColorClass='') {
 
                foreach($rels as $dat) {
                        $table = $dat['table'];
@@ -2636,7 +2636,7 @@ class tx_impexp {
                        $Iprepend = '';
                        $staticFixed = FALSE;
                        $pInfo['ref'] = $table.':'.$uid;
-                       if (!in_array($pInfo['ref'],$recurCheck)) {
+                       if (!in_array($pInfo['ref'], $recurCheck)) {
                                if ($uid > 0) {
                                        $record = $this->dat['header']['records'][$table][$uid];
                                        if (!is_array($record)) {
@@ -2645,7 +2645,7 @@ class tx_impexp {
                                                        $Iprepend = '_static';
                                                        $staticFixed = TRUE;
                                                } else {
-                                                       $doesRE = $this->doesRecordExist($table,$uid);
+                                                       $doesRE = $this->doesRecordExist($table, $uid);
                                                        $lostPath = $this->getRecordPath($table==='pages' ? $doesRE['uid'] : $doesRE['pid']);
 
                                                        $pInfo['title'] = htmlspecialchars($pInfo['ref']);
@@ -2663,14 +2663,14 @@ class tx_impexp {
                                        $staticFixed = TRUE;
                                }
 
-                               $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/rel_db'.$Iprepend.'.gif','width="13" height="12"').' align="top" title="'.htmlspecialchars($pInfo['ref']).'" alt="" />';
+                               $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/rel_db'.$Iprepend.'.gif', 'width="13" height="12"').' align="top" title="'.htmlspecialchars($pInfo['ref']).'" alt="" />';
                                $pInfo['class'] = $htmlColorClass ? $htmlColorClass : 'bgColor3';
                                $pInfo['type'] = 'rel';
 
                                if (!$staticFixed || $this->showStaticRelations) {
                                        $lines[] = $pInfo;
                                        if (is_array($record) && is_array($record['rels'])) {
-                                               $this->addRelations($record['rels'], $lines, $preCode.'&nbsp;&nbsp;', array_merge($recurCheck,array($pInfo['ref'])), $htmlColorClass);
+                                               $this->addRelations($record['rels'], $lines, $preCode.'&nbsp;&nbsp;', array_merge($recurCheck, array($pInfo['ref'])), $htmlColorClass);
                                        }
                                }
                        } else $this->error($pInfo['ref'].' was recursive...');
@@ -2689,7 +2689,7 @@ class tx_impexp {
         * @access private
         * @see singleRecordLines()
         */
-       function addFiles($rels,&$lines,$preCode,$htmlColorClass='',$tokenID='') {
+       function addFiles($rels, &$lines, $preCode, $htmlColorClass='', $tokenID='') {
 
                foreach($rels as $ID) {
 
@@ -2699,7 +2699,7 @@ class tx_impexp {
                        if (!is_array($fI)) {
                                if (!$tokenID || $this->includeSoftref($tokenID)) {
                                        $pInfo['msg'] = 'MISSING FILE: '.$ID;
-                                       $this->error('MISSING FILE: '.$ID,1);
+                                       $this->error('MISSING FILE: '.$ID, 1);
                                } else {
                                        return;
                                }
@@ -2721,7 +2721,7 @@ class tx_impexp {
 
                                        if (!$testDirPrefix2) {
                                                $pInfo['msg'] = 'ERROR: There are no available filemounts to write file in! ';
-                                       } elseif (strcmp($testDirPrefix,$testDirPrefix2)) {
+                                       } elseif (strcmp($testDirPrefix, $testDirPrefix2)) {
                                                $pInfo['msg'] = 'File will be attempted written to "'.$testDirPrefix2.'". ';
                                        }
                                }
@@ -2746,7 +2746,7 @@ class tx_impexp {
                                } else $pInfo['msg'] = 'You user profile does not allow you to create files on the server!';
                        }
 
-                       $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site));
+                       $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID], strlen(PATH_site));
 
                        $lines[] = $pInfo;
                        unset($this->remainHeader['files'][$ID]);
@@ -2758,10 +2758,10 @@ class tx_impexp {
                                $fI = $this->dat['header']['files'][$ID];
                                if (!is_array($fI)) {
                                        $pInfo['msg'] = 'MISSING RTE original FILE: '.$ID;
-                                       $this->error('MISSING RTE original FILE: '.$ID,1);
+                                       $this->error('MISSING RTE original FILE: '.$ID, 1);
                                }
 
-                               $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site));
+                               $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID], strlen(PATH_site));
 
                                $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('actions-reference-file');
                                $pInfo['title'] = htmlspecialchars($fI['filename']).' <em>(Original)</em>';
@@ -2780,12 +2780,12 @@ class tx_impexp {
                                        $fI = $this->dat['header']['files'][$ID];
                                        if (!is_array($fI)) {
                                                $pInfo['msg'] = 'MISSING External Resource FILE: '.$ID;
-                                               $this->error('MISSING External Resource FILE: '.$ID,1);
+                                               $this->error('MISSING External Resource FILE: '.$ID, 1);
                                        } else {
                                                $pInfo['updatePath'] = $fI['parentRelFileName'];
                                        }
 
-                                       $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site));
+                                       $pInfo['showDiffContent'] = substr($this->fileIDMap[$ID], strlen(PATH_site));
 
                                        $pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('actions-insert-reference');
                                        $pInfo['title'] = htmlspecialchars($fI['filename']).' <em>(Resource)</em>';
@@ -2807,11 +2807,11 @@ class tx_impexp {
         * @param       integer         doktype value.
         * @return      boolean         TRUE if OK
         */
-       function checkDokType($checkTable,$doktype) {
+       function checkDokType($checkTable, $doktype) {
                global $PAGES_TYPES;
                $allowedTableList = isset($PAGES_TYPES[$doktype]['allowedTables']) ? $PAGES_TYPES[$doktype]['allowedTables'] : $PAGES_TYPES['default']['allowedTables'];
-               $allowedArray = t3lib_div::trimExplode(',',$allowedTableList,1);
-               if (strstr($allowedTableList,'*') || in_array($checkTable,$allowedArray))       {               // If all tables or the table is listed as a allowed type, return TRUE
+               $allowedArray = t3lib_div::trimExplode(',', $allowedTableList, 1);
+               if (strstr($allowedTableList, '*') || in_array($checkTable, $allowedArray))     {               // If all tables or the table is listed as a allowed type, return TRUE
                        return TRUE;
                }
        }
@@ -2827,7 +2827,7 @@ class tx_impexp {
                global $LANG;
 
                if ($this->mode==='export') {
-                       return ($r['type']=='record' ? '<input type="checkbox" name="tx_impexp[exclude]['.$r['ref'].']" id="checkExclude'.$r['ref'].'" value="1" /> <label for="checkExclude'.$r['ref'].'">'.$LANG->getLL('impexpcore_singlereco_exclude',1).'</label>' :
+                       return ($r['type']=='record' ? '<input type="checkbox" name="tx_impexp[exclude]['.$r['ref'].']" id="checkExclude'.$r['ref'].'" value="1" /> <label for="checkExclude'.$r['ref'].'">'.$LANG->getLL('impexpcore_singlereco_exclude', 1).'</label>' :
                                                                ($r['type']=='softref' ? $this->softrefSelector($r['_softRefInfo']) : ''));
                } else {        // During import
 
@@ -2870,7 +2870,7 @@ class tx_impexp {
                        $value = $this->softrefCfg[$cfg['subst']['tokenID']]['mode'];
 
                                // Render options selector:
-                       $selectorbox = $this->renderSelectBox('tx_impexp[softrefCfg]['.$cfg['subst']['tokenID'].'][mode]',$value,$optValues).'<br/>';
+                       $selectorbox = $this->renderSelectBox('tx_impexp[softrefCfg]['.$cfg['subst']['tokenID'].'][mode]', $value, $optValues).'<br/>';
 
                        if ($value === 'editable') {
 
@@ -2886,7 +2886,7 @@ class tx_impexp {
                                        // Description:
                                if (!strlen($cfg['subst']['description'])) {
                                        $descriptionField.= '
-                                       '.$LANG->getLL('impexpcore_printerror_description',1).'<br/>
+                                       '.$LANG->getLL('impexpcore_printerror_description', 1).'<br/>
                                        <input type="text" name="tx_impexp[softrefCfg]['.$cfg['subst']['tokenID'].'][description]" value="'.htmlspecialchars($this->softrefCfg[$cfg['subst']['tokenID']]['description']).'" />';
                                } else {
                                        $descriptionField.= '
@@ -2941,7 +2941,7 @@ class tx_impexp {
         */
        function inclRelation($table) {
                if (is_array($GLOBALS['TCA'][$table])) {
-                       return (in_array($table, $this->relOnlyTables) || in_array('_ALL', $this->relOnlyTables)) && $GLOBALS['BE_USER']->check('tables_select',$table);
+                       return (in_array($table, $this->relOnlyTables) || in_array('_ALL', $this->relOnlyTables)) && $GLOBALS['BE_USER']->check('tables_select', $table);
                }
        }
 
@@ -2952,7 +2952,7 @@ class tx_impexp {
         * @param       integer         UID value
         * @return      boolean         TRUE, if table is marked static
         */
-       function isExcluded($table,$uid) {
+       function isExcluded($table, $uid) {
                return $this->excludeMap[$table.':'.$uid] ? TRUE : FALSE;
        }
 
@@ -3000,7 +3000,7 @@ class tx_impexp {
         * @param       string          Field list to select. Default is "uid,pid"
         * @return      array           Result of t3lib_BEfunc::getRecord() which means the record if found, otherwise FALSE
         */
-       function doesRecordExist($table,$uid,$fields='') {
+       function doesRecordExist($table, $uid, $fields='') {
                return t3lib_BEfunc::getRecord($table, $uid, $fields ? $fields : 'uid,pid');
        }
 
@@ -3027,18 +3027,18 @@ class tx_impexp {
         * @param       array           Options to display (key/value pairs)
         * @return      string          HTML select element
         */
-       function renderSelectBox($prefix,$value,$optValues) {
+       function renderSelectBox($prefix, $value, $optValues) {
                $opt = array();
                $isSelFlag = 0;
                foreach ($optValues as $k => $v) {
-                       $sel = (!strcmp($k,$value) ? ' selected="selected"' : '');
+                       $sel = (!strcmp($k, $value) ? ' selected="selected"' : '');
                        if ($sel)       $isSelFlag++;
                        $opt[] = '<option value="'.htmlspecialchars($k).'"'.$sel.'>'.htmlspecialchars($v).'</option>';
                }
-               if (!$isSelFlag && strcmp('',$value)) {
+               if (!$isSelFlag && strcmp('', $value)) {
                        $opt[] = '<option value="'.htmlspecialchars($value).'" selected="selected">'.htmlspecialchars("['".$value."']").'</option>';
                }
-               return '<select name="'.$prefix.'">'.implode('',$opt).'</select>';
+               return '<select name="'.$prefix.'">'.implode('', $opt).'</select>';
        }
 
        /**
@@ -3097,7 +3097,7 @@ class tx_impexp {
                                        ';
                                }
 
-                               $output = '<table border="0" cellpadding="0" cellspacing="1">'.implode('',$tRows).'</table>';
+                               $output = '<table border="0" cellpadding="0" cellspacing="1">'.implode('', $tRows).'</table>';
                        } else {
                                $output = 'Match';
                        }
@@ -3117,10 +3117,10 @@ class tx_impexp {
         */
        function getRTEoriginalFilename($string) {
                        // If "magic image":
-               if (t3lib_div::isFirstPartOfStr($string,'RTEmagicC_')) {
+               if (t3lib_div::isFirstPartOfStr($string, 'RTEmagicC_')) {
                                // Find original file:
-                       $pI = pathinfo(substr($string,strlen('RTEmagicC_')));
-                       $filename = substr($pI['basename'],0,-strlen('.'.$pI['extension']));
+                       $pI = pathinfo(substr($string, strlen('RTEmagicC_')));
+                       $filename = substr($pI['basename'], 0, -strlen('.'.$pI['extension']));
                        $origFilePath = 'RTEmagicP_'.$filename;
 
                        return $origFilePath;
index 1248fd9..f1b7073 100755 (executable)
@@ -63,7 +63,7 @@ class tx_impexp_clickmenu {
         * @return      array           Menu item array, returned after modification
         * @todo        Skinning for icons...
         */
-       function main(&$backRef,$menuItems,$table,$uid) {
+       function main(&$backRef, $menuItems, $table, $uid) {
                $localItems=array();
                if (($backRef->cmLevel && t3lib_div::_GP('subname')=='moreoptions') || ($table==='pages' && $uid==0))   {       // Show import/export on second level menu OR root level.
 
@@ -80,7 +80,7 @@ class tx_impexp_clickmenu {
                                $url.='&tx_impexp[external_ref][tables][]=_ALL';
                        }
                        $localItems[] = $backRef->linkItem(
-                               $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('export',$LL)),
+                               $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('export', $LL)),
                                $backRef->excludeIcon(t3lib_iconWorks::getSpriteIcon('actions-document-export-t3d')),
                                $backRef->urlRefForCM($url),
                                1       // Disables the item in the top-bar
@@ -89,14 +89,14 @@ class tx_impexp_clickmenu {
                        if ($table=='pages') {
                                $url = $modUrl . '?id='. $uid . '&table=' . $table . '&tx_impexp[action]=import';
                                $localItems[] = $backRef->linkItem(
-                                       $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('import',$LL)),
+                                       $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->getLLL('import', $LL)),
                                        $backRef->excludeIcon(t3lib_iconWorks::getSpriteIcon('actions-document-import-t3d')),
                                        $backRef->urlRefForCM($url),
                                        1       // Disables the item in the top-bar
                                );
                        }
                }
-               return array_merge($menuItems,$localItems);
+               return array_merge($menuItems, $localItems);
        }
 
        /**
@@ -107,7 +107,7 @@ class tx_impexp_clickmenu {
        function includeLL() {
                global $LANG;
 
-               return $LANG->includeLLFile('EXT:impexp/app/locallang.php',FALSE);
+               return $LANG->includeLLFile('EXT:impexp/app/locallang.php', FALSE);
        }
 }
 ?>
\ No newline at end of file
index b8a1313..6c39427 100755 (executable)
@@ -16,7 +16,7 @@ if (TYPO3_MODE == 'BE') {
                'icon'            => 'EXT:impexp/export.gif'
        );
 
-       t3lib_extMgm::addLLrefForTCAdescr('xMOD_tx_impexp','EXT:impexp/locallang_csh.xml');
+       t3lib_extMgm::addLLrefForTCAdescr('xMOD_tx_impexp', 'EXT:impexp/locallang_csh.xml');
 
        // CSH labels for TYPO3 4.5 and greater.  These labels override the ones set above, while still falling back to the original labels if no translation is available.
        $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['EXT:impexp/locallang_csh.xml'][] = 'EXT:impexp/locallang_csh_45.xml';
index 3b53cce..8871a85 100755 (executable)
@@ -32,7 +32,7 @@
 
 
 
-t3lib_extMgm::isLoaded('impexp',1);
+t3lib_extMgm::isLoaded('impexp', 1);
 
 
 /**
@@ -60,21 +60,21 @@ class tx_impexp_modfunc1 extends mod_user_task {
                                $title = strlen($presetCfg['title']) ? $presetCfg['title'] : '['.$presetCfg['uid'].']';
                                $opt[] = '
                                        <tr class="bgColor4">
-                                               <td nowrap="nowrap"><a href="index.php?SET[function]=tx_impexp&display='.$presetCfg['uid'].'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($title,30)).'</a>&nbsp;</td>
+                                               <td nowrap="nowrap"><a href="index.php?SET[function]=tx_impexp&display='.$presetCfg['uid'].'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($title, 30)).'</a>&nbsp;</td>
                                                <td>'.($presetCfg['item_uid'] ? $presetCfg['item_uid'] : '&nbsp;').'</td>
                                                <td>'.($presetCfg['public'] ? '[Public]' : '&nbsp;').'</td>
                                                <td>'.($presetCfg['user_uid']===$GLOBALS['BE_USER']->user['uid'] ? '[Own]' : '&nbsp;').'</td>
                                        </tr>';
                        }
                        if(sizeof($opt)>0) {
-                               $presets = '<table border="0" cellpadding="0" cellspacing="1" class="lrPadding">'.implode('',$opt).'</table>';
+                               $presets = '<table border="0" cellpadding="0" cellspacing="1" class="lrPadding">'.implode('', $opt).'</table>';
                                $presets .= '<a href="index.php?SET[function]=tx_impexp"><em>'.$LANG->getLL('link_allRecs').'</em></a>';
                        } else {
                                $presets = '';
                        }
 
                        $icon = '<img src="'.$this->backPath.t3lib_extMgm::extRelPath('impexp').'export.gif" width="18" height="16" class="absmiddle" alt="" />';
-                       $config= $this->mkMenuConfig($icon.$this->headLink('tx_impexp_modfunc1',1),'',$presets);
+                       $config= $this->mkMenuConfig($icon.$this->headLink('tx_impexp_modfunc1', 1), '', $presets);
                }
 
                return $config;
@@ -89,12 +89,12 @@ class tx_impexp_modfunc1 extends mod_user_task {
         */
        function main() {
                        if($id = t3lib_div::_GP('display')) {
-                               return $this->urlInIframe($this->backPath.t3lib_extMgm::extRelPath('impexp').'app/index.php?tx_impexp[action]=export&preset[load]=1&preset[select]='.$id,1);
+                               return $this->urlInIframe($this->backPath.t3lib_extMgm::extRelPath('impexp').'app/index.php?tx_impexp[action]=export&preset[load]=1&preset[select]='.$id, 1);
                        } else {
                                // Thumbnail folder and files:
                                $tempDir = $this->userTempFolder();
                                if ($tempDir) {
-                                       $thumbnails = t3lib_div::getFilesInDir($tempDir,'png,gif,jpg',1);
+                                       $thumbnails = t3lib_div::getFilesInDir($tempDir, 'png,gif,jpg', 1);
                                }
 
                                $clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
@@ -122,11 +122,11 @@ class tx_impexp_modfunc1 extends mod_user_task {
                                                $opt[] = '
                                        <tr class="bgColor4">
                                                <td>' . ($thumbnailFile ? '<img src="' . $this->backPath . '../' . substr($tempDir, strlen(PATH_site)) . basename($thumbnailFile) . '" hspace="2" width="70" style="border: solid black 1px;" alt="" /><br />' : '&nbsp;') . '</td>
-                                               <td nowrap="nowrap"><a href="index.php?SET[function]=tx_impexp&display='.$presetCfg['uid'].'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($title,30)).'</a>&nbsp;</td>
+                                               <td nowrap="nowrap"><a href="index.php?SET[function]=tx_impexp&display='.$presetCfg['uid'].'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($title, 30)).'</a>&nbsp;</td>
                                                <td>'.($presetCfg['public'] ? 'Yes' : '&nbsp;').'</td>
                                                <td>'.($presetCfg['user_uid']===$GLOBALS['BE_USER']->user['uid'] ? 'Own' : '['.$usernames[$presetCfg['user_uid']]['username'].']').'</td>
                                                <td>'.($configuration['pagetree']['id'] ? $configuration['pagetree']['id'] : '&nbsp;').'</td>
-                                               <td>'.htmlspecialchars($configuration['pagetree']['id'] ? t3lib_BEfunc::getRecordPath($configuration['pagetree']['id'],$clause,20) : '[Single Records]').'</td>
+                                               <td>'.htmlspecialchars($configuration['pagetree']['id'] ? t3lib_BEfunc::getRecordPath($configuration['pagetree']['id'], $clause, 20) : '[Single Records]').'</td>
                                                <td>
                                                        <strong>' . htmlspecialchars($configuration['meta']['title']) . '</strong><br />' .
                                                        htmlspecialchars($configuration['meta']['description']).
@@ -135,13 +135,13 @@ class tx_impexp_modfunc1 extends mod_user_task {
                                                </td>
                                        </tr>';
                                        }
-                                       $content = '<table border="0" cellpadding="0" cellspacing="1" class="lrPadding">'.implode('',$opt).'</table>';
+                                       $content = '<table border="0" cellpadding="0" cellspacing="1" class="lrPadding">'.implode('', $opt).'</table>';
                                }
                        }
 
                        // Output:
                $theOutput.= $this->pObj->doc->spacer(5);
-               $theOutput.= $this->pObj->doc->section('Export presets',$content,0,1);
+               $theOutput.= $this->pObj->doc->section('Export presets', $content, 0, 1);
 
                return $theOutput;
        }
index e1e3326..2bc3506 100644 (file)
@@ -198,7 +198,7 @@ class tx_indexedsearch_mysql {
                $resource = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                                'index_fulltext.*, ISEC.*, IP.*',
                                'index_fulltext, index_section ISEC, index_phash IP' . $pageJoin,
-                               'MATCH ('.$searchData['fulltextIndex'].') AGAINST (' . $GLOBALS['TYPO3_DB']->fullQuoteStr($searchData['searchString'],'index_fulltext') . $searchBoolean . ') '.
+                               'MATCH ('.$searchData['fulltextIndex'].') AGAINST (' . $GLOBALS['TYPO3_DB']->fullQuoteStr($searchData['searchString'], 'index_fulltext') . $searchBoolean . ') '.
                                        $this->pObj->mediaTypeWhere() . ' ' .
                                        $this->pObj->languageWhere() .
                                        $freeIndexUidClause . '
index c6eff04..12ae223 100755 (executable)
@@ -40,7 +40,7 @@ require($BACK_PATH.'init.php');
 require($BACK_PATH.'template.php');
 $LANG->includeLLFile('EXT:lang/locallang_mod_web_info.xml');
 
-$BE_USER->modAccess($MCONF,1);
+$BE_USER->modAccess($MCONF, 1);
 
 
 
@@ -74,13 +74,13 @@ class SC_mod_web_info_index extends t3lib_SCbase {
        function main() {
                // Access check...
                // The page will show only if there is a valid page and if this page may be viewed by the user
-               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id,$this->perms_clause);
+               $this->pageinfo = t3lib_BEfunc::readPageAccess($this->id, $this->perms_clause);
                $access = is_array($this->pageinfo) ? 1 : 0;
 
                if (($this->id && $access) || ($GLOBALS['BE_USER']->user['admin'] && !$this->id)) {
                        $this->CALC_PERMS = $GLOBALS['BE_USER']->calcPerms($this->pageinfo);
                        if ($GLOBALS['BE_USER']->user['admin'] && !$this->id) {
-                               $this->pageinfo=array('title' => '[root-level]','uid'=>0,'pid'=>0);
+                               $this->pageinfo=array('title' => '[root-level]', 'uid'=>0, 'pid'=>0);
                        }
 
                        $this->doc = t3lib_div::makeInstance('template');
@@ -88,12 +88,12 @@ class SC_mod_web_info_index extends t3lib_SCbase {
                        $this->doc->setModuleTemplate('templates/info.html');
                        $this->doc->tableLayout = Array (
                                '0' => Array (
-                                       '0' => Array('<td valign="top"><strong>','</strong></td>'),
-                                       "defCol" => Array('<td><img src="'.$this->doc->backPath.'clear.gif" width="10" height="1" alt="" /></td><td valign="top"><strong>','</strong></td>')
+                                       '0' => Array('<td valign="top"><strong>', '</strong></td>'),
+                                       "defCol" => Array('<td><img src="'.$this->doc->backPath.'clear.gif" width="10" height="1" alt="" /></td><td valign="top"><strong>', '</strong></td>')
                                ),
                                "defRow" => Array (
-                                       "0" => Array('<td valign="top">','</td>'),
-                                       "defCol" => Array('<td><img src="'.$this->doc->backPath.'clear.gif" width="10" height="1" alt="" /></td><td valign="top">','</td>')
+                                       "0" => Array('<td valign="top">', '</td>'),
+                                       "defCol" => Array('<td><img src="'.$this->doc->backPath.'clear.gif" width="10" height="1" alt="" /></td><td valign="top">', '</td>')
                                )
                        );
 
@@ -113,9 +113,9 @@ class SC_mod_web_info_index extends t3lib_SCbase {
                        $this->doc->getContextMenuCode();
                        $this->doc->form = '<form action="index.php" method="post" name="webinfoForm">';
 
-                       $vContent = $this->doc->getVersionSelector($this->id,1);
+                       $vContent = $this->doc->getVersionSelector($this->id, 1);
                        if ($vContent) {
-                               $this->content.=$this->doc->section('',$vContent);
+                               $this->content.=$this->doc->section('', $vContent);
                        }
 
                        $this->extObjContent();
index d481e2c..8ff5aa0 100755 (executable)
@@ -83,31 +83,31 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
        function main() {
                global $LANG;
 
-               $menu = t3lib_BEfunc::getFuncMenu($this->pObj->id,'SET[tsconf_parts]',$this->pObj->MOD_SETTINGS['tsconf_parts'],$this->pObj->MOD_MENU['tsconf_parts']);
+               $menu = t3lib_BEfunc::getFuncMenu($this->pObj->id, 'SET[tsconf_parts]', $this->pObj->MOD_SETTINGS['tsconf_parts'], $this->pObj->MOD_MENU['tsconf_parts']);
                $menu .= '<br /><label for="checkTsconf_alphaSort">' . $GLOBALS['LANG']->getLL('sort_alphabetic', TRUE) . '</label> ' . t3lib_BEfunc::getFuncCheck($this->pObj->id, 'SET[tsconf_alphaSort]', $this->pObj->MOD_SETTINGS['tsconf_alphaSort'], '', '', 'id="checkTsconf_alphaSort"');
                $menu .= '<br /><br />';
 
                $theOutput = $this->pObj->doc->header($LANG->getLL('tsconf_title'));
 
                if ($this->pObj->MOD_SETTINGS['tsconf_parts']==99) {
-                       $TSparts = t3lib_BEfunc::getPagesTSconfig($this->pObj->id,'',1);
+                       $TSparts = t3lib_BEfunc::getPagesTSconfig($this->pObj->id, '', 1);
                        $lines = array();
                        $pUids = array();
 
                        foreach($TSparts as $k => $v) {
                                if ($k!='uid_0') {
                                        if ($k=='defaultPageTSconfig') {
-                                               $pTitle = '<strong>'.$GLOBALS['LANG']->getLL('editTSconfig_default',1).'</strong>';
+                                               $pTitle = '<strong>'.$GLOBALS['LANG']->getLL('editTSconfig_default', 1).'</strong>';
                                                $editIcon = '';
                                        } else {
-                                               $pUids[] = substr($k,4);
-                                               $row = t3lib_BEfunc::getRecordWSOL('pages',substr($k,4));
-                                               $pTitle = $this->pObj->doc->getHeader('pages',$row,'',0);
+                                               $pUids[] = substr($k, 4);
+                                               $row = t3lib_BEfunc::getRecordWSOL('pages', substr($k, 4));
+                                               $pTitle = $this->pObj->doc->getHeader('pages', $row, '', 0);
 
-                                               $editIdList = substr($k,4);
+                                               $editIdList = substr($k, 4);
                                                $params = '&edit[pages]['.$editIdList.']=edit&columnsOnly=TSconfig';
-                                               $onclickUrl = t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'],'');
-                                               $editIcon = '<a href="#" onclick="'.htmlspecialchars($onclickUrl).'" title="'.$GLOBALS['LANG']->getLL('editTSconfig',1).'">'.
+                                               $onclickUrl = t3lib_BEfunc::editOnClick($params, $GLOBALS['BACK_PATH'], '');
+                                               $editIcon = '<a href="#" onclick="'.htmlspecialchars($onclickUrl).'" title="'.$GLOBALS['LANG']->getLL('editTSconfig', 1).'">'.
                                                                        t3lib_iconWorks::getSpriteIcon('actions-document-open') .
                                                                '</a>';
                                        }
@@ -127,11 +127,11 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
                        }
 
                        if (count($pUids)) {
-                               $params = '&edit[pages]['.implode(',',$pUids).']=edit&columnsOnly=TSconfig';
-                               $onclickUrl = t3lib_BEfunc::editOnClick($params,$GLOBALS['BACK_PATH'],'');
-                               $editIcon = '<a href="#" onclick="'.htmlspecialchars($onclickUrl).'" title="'.$GLOBALS['LANG']->getLL('editTSconfig_all',1).'">'.
+                               $params = '&edit[pages]['.implode(',', $pUids).']=edit&columnsOnly=TSconfig';
+                               $onclickUrl = t3lib_BEfunc::editOnClick($params, $GLOBALS['BACK_PATH'], '');
+                               $editIcon = '<a href="#" onclick="'.htmlspecialchars($onclickUrl).'" title="'.$GLOBALS['LANG']->getLL('editTSconfig_all', 1).'">'.
                                                        t3lib_iconWorks::getSpriteIcon('actions-document-open') .
-                                                       '<strong>'.$GLOBALS['LANG']->getLL('editTSconfig_all',1).'</strong>'.
+                                                       '<strong>'.$GLOBALS['LANG']->getLL('editTSconfig_all', 1).'</strong>'.
                                                '</a>';
                        } else $editIcon = '';
 
@@ -158,43 +158,43 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
 
                        switch($this->pObj->MOD_SETTINGS['tsconf_parts']) {
                                case '1':
-                                       $modTSconfig = t3lib_BEfunc::getModTSconfig($this->pObj->id,'mod');
+                                       $modTSconfig = t3lib_BEfunc::getModTSconfig($this->pObj->id, 'mod');
                                break;
                                case '1a':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_layout',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_layout', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '1b':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_view',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_view', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '1c':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_modules',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_modules', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '1d':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_list',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_list', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '1e':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_info',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_info', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '1f':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_func',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_func', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '1g':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_ts',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('mod.web_ts', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '2':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('RTE',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('RTE', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '5':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('TCEFORM',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('TCEFORM', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '6':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('TCEMAIN',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('TCEMAIN', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '3':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('TSFE',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('TSFE', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                case '4':
-                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('user',t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
+                                       $modTSconfig = $GLOBALS['BE_USER']->getTSConfig('user', t3lib_BEfunc::getPagesTSconfig($this->pObj->id));
                                break;
                                default:
                                        $modTSconfig['properties'] = t3lib_BEfunc::getPagesTSconfig($this->pObj->id);
@@ -212,7 +212,7 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
                                        <!-- Page TSconfig Tree: -->
                                        <table border="0" cellpadding="0" cellspacing="0">
                                                <tr>
-                                                       <td nowrap="nowrap">'.$tmpl->ext_getObjTree($modTSconfig,'','','','',$this->pObj->MOD_SETTINGS['tsconf_alphaSort']).'</td>
+                                                       <td nowrap="nowrap">'.$tmpl->ext_getObjTree($modTSconfig, '', '', '', '', $this->pObj->MOD_SETTINGS['tsconf_alphaSort']).'</td>
                                                </tr>
                                        </table>',
                                0,
index 6e736d9..51ed9b5 100755 (executable)
@@ -10,6 +10,6 @@ if (TYPO3_MODE=='BE') {
        );
 }
 
-t3lib_extMgm::addLLrefForTCAdescr('_MOD_web_info','EXT:info_pagetsconfig/locallang_csh_webinfo.xml');
+t3lib_extMgm::addLLrefForTCAdescr('_MOD_web_info', 'EXT:info_pagetsconfig/locallang_csh_webinfo.xml');
 
 ?>
\ No newline at end of file
index bcb97d4..fd2f117 100755 (executable)
@@ -2,7 +2,7 @@
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
 if (TYPO3_MODE === 'BE') {
-       t3lib_extMgm::addModulePath('tools_install',t3lib_extMgm::extPath ($_EXTKEY) . 'mod/');
+       t3lib_extMgm::addModulePath('tools_install', t3lib_extMgm::extPath ($_EXTKEY) . 'mod/');
        t3lib_extMgm::addModule('tools', 'install', '', t3lib_extMgm::extPath($_EXTKEY) . 'mod/');
 
        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['reports']['tx_reports']['status']['providers']['typo3'][] = 'tx_install_report_InstallStatus';
index fc93223..a2223cb 100644 (file)
@@ -6072,7 +6072,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                if (count($statements)) {
                                                        $out = '';
                                                        foreach ($statements as $statement) {
-                                                               $out.= '<p>' . nl2br(htmlspecialchars(t3lib_div::fixed_lgd_cs($statement,$maxlen))) . '</p>';
+                                                               $out.= '<p>' . nl2br(htmlspecialchars(t3lib_div::fixed_lgd_cs($statement, $maxlen))) . '</p>';
                                                        }
                                                }
                                                $this->message($tLabel, 'Content of '.basename($actionParts[1]), $out, 1);
@@ -6879,7 +6879,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                $content.= $this->generateUpdateDatabaseForm_checkboxes($arr_remove['drop'], 'Drop fields (really!)', $this->setAllCheckBoxesByDefault);
 
                                $content.= $this->generateUpdateDatabaseForm_checkboxes($arr_update['create_table'], 'Add tables');
-                               $content.= $this->generateUpdateDatabaseForm_checkboxes($arr_remove['change_table'], 'Removing tables (rename with prefix)', $this->setAllCheckBoxesByDefault,1,$arr_remove['tables_count'], 1);
+                               $content.= $this->generateUpdateDatabaseForm_checkboxes($arr_remove['change_table'], 'Removing tables (rename with prefix)', $this->setAllCheckBoxesByDefault, 1, $arr_remove['tables_count'], 1);
                                $content.= $this->generateUpdateDatabaseForm_checkboxes($arr_remove['drop_table'], 'Drop tables (really!)', $this->setAllCheckBoxesByDefault, 0, $arr_remove['tables_count'], 1);
 
                                $content = $this->getUpdateDbFormWrap($action_type, $content);
index b7988ce..1a1a802 100644 (file)
@@ -189,7 +189,7 @@ class tx_coreupdates_compatversion extends Tx_Install_Updates_Base {
                $linesArr = $this->pObj->writeToLocalconf_control();
                $version = $this->userInput['version'] ? $this->userInput['version'] : TYPO3_branch;
                $this->pObj->setValueInLocalconfFile($linesArr, '$TYPO3_CONF_VARS[\'SYS\'][\'compat_version\']', $version);
-               $this->pObj->writeToLocalconf_control($linesArr,0);
+               $this->pObj->writeToLocalconf_control($linesArr, 0);
                $customMessages.= '<br />The compatibility version has been set to '.$version.'.';
 
                return 1;
@@ -232,8 +232,8 @@ class tx_coreupdates_compatversion extends Tx_Install_Updates_Base {
                        $updateWizardBoxes = '';
                        foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['ext/install']['compat_version'] as $internalName => $details) {
                                if ($details['version'] > $oldVersion && $details['version'] <= $currentVersion) {
-                                       $description = str_replace(chr(10),'<br />',$details['description']);
-                                       $description_acknowledge = (isset($details['description_acknowledge']) ? str_replace(chr(10),'<br />',$details['description_acknowledge']) : '');
+                                       $description = str_replace(chr(10), '<br />', $details['description']);
+                                       $description_acknowledge = (isset($details['description_acknowledge']) ? str_replace(chr(10), '<br />', $details['description_acknowledge']) : '');
 
                                        $updateWizardBoxes.= '
                                                <div style="border: 1px solid; padding: 10px; margin: 10px; padding-top: 0px; width: 500px;">