[TASK] Fix CGL violations against SuperfluousWhitespace
authorWouter Wolters <typo3@wouterwolters.nl>
Sun, 1 Jul 2012 17:59:55 +0000 (19:59 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sun, 1 Jul 2012 22:36:43 +0000 (00:36 +0200)
Fix CGL violations against SuperfluousWhitespace

Change-Id: Ibc3d56d3385619f35765d31965688d1c892a4fc5
Resolves: #38525
Releases: 6.0
Reviewed-on: http://review.typo3.org/12506
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
39 files changed:
t3lib/class.t3lib_arraybrowser.php
t3lib/class.t3lib_clipboard.php
t3lib/class.t3lib_cs.php
t3lib/class.t3lib_extmgm.php
t3lib/class.t3lib_fullsearch.php
t3lib/class.t3lib_iconworks.php
t3lib/class.t3lib_loaddbgroup.php
t3lib/class.t3lib_pagerenderer.php
t3lib/class.t3lib_readmail.php
t3lib/class.t3lib_tceforms.php
t3lib/class.t3lib_tcemain.php
t3lib/class.t3lib_tsparser.php
t3lib/class.t3lib_tsparser_ext.php
t3lib/class.t3lib_tsstyleconfig.php
t3lib/class.t3lib_tstemplate.php
t3lib/file/Factory.php
t3lib/file/Service/FileProcessingService.php
t3lib/file/Service/IndexerService.php
t3lib/file/Storage.php
t3lib/tceforms/class.t3lib_tceforms_tree.php
t3lib/tree/pagetree/class.t3lib_tree_pagetree_dataprovider.php
typo3/alt_db_navframe.php
typo3/alt_doc.php
typo3/alt_doc_nodoc.php
typo3/class.browse_links.php
typo3/class.db_list_extra.inc
typo3/class.file_list.inc
typo3/class.webpagetree.php
typo3/classes/class.ajaxlogin.php
typo3/classes/class.typo3logo.php
typo3/db_new.php
typo3/file_newfolder.php
typo3/file_upload.php
typo3/index.php
typo3/template.php
typo3/wizard_colorpicker.php
typo3/wizard_forms.php
typo3/wizard_rte.php
typo3/wizard_tsconfig.php

index 6444ff5..fe7c7ce 100644 (file)
@@ -86,7 +86,6 @@ class t3lib_arrayBrowser {
                        $BTM = ($a == $c) ? 'bottom' : '';
                        $PM = $isArray ? ($deeper ? 'minus' : 'plus') : 'join';
 
-
                        $HTML .= $depthData;
                        $theIcon = '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/ol/' . $PM . $BTM . '.gif', 'width="18" height="16"') .
                                ' align="top" border="0" alt="" />';
index 762eaef..a4ef9b0 100644 (file)
@@ -302,7 +302,6 @@ class t3lib_clipboard {
                                '</a></td>
                        </tr>';
 
-
                        // Print header and content for the NORMAL tab:
                $out[] = '
                        <tr class="bgColor5">
@@ -377,7 +376,6 @@ class t3lib_clipboard {
                                                                $thumb = '<br />' . t3lib_BEfunc::getThumbNail($this->backPath . 'thumbs.php', $v, ' vspace="4"');
                                                        }
 
-
                                                        $lines[] = '
                                                                <tr>
                                                                        <td class="' . $bgColClass . '">' . $icon . '</td>
index 58e68e3..2bda322 100644 (file)
@@ -1760,7 +1760,6 @@ class t3lib_cs {
                        // Move the iso codes to the (because we're comparing the keys with "isset" later on)
                $allLanguageCodes = array_flip($allLanguageCodes);
 
-
                $preferredLanguages = t3lib_div::trimExplode(',', $languageCodesList);
                        // Order the preferred languages after they key
                $sortedPreferredLanguages = array();
index 5b56b55..4fbaa57 100644 (file)
@@ -1147,7 +1147,6 @@ class t3lib_extMgm {
                                );
                        }
 
-
                                // OS check
                                // Empty $os means 'not limited to one OS', therefore a check is not needed
                        if ($GLOBALS['T3_SERVICES'][$serviceType][$serviceKey]['available']
index 81af23e..5d54fa9 100644 (file)
@@ -341,7 +341,6 @@ class t3lib_fullsearch {
                        $output .= $GLOBALS['SOBE']->doc->spacer(20);
                }
 
-
                        // Query Maker:
                $qGen = t3lib_div::makeInstance('t3lib_queryGenerator');
                $qGen->init('queryConfig', $GLOBALS['SOBE']->MOD_SETTINGS['queryTable']);
index d8d03e5..c50cc80 100644 (file)
@@ -361,7 +361,6 @@ final class t3lib_iconWorks {
                        }
                }
 
-
                        // Return icon source/wHattributes:
                $output = '';
                switch ($outputMode) {
@@ -403,7 +402,6 @@ final class t3lib_iconWorks {
                $mainpath = '../typo3temp/' . $iconFileName;
                $path = PATH_site . 'typo3temp/' . $iconFileName;
 
-
                if (file_exists(PATH_typo3 . 'icons/' . $iconFileName)) { // Returns if found in typo3/icons/
                        return 'icons/' . $iconFileName;
                } elseif (file_exists($path)) { // Returns if found in ../typo3temp/icons/
index 5f64ae7..f136b30 100644 (file)
@@ -302,7 +302,6 @@ class t3lib_loadDBGroup {
                        $sorting_field = 'sorting';
                }
 
-
                if ($this->MM_table_where) {
                        $additionalWhere .= LF . str_replace('###THIS_UID###', intval($uid), $this->MM_table_where);
                }
index fa2a972..9012570 100644 (file)
@@ -1904,7 +1904,6 @@ class t3lib_PageRenderer implements t3lib_Singleton {
                                // Swedish
                        $localeMap['se'] = 'se_SV';
 
-
                        $extJsLang = isset($localeMap[$this->lang]) ? $localeMap[$this->lang] : $this->lang;
                                // TODO autoconvert file from UTF8 to current BE charset if necessary!!!!
                        $extJsLocaleFile = $this->extJsPath . 'locale/ext-lang-' . $extJsLang . '.js';
index a773721..2830ce4 100644 (file)
@@ -425,7 +425,6 @@ class t3lib_readmail {
                        // Content types
                $mailParts['_CONTENT_TYPE_DAT'] = $this->getContentTypeData($mailParts['content-type']);
 
-
                // *************************
                // PROCESSING the CONTENT part of the mail (the body)
                // *************************
index 1f71d9c..ee2798e 100644 (file)
@@ -745,7 +745,6 @@ class t3lib_TCEforms {
                        (!$GLOBALS['TCA'][$table]['ctrl']['languageField'] || !$this->localizationMode || $this->localizationMode === $PA['fieldConf']['l10n_cat'])
                ) {
 
-
                                // Fetching the TSconfig for the current table/field. This includes the $row which means that
                        $PA['fieldTSConfig'] = $this->setTSconfig($table, $row, $field);
 
@@ -2745,7 +2744,6 @@ class t3lib_TCEforms {
                                $onClick = 'if(TBE_EDITOR.checkSubmit(-1)){ ' . $this->elName($elName) . ".value='" . $sKey . "'; TBE_EDITOR.submitForm();}";
                        }
 
-
                        $tCells[] = '<td width="' . $pct . '%" style="' . ($sKey == $sheetKey ? 'background-color: #9999cc; font-weight: bold;' : 'background-color: #aaaaaa;') . ' cursor: hand;" onclick="' . htmlspecialchars($onClick) . '" align="center">' .
                                                ($sheetCfg['ROOT']['TCEforms']['sheetTitle'] ? $this->sL($sheetCfg['ROOT']['TCEforms']['sheetTitle']) : $sKey) .
                                                '</td>';
@@ -3805,7 +3803,6 @@ class t3lib_TCEforms {
                        $selector = '<select id="' . uniqid('tceforms-multiselect-') . '" ' . ($params['noList'] ? 'style="display: none"' : 'size="' . $sSize . '"' . $this->insertDefStyle('group', 'tceforms-multiselect')) . ($isMultiple ? ' multiple="multiple"' : '') . ' name="' . $fName . '_list" ' . $onFocus . $params['style'] . $disabled . '>' . implode('', $opt) . '</select>';
                }
 
-
                $icons = array(
                        'L' => array(),
                        'R' => array(),
@@ -3834,7 +3831,6 @@ class t3lib_TCEforms {
                                        $elementBrowserAllowed = $allowed;
                                }
 
-
                                $aOnClick = 'setFormValueOpenBrowser(\'' . $elementBrowserType . '\',\'' . ($fName . '|||' . $elementBrowserAllowed . '|' . $aOnClickInline) . '\'); return false;';
                                $icons['R'][] = '<a href="#" onclick="' . htmlspecialchars($aOnClick) . '">' .
                                                                t3lib_iconWorks::getSpriteIcon('actions-insert-record', array('title' => htmlspecialchars($this->getLL('l_browse_' . ($mode == 'db' ? 'db' : 'file'))))) .
@@ -6041,7 +6037,6 @@ class t3lib_TCEforms {
                        // JS evaluation:
                $out = $this->JSbottom($this->formName);
 
-
                        // Integrate JS functions for the element browser if such fields or IRRE fields were processed:
                if ($this->printNeededJS['dbFileIcons'] || $this->inline->inlineCount) {
                        $out .= '
index c0730d5..e179cf3 100644 (file)
@@ -3339,7 +3339,6 @@ class t3lib_TCEmain {
                        'sorting DESC'
                );
 
-
                        // Traverse the files found and copy them:
                if (is_array($recs)) {
                        foreach ($recs as $rec) {
index 56c4ee9..2d0d8ac 100644 (file)
@@ -895,7 +895,6 @@ class t3lib_TSparser {
                                $lineC = $this->highLightStyles['linenum'][0] . str_pad($lineNum, 4, ' ', STR_PAD_LEFT) . ':' . $this->highLightStyles['linenum'][1] . ' ' . $lineC;
                        }
 
-
                        $lines[] = $lineC;
                }
 
@@ -903,4 +902,4 @@ class t3lib_TSparser {
        }
 }
 
-?>
+?>
\ No newline at end of file
index eeb4625..51a36a3 100644 (file)
@@ -758,7 +758,6 @@ class t3lib_tsparser_ext extends t3lib_TStemplate {
                                }
                        }
 
-
                }
                $output = implode($cArr, '<br />') . '<br />';
                return $output;
@@ -1404,7 +1403,6 @@ class t3lib_tsparser_ext extends t3lib_TStemplate {
                                                        $defaultTyposcriptStyle = '';
                                                }
 
-
                                                $deleteIconHTML = t3lib_iconWorks::getSpriteIcon(
                                                        'actions-edit-undo',
                                                        array(
index eaeddfc..b7e1fb4 100644 (file)
@@ -85,7 +85,6 @@ class t3lib_tsStyleConfig extends t3lib_tsparser_ext {
                $this->objReg = $this->ext_realValues = $this->flatSetup;
                $this->flatSetup = $temp;
 
-
                foreach ($theConstants as $k => $p) {
                        if (isset($this->objReg[$k])) {
                                $theConstants[$k]['value'] = $this->ext_realValues[$k];
index 84959f7..699f583 100644 (file)
@@ -737,7 +737,6 @@ class t3lib_TStemplate {
                $this->setup['resources'] = $this->resources;
                $this->setup['sitetitle'] = $this->sitetitle;
 
-
                        // ****************************
                        // Parse TypoScript Constants
                        // ****************************
@@ -766,7 +765,6 @@ class t3lib_TStemplate {
                $this->flatSetup = array();
                $this->flattenSetup($constants->setup, '', '');
 
-
                        // ***********************************************
                        // Parse TypoScript Setup (here called "config")
                        // ***********************************************
index 383490f..ece8e82 100644 (file)
@@ -436,7 +436,6 @@ class t3lib_file_Factory implements t3lib_Singleton {
                        throw new InvalidArgumentException('uid of fileusage (sys_file_reference) has to be numeric.', 1300086584);
                }
 
-
                if (!$this->fileReferenceInstances[$uid]) {
                                // Fetches data in case $fileData is empty
                        if (empty($fileReferenceData)) {
index 451b10f..317f0f8 100644 (file)
@@ -88,7 +88,6 @@ class t3lib_file_Service_FileProcessingService {
                        }
                }
 
-
                return $processedFile;
        }
 
index ac55b40..ca5cb1f 100644 (file)
@@ -229,7 +229,6 @@ class t3lib_file_Service_IndexerService implements t3lib_Singleton {
                        // signal before the files are modified
                $this->emitPreGatherFileInformationSignal($file, $fileInfo, $gatherDefaultInformation);
 
-
                        // the check helps you to disable the regular file fetching,
                        // so a signal could actually remotely access the service
                if ($gatherDefaultInformation->getDefaultFileInfo) {
index 60358be..b3d3720 100644 (file)
@@ -611,7 +611,6 @@ class t3lib_file_Storage {
                        return FALSE;
                }
 
-
                $isReadCheck = FALSE;
                if (in_array($action, array('read'))) {
                        $isReadCheck = TRUE;
index a5eccf2..c2285d4 100644 (file)
@@ -134,7 +134,6 @@ class t3lib_TCEforms_Tree {
                        $autoSizeMax = intval($PA['fieldConf']['config']['autoSizeMax']) * 20;
                }
 
-
                $header = FALSE;
                $expanded = FALSE;
                $appearance = $PA['fieldConf']['config']['treeConfig']['appearance'];
index 2cc25d3..a0c3975 100644 (file)
@@ -172,7 +172,6 @@ class t3lib_tree_pagetree_DataProvider extends t3lib_tree_AbstractDataProvider {
                        }
                }
 
-
                foreach ($this->processCollectionHookObjects as $hookObject) {
                        /** @var $hookObject t3lib_tree_pagetree_interfaces_collectionprocessor */
                        $hookObject->postProcessGetNodes($node, $mountPoint, $level, $nodeCollection);
index 8f6b7f3..1dda3b2 100644 (file)
@@ -184,7 +184,6 @@ class SC_alt_db_navframe {
                        // Produce browse-tree:
                $tree = $this->pagetree->getBrowsableTree();
 
-
                        // Outputting Temporary DB mount notice:
                if ($this->active_tempMountPoint) {
                        $flashText = '
@@ -204,7 +203,6 @@ class SC_alt_db_navframe {
                                t3lib_FlashMessage::INFO
                        );
 
-
                        $this->content.= $flashMessage->render();
                }
 
index 1d40fde..1904e8f 100644 (file)
@@ -863,7 +863,6 @@ class SC_alt_doc {
                                        t3lib_iconWorks::getSpriteIcon('actions-document-close') .
                                '</a>';
 
-
                        // DELETE + UNDO buttons:
                if (!$this->errorC && !$GLOBALS['TCA'][$this->firstEl['table']]['ctrl']['readOnly'] && count($this->elementsData) == 1) {
                        if ($this->firstEl['cmd'] != 'new' && t3lib_utility_Math::canBeInterpretedAsInteger($this->firstEl['uid'])) {
@@ -1412,7 +1411,6 @@ class SC_alt_doc {
                        t3lib_BEfunc::setUpdateSignal('tx_opendocs::updateNumber', count($this->docHandler));
                }
 
-
                        // If ->returnEditConf is set, then add the current content of editconf to the ->retUrl variable: (used by other scripts, like wizard_add, to know which records was created or so...)
                if ($this->returnEditConf && $this->retUrl != 'dummy.php') {
                        $this->retUrl.='&returnEditConf='.rawurlencode(serialize($this->editconf));
index ed9dbf2..f04aea7 100644 (file)
@@ -123,7 +123,6 @@ class SC_alt_doc_nodoc {
                $a_wl = $GLOBALS['BE_USER']->check('modules', 'web_list');
                $a_wp = t3lib_extMgm::isLoaded('cms') && $GLOBALS['BE_USER']->check('modules', $pageModule);
 
-
                        // Finding module images: PAGE
                $imgFile = $GLOBALS['LANG']->moduleLabels['tabs_images']['web_layout_tab'];
                $imgInfo = @getimagesize($imgFile);
index c3876ff..33f4c7a 100644 (file)
@@ -1639,7 +1639,6 @@ class browse_links {
                        // Starting content:
                $content = $this->doc->startPage('TBE file selector');
 
-
                        // Init variable:
                $pArr = explode('|', $this->bparams);
 
index 6e6c6e9..9d22426 100644 (file)
@@ -666,7 +666,6 @@ class localRecordList extends recordList {
                        $alttext = t3lib_BEfunc::getRecordIconAltText($row, $table);
                        $iconImg = t3lib_iconWorks::getSpriteIconForRecord($table, $row, array('title' => htmlspecialchars($alttext), 'style' => ($indent ? ' margin-left: ' . $indent . 'px;' : '')));
 
-
                        $theIcon = $this->clickMenuEnabled ? $GLOBALS['SOBE']->doc->wrapClickMenuOnIcon($iconImg, $table, $row['uid']) : $iconImg;
 
                                // Preparing and getting the data-array
@@ -1350,7 +1349,6 @@ class localRecordList extends recordList {
                        }
                }
 
-
                /**
                 * @hook recStatInfoHooks: Allows to insert HTML before record icons on various places
                 * @date 2007-09-22
index 28c6d58..acf60db 100644 (file)
@@ -197,7 +197,6 @@ class fileList extends t3lib_recordList {
                $folders = $storage->getFolderList($this->folderObject->getIdentifier());
                $files = $storage->getFileList($this->folderObject->getIdentifier());
 
-
                        // Only render the contents of a browsable storage
                if ($this->folderObject->getStorage()->isBrowsable()) {
 
@@ -278,7 +277,6 @@ class fileList extends t3lib_recordList {
                                // Files are added
                        $iOut .= $this->formatFileList($files, $titleCol);
 
-
                        // Header line is drawn
                $theData = array();
 
index 65d0dcd..5bcec74 100644 (file)
@@ -206,7 +206,6 @@ class webPageTree extends t3lib_browseTree {
                                        $v['HTML'].
                                        $this->wrapTitle($this->getTitleStr($v['row'], $titleLen), $v['row'], $v['bank'])."</div>\n";
 
-
                        if (!$v['hasSub']) {
                                $itemHTML .= '</li>';
                        }
index 88d739d..cf16964 100644 (file)
@@ -1,4 +1,4 @@
- <?php
+<?php
 /***************************************************************
 *  Copyright notice
 *
index b29b100..f9e5e15 100644 (file)
@@ -58,7 +58,6 @@ class TYPO3Logo {
                }
                $imgInfo = getimagesize(PATH_site . TYPO3_mainDir . $logoFile);
 
-
                $logo = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' .
                                '<img' . t3lib_iconWorks::skinImg('', $logoFile, $imgInfo[3]) . ' title="TYPO3 Content Management System" alt="" />' .
                                '</a>';
index a8d3f62..9e10f40 100644 (file)
@@ -369,7 +369,6 @@ class SC_db_new {
                $this->newPagesInto = (!empty($pageTS['mod.']['wizards.']['newRecord.']['pages.']['show.']['pageInside']) ? 1 : 0);
                $this->newPagesAfter = (!empty($pageTS['mod.']['wizards.']['newRecord.']['pages.']['show.']['pageAfter']) ? 1 : 0);
 
-
                        // Slight spacer from header:
                $this->code .= $halfLine;
 
@@ -450,7 +449,6 @@ class SC_db_new {
                        ';
                }
 
-
                        // New tables (but not pages) INSIDE this pages
                $isAdmin = $GLOBALS['BE_USER']->isAdmin();
                $newContentIcon = t3lib_iconWorks::getSpriteIcon('actions-document-new');
@@ -591,7 +589,6 @@ class SC_db_new {
                        </tr>
                ';
 
-
                        // Make table:
                $this->code .= '
                        <table border="0" cellpadding="0" cellspacing="0" id="typo3-newRecord">
index b3e6563..551192f 100644 (file)
@@ -140,7 +140,6 @@ class SC_file_newfolder {
                $pageContent .= $this->doc->spacer(5);
                $pageContent.=$this->doc->divider(5);
 
-
                $code = '<form action="tce_file.php" method="post" name="editform">';
                        // Making the selector box for the number of concurrent folder-creations
                $this->number = t3lib_utility_Math::forceIntegerInRange($this->number, 1, 10);
index decde66..e0ac856 100644 (file)
@@ -102,7 +102,6 @@ class SC_file_upload {
                $icon = t3lib_iconWorks::getSpriteIcon('apps-filetree-root');
                $this->title = $icon . htmlspecialchars($this->folderObject->getStorage()->getName()) . ': ' . htmlspecialchars($this->folderObject->getIdentifier());
 
-
                        // Setting template object
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->setModuleTemplate('templates/file_upload.html');
@@ -158,7 +157,6 @@ class SC_file_upload {
                        </div>
                        ';
 
-
                        // Produce the number of upload-fields needed:
                $content .= '
                        <div id="c-upload">
index 5e606d5..e0a88d0 100644 (file)
@@ -126,7 +126,6 @@ class SC_index {
                        // Setting the redirect URL to "backend.php" if no alternative input is given
                $this->redirectToURL = ($this->redirect_url ? $this->redirect_url : 'backend.php');
 
-
                        // Do a logout if the command is set
                if ($this->L == 'OUT' && is_object($GLOBALS['BE_USER'])) {
                        $GLOBALS['BE_USER']->logoff();
index 0dc0c1c..e704cc5 100644 (file)
@@ -863,7 +863,6 @@ class template {
 </div>':'') . $this->endOfPageJsBlock;
                }
 
-
                        // Logging: Can't find better place to put it:
                if (TYPO3_DLOG) {
                        t3lib_div::devLog('END of BACKEND session', 'template', 0, array('_FLUSH' => TRUE));
index af2fe0b..b80be08 100644 (file)
@@ -101,7 +101,6 @@ class SC_wizard_colorpicker {
                $this->md5ID = t3lib_div::_GP('md5ID');
                $this->exampleImg = t3lib_div::_GP('exampleImg');
 
-
                        // Resolving image (checking existence etc.)
                $this->imageError = '';
                if ($this->exampleImg) {
index 352a7b5..df8cb14 100644 (file)
@@ -411,7 +411,6 @@ class SC_wizard_forms {
                                                // Render title/field preview COLUMN
                                        $cells[] = $confData['type'] != 'hidden' ? '<strong>'.htmlspecialchars($confData['label']).'</strong>' : '';
 
-
                                                // Render general type/title COLUMN:
                                        $temp_cells = array();
 
@@ -442,7 +441,6 @@ class SC_wizard_forms {
                                                // Put sub-items together into table cell:
                                        $cells[] = $this->formatCells($temp_cells);
 
-
                                                // Render specific field configuration COLUMN:
                                        $temp_cells = array();
 
index c10a9e8..7bb35a3 100644 (file)
@@ -176,7 +176,6 @@ class SC_wizard_rte {
                                                <input type="hidden" name="_serialNumber" value="'.md5(microtime()).'" />' .
                                                t3lib_TCEforms::getHiddenTokenField('tceAction');
 
-
                                // Finally, add the whole setup:
                        $this->content.=
                                $tceforms->printNeededJSFunctions_top().
index f3ac125..b3ea905 100644 (file)
@@ -233,7 +233,6 @@ class SC_wizard_tsconfig {
                        }
                ');
 
-
                        // Start the page:
                $this->content .= $this->doc->startPage($GLOBALS['LANG']->getLL('tsprop'));
        }
@@ -322,7 +321,6 @@ class SC_wizard_tsconfig {
                        }
                }
 
-
                        // SECTION: Showing property tree:
                $tmpl = t3lib_div::makeInstance('ext_TSparser');
                        // Do not log time-performance information