diff --git a/typo3/Bootstrap.php b/typo3/Bootstrap.php
index 151965e1bc2ae5ed924b085a565a5d4250f65122..dd9e79b142cf460ac4f8301f2457b07d3ff01656 100644
--- a/typo3/Bootstrap.php
+++ b/typo3/Bootstrap.php
@@ -271,14 +271,14 @@ class Typo3_Bootstrap {
 			if ($GLOBALS['TYPO3_CONF_VARS']['BE']['lockSSL'] == 3) {
 				$requestStr = substr(t3lib_div::getIndpEnv('TYPO3_REQUEST_SCRIPT'), strlen(t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir));
 				if ($requestStr === 'index.php' && !t3lib_div::getIndpEnv('TYPO3_SSL')) {
-					list(,$url) = explode('://', t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'), 2);
+					list(, $url) = explode('://', t3lib_div::getIndpEnv('TYPO3_REQUEST_URL'), 2);
 					list($server, $address) = explode('/', $url, 2);
 					header('Location: https://' . $server . $sslPortSuffix . '/' . $address);
 					exit;
 				}
 			} elseif (!t3lib_div::getIndpEnv('TYPO3_SSL')) {
 				if (intval($GLOBALS['TYPO3_CONF_VARS']['BE']['lockSSL']) === 2) {
-					list(,$url) = explode('://', t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir, 2);
+					list(, $url) = explode('://', t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir, 2);
 					list($server, $address) = explode('/', $url, 2);
 					header('Location: https://' . $server . $sslPortSuffix . '/' . $address);
 				} else {
diff --git a/typo3/alt_clickmenu.php b/typo3/alt_clickmenu.php
index ff1a0d1f89d51142600624f79a6d0fcea85438c9..85227800e6922eea583b07a18038db619d43a282 100644
--- a/typo3/alt_clickmenu.php
+++ b/typo3/alt_clickmenu.php
@@ -913,7 +913,7 @@ class clickMenu {
 		$editOnClick = 'if(' . $loc . '){' . $loc . ".location.href=top.TS.PATH_typo3+'".$script.'?target=' . rawurlencode($path) . ($noReturnUrl ? "'" : "&returnUrl='+top.rawurlencode(" . $this->frameLocation($loc . '.document') . '.pathname+' . $this->frameLocation($loc . '.document') . '.search)') . ';}';
 		return $this->linkItem(
 			$this->label($type),
-			$this->excludeIcon('<img'.t3lib_iconWorks::skinImg($this->PH_backPath,'gfx/'.$image, 'width="12" height="12"').' alt="" />'),
+			$this->excludeIcon('<img' . t3lib_iconWorks::skinImg($this->PH_backPath, 'gfx/' . $image, 'width="12" height="12"') . ' alt="" />'),
 			$editOnClick . 'top.nav.refresh();return hideCM();'
 		);
 	}
@@ -936,7 +936,7 @@ class clickMenu {
 
 			return $this->linkItem(
 				$this->label($type),
-				$this->excludeIcon('<img'.t3lib_iconWorks::skinImg($this->PH_backPath,'gfx/'.$image, 'width="12" height="12"').' alt="" />'),
+				$this->excludeIcon('<img' . t3lib_iconWorks::skinImg($this->PH_backPath, 'gfx/' . $image, 'width="12" height="12"') . ' alt="" />'),
 				$editOnClick . 'return hideCM();'
 				);
 		} else {
@@ -1167,10 +1167,10 @@ class clickMenu {
 					<tr>
 
 							<!-- Items: -->
-						<td class="c-item">'.
+						<td class="c-item">' .
 							implode('</td>
-						<td><img'.t3lib_iconWorks::skinImg($this->PH_backPath, 'gfx/acm_spacer2.gif', 'width="8" height="12"').' alt="" /></td>
-						<td class="c-item">',$this->menuItemsForTopFrame($menuItems)).
+						<td><img' . t3lib_iconWorks::skinImg($this->PH_backPath, 'gfx/acm_spacer2.gif', 'width="8" height="12"') . ' alt="" /></td>
+						<td class="c-item">', $this->menuItemsForTopFrame($menuItems)) .
 						'</td>
 
 							<!-- Close button: -->
diff --git a/typo3/alt_doc.php b/typo3/alt_doc.php
index 24c776356336458de1785d1e3a5345091705b315..c9cb99f91b14fdbe66451a9dad4ac5129defaf56 100644
--- a/typo3/alt_doc.php
+++ b/typo3/alt_doc.php
@@ -868,7 +868,7 @@ class SC_alt_doc {
 			if ($this->firstEl['cmd'] != 'new' && t3lib_utility_Math::canBeInterpretedAsInteger($this->firstEl['uid'])) {
 
 					// Delete:
-				if ($this->firstEl['deleteAccess'] && !$GLOBALS['TCA'][$this->firstEl['table']]['ctrl']['readOnly'] && !$this->getNewIconMode($this->firstEl['table'],'disableDelete')) {
+				if ($this->firstEl['deleteAccess'] && !$GLOBALS['TCA'][$this->firstEl['table']]['ctrl']['readOnly'] && !$this->getNewIconMode($this->firstEl['table'], 'disableDelete')) {
 					$aOnClick = 'return deleteRecord(\''.$this->firstEl['table'].'\',\''.$this->firstEl['uid'].'\', unescape(\''.rawurlencode($this->retUrl).'\'));';
 					$buttons['delete'] = '<a href="#" onclick="' . htmlspecialchars($aOnClick) . '" title="' . $GLOBALS['LANG']->getLL('deleteItem', TRUE) . '">' .
 							t3lib_iconWorks::getSpriteIcon('actions-edit-delete') .
@@ -1000,7 +1000,7 @@ class SC_alt_doc {
 		if ($this->returnUrl == 'close.html' || !$GLOBALS['BE_USER']->mayMakeShortcut()) {
 			return '';
 		}
-		return $this->doc->makeShortcutIcon('returnUrl,edit,defVals,overrideVals,columnsOnly,returnNewPageId,editRegularContentFromId,disHelp,noView',implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name'], 1);
+		return $this->doc->makeShortcutIcon('returnUrl,edit,defVals,overrideVals,columnsOnly,returnNewPageId,editRegularContentFromId,disHelp,noView', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name'], 1);
 	}
 
 	/**
diff --git a/typo3/alt_shortcut.php b/typo3/alt_shortcut.php
index 64d7e50e923a1b26bdcda7f19e2513cc3323ab73..79c8eb80cdb15955a4ed84aefb864ab7d99fa6f2 100644
--- a/typo3/alt_shortcut.php
+++ b/typo3/alt_shortcut.php
@@ -383,7 +383,7 @@ class SC_alt_shortcut {
 		if (!$this->editLoaded && t3lib_extMgm::isLoaded('cms')) {
 				$editIdCode = '<td nowrap="nowrap">'.$GLOBALS['LANG']->getLL('bookmark_editID', 1).': <input type="text" value="'.($this->editError?htmlspecialchars($this->editPage):'').'" name="editPage"'.$this->doc->formWidth(15).' onchange="submitEditPage(this.value);" />'.
 					($this->editError?'&nbsp;<strong><span class="typo3-red">'.htmlspecialchars($this->editError).'</span></strong>':'').
-					(is_array($this->theEditRec)?'&nbsp;<strong>'.$GLOBALS['LANG']->getLL('bookmark_loadEdit', 1).' \''.t3lib_BEfunc::getRecordTitle('pages', $this->theEditRec,TRUE).'\'</strong> ('.htmlspecialchars($this->editPath).')':'').
+					(is_array($this->theEditRec) ? '&nbsp;<strong>' . $GLOBALS['LANG']->getLL('bookmark_loadEdit', 1) . ' \'' . t3lib_BEfunc::getRecordTitle('pages', $this->theEditRec, TRUE) . '\'</strong> (' . htmlspecialchars($this->editPath) . ')' : '') .
 					($this->searchFor?'&nbsp;'.$GLOBALS['LANG']->getLL('bookmark_searchFor', 1).' <strong>\''.htmlspecialchars($this->searchFor).'\'</strong>':'').
 					'</td>';
 		} else $editIdCode = '';
diff --git a/typo3/class.browse_links.php b/typo3/class.browse_links.php
index 476724b9e36efbf435d08ab8349bb2644f5ce78a..ef93e7fe6d550693c36cbd321819cb00e53cdfc1 100644
--- a/typo3/class.browse_links.php
+++ b/typo3/class.browse_links.php
@@ -603,7 +603,7 @@ class browse_links {
 	 * 6: IRRE uniqueness: name of function in opener window that performs some additional(!) action, eg. "inline.setUniqueElement"
 	 * 7: IRRE uniqueness: name of function in opener window that performs action instead of using addElement/insertElement, eg. "inline.importElement"
 	 *
-	 * $pArr = explode('|',$this->bparams);
+	 * $pArr = explode('|', $this->bparams);
 	 * $formFieldName = $pArr[0];
 	 * $allowedTablesOrFileTypes = $pArr[3];
 	 */
@@ -1178,7 +1178,7 @@ class browse_links {
 			// Initializing the action value, possibly removing blinded values etc:
 		$allowedItems = array_diff(
 			explode(',', 'page,file,folder,url,mail,spec'),
-			t3lib_div::trimExplode(',', $this->thisConfig['blindLinkOptions'],1)
+			t3lib_div::trimExplode(',', $this->thisConfig['blindLinkOptions'], 1)
 		);
 		$allowedItems = array_diff(
 			$allowedItems,
@@ -1381,7 +1381,14 @@ class browse_links {
 								// Adding link to menu of user defined links:
 							$subcats[$k2i] = '
 								<tr>
-									<td class="bgColor4">'.$A[0].'<strong>'.htmlspecialchars($title).($this->curUrlInfo['info']==$v[$k2i.'.']['url']?'<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/blinkarrow_right.gif','width="5" height="9"').' class="c-blinkArrowR" alt="" />':'').'</strong><br />'.$description.$A[1].'</td>
+									<td class="bgColor4">' .
+									$A[0] .
+									'<strong>' .
+									htmlspecialchars($title) . ($this->curUrlInfo['info'] == $v[$k2i . '.']['url'] ? '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/blinkarrow_right.gif', 'width="5" height="9"') . ' class="c-blinkArrowR" alt="" />' : '') .
+									'</strong><br />' .
+									$description .
+									$A[1] .
+									'</td>
 								</tr>';
 						}
 					}
@@ -2101,7 +2108,7 @@ class browse_links {
 				}
 
 					// Put it all together for the file element:
-				$out.='<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/ol/join'.($c == $totalItems ?'bottom':'').'.gif','width="18" height="16"').' alt="" />'.
+				$out .= '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/ol/join' . ($c == $totalItems ? 'bottom' : '') . '.gif', 'width="18" height="16"') . ' alt="" />' .
 						$arrCol.
 						'<a href="#" onclick="return link_folder(\'' . $itemUid . '\');">'.
 						$icon.
@@ -2242,7 +2249,7 @@ class browse_links {
 						<tr class="file_list_normal">
 							<td nowrap="nowrap">'.$filenameAndIcon.'&nbsp;</td>
 							<td>' . $ATag . '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/plusbullet2.gif', 'width="18" height="16"') . ' title="' . $GLOBALS['LANG']->getLL('addToList', 1) . '" alt="" />' . $ATag_e . '</td>
-							<td nowrap="nowrap">' . ($ATag2 . '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/zoom2.gif','width="12" height="12"') . ' title="' . $GLOBALS['LANG']->getLL('info', 1) . '" alt="" /> ' . $GLOBALS['LANG']->getLL('info', 1) . $ATag2_e) . '</td>
+							<td nowrap="nowrap">' . ($ATag2 . '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/zoom2.gif', 'width="12" height="12"') . ' title="' . $GLOBALS['LANG']->getLL('info', 1) . '" alt="" /> ' . $GLOBALS['LANG']->getLL('info', 1) . $ATag2_e) . '</td>
 							<td>&nbsp;</td>
 						</tr>';
 				}
@@ -2275,7 +2282,7 @@ class browse_links {
 
 			// Create headline (showing number of folders):
 		$content .= $this->barheader(
-			sprintf($GLOBALS['LANG']->getLL('folders').' (%s):',count($folders))
+			sprintf($GLOBALS['LANG']->getLL('folders') . ' (%s):', count($folders))
 		);
 
 		$titleLength = intval($GLOBALS['BE_USER']->uc['titleLen']);
@@ -2297,7 +2304,7 @@ class browse_links {
 			$folderIcon = $aTag_alt;
 			$folderIcon .= '<img'.t3lib_iconWorks::skinImg(
 				$GLOBALS['BACK_PATH'],
-				'gfx/i/_icon_webfolders.gif','width="18" height="16"'
+				'gfx/i/_icon_webfolders.gif', 'width="18" height="16"'
 			).' alt="" />';
 			$folderIcon .= htmlspecialchars(
 				t3lib_div::fixed_lgd_cs(basename($baseFolder), $titleLength)
@@ -2316,7 +2323,7 @@ class browse_links {
 					$pathInfo = pathinfo($folderPath);
 
 						// Create folder icon:
-					$icon = '<img src="clear.gif" width="16" height="16" alt="" /><img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/i/_icon_webfolders.gif','width="16" height="16"').' title="'.htmlspecialchars($pathInfo['basename'].$size).'" class="absmiddle" alt="" />';
+					$icon = '<img src="clear.gif" width="16" height="16" alt="" /><img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/i/_icon_webfolders.gif', 'width="16" height="16"') . ' title="' . htmlspecialchars($pathInfo['basename'] . $size) . '" class="absmiddle" alt="" />';
 
 						// Create links for adding the folder:
 					if ($this->P['itemName'] != '' && $this->P['formName'] != '') {
diff --git a/typo3/class.show_rechis.inc b/typo3/class.show_rechis.inc
index 69f66db244cb9815e54acacf85b01a88238ac789..30d6f76f3ad2355ad6e3ea938279c283798b2287 100644
--- a/typo3/class.show_rechis.inc
+++ b/typo3/class.show_rechis.inc
@@ -234,7 +234,7 @@ class recordHistory {
 		}
 
 			// Removing fields:
-		$data = $this->removeFilefields($rollbackData[0],$data);
+		$data = $this->removeFilefields($rollbackData[0], $data);
 
 			// Writes the data:
 		$tce = t3lib_div::makeInstance('t3lib_TCEmain');
@@ -315,7 +315,7 @@ class recordHistory {
 			$displayCode .= '<tr><td>' . $GLOBALS['LANG']->getLL($key, 1) . '</td>';
 			$displayCode .= '<td><select name="settings[' . $key . ']" onChange="document.settings.submit()" style="width:100px">';
 			foreach ($values as $singleKey => $singleVal) {
-				$caption = $GLOBALS['LANG']->getLL($singleVal,1)?$GLOBALS['LANG']->getLL($singleVal,1):$singleVal;
+				$caption = ($GLOBALS['LANG']->getLL($singleVal, 1) ? $GLOBALS['LANG']->getLL($singleVal, 1) : $singleVal);
 				$displayCode .= '<option value="' . $singleKey . '"' . (($singleKey == $currentSelection[$key]) ? ' selected="selected"' : '').'> ' . $caption . '</option>';
 			}
 			$displayCode .= '</select></td></tr>';
@@ -337,7 +337,7 @@ class recordHistory {
 		$elParts = explode(':', $this->element);
 		if ($elParts[0] != 'pages') {
 			$content .= '<strong>' . $GLOBALS['LANG']->getLL('elementHistory', 1) . '</strong><br />';
-			$pid = t3lib_BEfunc::getRecordRaw($elParts[0],'uid='.intval($elParts[1]));
+			$pid = t3lib_BEfunc::getRecordRaw($elParts[0], 'uid=' . intval($elParts[1]));
 			$content .= $this->linkPage($GLOBALS['LANG']->getLL('elementHistory_link', 1), array('element' => 'pages:' . $pid['pid']));
 		}
 		$content .= '<form name="settings" action="' . t3lib_div::getIndpEnv('TYPO3_REQUEST_URL') . '" method="post"><table>' . $displayCode . '</table></form>';
@@ -372,7 +372,7 @@ class recordHistory {
 		} else {
 			$pid = $elParts[1];
 		}
-		$tmpTsConfig = $GLOBALS['BE_USER']->getTSConfig('TCEMAIN',t3lib_BEfunc::getPagesTSconfig($pid));
+		$tmpTsConfig = $GLOBALS['BE_USER']->getTSConfig('TCEMAIN', t3lib_BEfunc::getPagesTSconfig($pid));
 		$expirationTime = isset($tmpTsConfig['properties']['default.']['history.']['maxAgeDays']) ?
 				$tmpTsConfig['properties']['default.']['history.']['maxAgeDays'] : 30;
 
@@ -442,7 +442,7 @@ class recordHistory {
 					}
 					$singleLine[] = htmlspecialchars(implode(',', $tmpFieldList));
 				} else {	// Display diff
-					$diff = $this->renderDiff($entry,$entry['tablename']);
+					$diff = $this->renderDiff($entry, $entry['tablename']);
 					$singleLine[] = $diff;
 				}
 			}
@@ -454,7 +454,7 @@ class recordHistory {
 				} else {
 					$image = '<img' . t3lib_iconWorks::skinImg('', 'gfx/markstate.gif') . ' align="top" alt="' . $GLOBALS['LANG']->getLL('markState', 1) . '" title="' . $GLOBALS['LANG']->getLL('markState', 1) . '" />';
 				}
-				$singleLine[] = $this->linkPage($image,array('highlight' => $entry['uid']));
+				$singleLine[] = $this->linkPage($image, array('highlight' => $entry['uid']));
 			} else {
 				$singleLine[] = '';
 			}
@@ -503,7 +503,7 @@ class recordHistory {
 		$content = '';
 
 			// Get all array keys needed
-		$arrayKeys = array_merge(array_keys($diff['newData']),array_keys($diff['insertsDeletes']), array_keys($diff['oldData']));
+		$arrayKeys = array_merge(array_keys($diff['newData']), array_keys($diff['insertsDeletes']), array_keys($diff['oldData']));
 		$arrayKeys = array_unique($arrayKeys);
 
 		if ($arrayKeys) {
diff --git a/typo3/class.webpagetree.php b/typo3/class.webpagetree.php
index 2c18ff03c145f7cdfd0b688580b2764cc3f8a1ec..dc6552c589e130dc737716a5c4a81b14d664d492 100644
--- a/typo3/class.webpagetree.php
+++ b/typo3/class.webpagetree.php
@@ -355,7 +355,7 @@ class webPageTree extends t3lib_browseTree {
 			$cmd = $this->bank . '_' . ($isOpen? '0_' : '1_') . $uid . '_' . $this->treeName;
 				// only, if not for uid 0
 			if ($uid) {
-				$icon = '<img' . t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/' . ($isOpen ? 'minus' :'plus' ) . 'only.gif') . ' alt="" />';
+				$icon = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/ol/' . ($isOpen ? 'minus' : 'plus' ) . 'only.gif') . ' alt="" />';
 				$firstHtml = $this->PMiconATagWrap($icon, $cmd, !$isOpen);
 			}
 
diff --git a/typo3/show_item.php b/typo3/show_item.php
index 4668da5200017de8b61eb6b79690dee1895c514f..93815918f1d3ace035fbf496f927da5fdcbcd69e 100644
--- a/typo3/show_item.php
+++ b/typo3/show_item.php
@@ -81,7 +81,7 @@ class transferData extends t3lib_transferData	{
 					$content = '';
 					break;
 				}
-				if (t3lib_div::inList($config['eval'],'date')) {
+				if (t3lib_div::inList($config['eval'], 'date')) {
 					$content = Date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'], $content);
 				}
 			break;
diff --git a/typo3/template.php b/typo3/template.php
index 0cdeeafb3cb8cc91af5f3688135be065d631d828..f9d67b312100b37e378bcb0f94e6ab6bd3590379 100644
--- a/typo3/template.php
+++ b/typo3/template.php
@@ -182,7 +182,7 @@ class template {
 			$this->scriptID = 'typo3/'.substr($this->scriptID, strlen(TYPO3_mainDir));	// This fixes if TYPO3_mainDir has been changed so the script ids are STILL "typo3/..."
 		}
 
-		$this->bodyTagId = preg_replace('/[^A-Za-z0-9-]/','-', $this->scriptID);
+		$this->bodyTagId = preg_replace('/[^A-Za-z0-9-]/', '-', $this->scriptID);
 
 			// Individual configuration per script? If so, make a recursive merge of the arrays:
 		if (is_array($GLOBALS['TBE_STYLES']['scriptIDindex'][$this->scriptID])) {
diff --git a/typo3/view_help.php b/typo3/view_help.php
index 1041e20c43255bd99f7e7aa3e5fd783cee3cc048..5ce08d7b5ce6d6b7f7fd5135eb48f62c200c5272 100644
--- a/typo3/view_help.php
+++ b/typo3/view_help.php
@@ -320,7 +320,7 @@ class SC_view_help {
 
 
 				<!-- NEW SECTION: -->
-				',$outputSections);
+				', $outputSections);
 		}
 
 		$output .= '<hr /><p class="manual-title">'.t3lib_BEfunc::TYPO3_copyRightNotice().'</p>';
@@ -379,8 +379,8 @@ class SC_view_help {
 				$output.='
 					<li>'.$GLOBALS['LANG']->getLL('TOC_'.$tocKey, 1).'
 						<ul>
-							<li>'.implode('</li>
-							<li>',$tocArray[$tocKey]).'</li>
+							<li>' . implode('</li>
+							<li>', $tocArray[$tocKey]) . '</li>
 						</ul>
 					</li>';
 			}
diff --git a/typo3/wizard_colorpicker.php b/typo3/wizard_colorpicker.php
index 81e0c2ed70002925a8897e4705fe4dbbfd608869..5e25ec1cb1c9ad31fb0334f7c2816a51e1a5605b 100644
--- a/typo3/wizard_colorpicker.php
+++ b/typo3/wizard_colorpicker.php
@@ -345,8 +345,8 @@ class SC_wizard_colorpicker {
 		$output = '
 			<p class="c-head">'.$GLOBALS['LANG']->getLL('colorpicker_fromList', 1).'</p>
 			<select onchange="document.colorform.colorValue.value = this.options[this.selectedIndex].value; document.colorform.submit(); return false;">
-				'.implode('
-				',$opt).'
+				' . implode('
+				', $opt) . '
 			</select><br />';
 
 		return $output;
diff --git a/typo3/wizard_forms.php b/typo3/wizard_forms.php
index d1cdf9013e8f2b6bf7e0388271eb0706d373216e..d9fdc4d13c6e6056c2edebb04243701a9b29048b 100644
--- a/typo3/wizard_forms.php
+++ b/typo3/wizard_forms.php
@@ -413,8 +413,8 @@ class SC_wizard_forms {
 		$tRows[]='
 			<tr class="bgColor2" id="typo3-formWizardHeader">
 				<td>&nbsp;</td>
-				<td>'.implode('</td>
-				<td>',$cells).'</td>
+				<td>' . implode('</td>
+				<td>', $cells) . '</td>
 			</tr>';
 
 			// Traverse the number of form elements:
@@ -449,8 +449,8 @@ class SC_wizard_forms {
 					}
 					$temp_cells[$GLOBALS['LANG']->getLL('forms_type')]='
 							<select name="FORMCFG[c]['.(($k+1)*2).'][type]">
-								'.implode('
-								',$opt).'
+								' . implode('
+								', $opt) . '
 							</select>';
 
 						// Title field:
@@ -547,10 +547,10 @@ class SC_wizard_forms {
 						// Finally, put together the full row from the generated content above:
 					$bgC = $confData['type']?' class="bgColor5"':'';
 					$tRows[]='
-						<tr'.$bgC.'>
-							<td><a name="ANC_'.(($k+1)*2).'"></a>'.$ctrl.'</td>
-							<td class="bgColor4">'.implode('</td>
-							<td valign="top">',$cells).'</td>
+						<tr' . $bgC . '>
+							<td><a name="ANC_' . (($k + 1) * 2) . '"></a>' . $ctrl . '</td>
+							<td class="bgColor4">' . implode('</td>
+							<td valign="top">', $cells) . '</td>
 						</tr>';
 				}
 			} else {
diff --git a/typo3/wizard_list.php b/typo3/wizard_list.php
index e0aedb34431a11cd2d95cfcbc660ab37f9070b19..921248387e13d9cd841803b1c6211ce906a1c470 100644
--- a/typo3/wizard_list.php
+++ b/typo3/wizard_list.php
@@ -97,7 +97,7 @@ class SC_wizard_list {
 		$TSconfig = t3lib_BEfunc::getTCEFORM_TSconfig($this->table, is_array($origRow)?$origRow:array('pid'=>$this->P['pid']));
 
 			// Set [params][pid]
-		if (substr($this->P['params']['pid'],0,3)=='###' && substr($this->P['params']['pid'], -3)=='###') {
+		if (substr($this->P['params']['pid'], 0, 3) == '###' && substr($this->P['params']['pid'], -3) == '###') {
 			$this->pid = intval($TSconfig['_'.substr($this->P['params']['pid'], 3, -3)]);
 		} else $this->pid = intval($this->P['params']['pid']);
 
diff --git a/typo3/wizard_rte.php b/typo3/wizard_rte.php
index 31d87b6e18d0e87aa0436ce858b0f6977e2d0fe3..da71ce58fc960d2716752037c9b37c2fbc9a0d68 100644
--- a/typo3/wizard_rte.php
+++ b/typo3/wizard_rte.php
@@ -190,7 +190,7 @@ class SC_wizard_rte {
 				$tceforms->printNeededJSFunctions();
 		} else {
 				// ERROR:
-			$this->content.=$this->doc->section($GLOBALS['LANG']->getLL('forms_title'), '<span class="typo3-red">'.$GLOBALS['LANG']->getLL('table_noData',1).'</span>', 0, 1);
+			$this->content .= $this->doc->section($GLOBALS['LANG']->getLL('forms_title'), '<span class="typo3-red">' . $GLOBALS['LANG']->getLL('table_noData', 1) . '</span>', 0, 1);
 		}
 
 		// Setting up the buttons and markers for docheader
diff --git a/typo3/wizard_table.php b/typo3/wizard_table.php
index d5a123c2318c8ca1ec2fdc93c0bac46177a58dde..23a60ab50382356b66d091f6d3a4abca6aa165b0 100644
--- a/typo3/wizard_table.php
+++ b/typo3/wizard_table.php
@@ -139,7 +139,7 @@ class SC_wizard_table {
 		if ($this->P['table'] && $this->P['field'] && $this->P['uid']) {
 			$this->content.= $this->doc->section($GLOBALS['LANG']->getLL('table_title'), $this->tableWizard(), 0, 1);
 		} else {
-			$this->content.= $this->doc->section($GLOBALS['LANG']->getLL('table_title'), '<span class="typo3-red">' . $GLOBALS['LANG']->getLL('table_noData',1) . '</span>', 0, 1);
+			$this->content .= $this->doc->section($GLOBALS['LANG']->getLL('table_title'), '<span class="typo3-red">' . $GLOBALS['LANG']->getLL('table_noData', 1) . '</span>', 0, 1);
 		}
 
 		// Setting up the buttons and markers for docheader
@@ -365,8 +365,8 @@ class SC_wizard_table {
 				$tRows[]='
 					<tr class="bgColor4">
 						<td class="bgColor5"><a name="ANC_'.(($k+1)*2).'"></a><span class="c-wizButtonsV">'.$ctrl.'</span></td>
-						<td>'.implode('</td>
-						<td>',$cells).'</td>
+						<td>' . implode('</td>
+						<td>', $cells) . '</td>
 					</tr>';
 
 					// Increment counter:
@@ -407,8 +407,8 @@ class SC_wizard_table {
 			}
 			$tRows[]='
 				<tr class="bgColor5">
-					<td align="center">'.implode('</td>
-					<td align="center">',$cells).'</td>
+					<td align="center">' . implode('</td>
+					<td align="center">', $cells) . '</td>
 				</tr>';
 		}
 
diff --git a/typo3/wizard_tsconfig.php b/typo3/wizard_tsconfig.php
index dfcb4b19951e48c2595144781d50cb1445bdcd41..1aff71056542f0a4ce38f6af9b836255e0b37131 100644
--- a/typo3/wizard_tsconfig.php
+++ b/typo3/wizard_tsconfig.php
@@ -263,16 +263,16 @@ class SC_wizard_tsconfig {
 		$this->content.=$this->doc->section($GLOBALS['LANG']->getLL('tsprop'), $this->browseTSprop($this->mode, $this->show), 0, 1);
 
 			// Adding link to TSref:
-		if ($this->mode=='tsref') {
-			$this->content.=$this->doc->section($GLOBALS['LANG']->getLL('tsprop_TSref'),'
-			<a href="'. TYPO3_URL_DOCUMENTATION_TSREF.'" target="_blank">'.$GLOBALS['LANG']->getLL('tsprop_TSref', 1).'</a>
-			',0,1);
+		if ($this->mode == 'tsref') {
+			$this->content .= $this->doc->section($GLOBALS['LANG']->getLL('tsprop_TSref'), '
+			<a href="' . TYPO3_URL_DOCUMENTATION_TSREF . '" target="_blank">' . $GLOBALS['LANG']->getLL('tsprop_TSref', 1) . '</a>
+			', 0, 1);
 		}
 			// Adding link to admin guides etc:
-		if ($this->mode=='page' || $this->mode=='beuser') {
-			$this->content.=$this->doc->section($GLOBALS['LANG']->getLL('tsprop_tsconfig'),'
+		if ($this->mode == 'page' || $this->mode == 'beuser') {
+			$this->content .= $this->doc->section($GLOBALS['LANG']->getLL('tsprop_tsconfig'), '
 			<a href="' . TYPO3_URL_DOCUMENTATION_TSCONFIG . '" target="_blank">' . $GLOBALS['LANG']->getLL('tsprop_tsconfig', 1) . '</a>
-			',0,1);
+			', 0, 1);
 		}
 	}
 
@@ -518,7 +518,7 @@ class SC_wizard_tsconfig {
 				$reg=array();
 				preg_match('/->[[:alnum:]_]*/', $dataType, $reg);
 				if ($reg[0] && is_array($objTree[$reg[0]])) {
-					$dataType = str_replace($reg[0],'<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('show'=>$objTree[$reg[0]][0]['uid'], 'objString'=>$objString.'.'.$lP[0]))).'">'.htmlspecialchars($reg[0]).'</a>', $dataType);
+					$dataType = str_replace($reg[0], '<a href="' . htmlspecialchars(t3lib_div::linkThisScript(array('show' => $objTree[$reg[0]][0]['uid'], 'objString' => $objString . '.' . $lP[0]))) . '">' . htmlspecialchars($reg[0]) . '</a>', $dataType);
 				}
 
 					// stdWrap