Index: typo3/mod/tools/em/class.em_index.php
===================================================================
--- typo3/mod/tools/em/class.em_index.php	(revision 6395)
+++ typo3/mod/tools/em/class.em_index.php	(working copy)
@@ -400,7 +400,7 @@
 
 			// Setting GPvars:
 		$this->CMD = is_array(t3lib_div::_GP('CMD')) ? t3lib_div::_GP('CMD') : array();
-		$this->lookUpStr = trim(t3lib_div::_GP('_lookUp'));
+		$this->lookUpStr = trim(t3lib_div::_GP('lookUp'));
 		$this->listRemote = t3lib_div::_GP('ter_connect');
 		$this->listRemote_search = trim(t3lib_div::_GP('ter_search'));
 
@@ -608,7 +608,7 @@
 				$menu.='&nbsp;&nbsp;<label for="checkDisplayObsolete">' . $GLOBALS['LANG']->getLL('show_obsolete') . '</label>&nbsp;&nbsp;' . t3lib_BEfunc::getFuncCheck(0, 'SET[display_obsolete]', $this->MOD_SETTINGS['display_obsolete'], '', '', 'id="checkDisplayObsolete"');
 			}
 
-			$this->content.=$this->doc->section('','<form action="index.php" method="post" name="pageform"><span class="nobr">'.$menu.'</span></form>');
+			$this->content.=$this->doc->section('','<form action="index.php" method="post" name="pageform"><span class="nobr">' . ($menu ? $menu : '&nbsp;') . '</span></form>');
 			$this->content.=$this->doc->spacer(10);
 
 			switch((string)$this->MOD_SETTINGS['function'])	{
@@ -684,7 +684,7 @@
 		if(!$this->CMD['showExt'] && !$this->CMD['requestInstallExtensions'] && !$this->CMD['importExt'] && !$this->CMD['uploadExt'] && !$this->CMD['importExtInfo']) {
 			$funcMenu = t3lib_BEfunc::getFuncMenu(0, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']);
 		} elseif($this->CMD['showExt'] && (!$this->CMD['standAlone'] && !t3lib_div::_GP('standAlone'))) {
-			$funcMenu = t3lib_BEfunc::getFuncMenu(0, 'SET[singleDetails]', $this->MOD_SETTINGS['singleDetails'], $this->MOD_MENU['singleDetails'], '', '&CMD[showExt]=' . $this->CMD['showExt']);
+			$funcMenu = t3lib_BEfunc::getFuncMenu(0, 'SET[singleDetails]', $this->MOD_SETTINGS['singleDetails'], $this->MOD_MENU['singleDetails'], '', '&amp;CMD[showExt]=' . $this->CMD['showExt']);
 		}
 		return $funcMenu;
 	}
@@ -758,7 +758,7 @@
 						if (in_array($extKey, $this->requiredExt))	{
 							$loadUnloadLink = '<strong>' . $GLOBALS['TBE_TEMPLATE']->rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '</strong>';
 						} else {
-							$loadUnloadLink = '<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&CMD[remove]=1').'">'.$this->removeButton().'</a>';
+							$loadUnloadLink = '<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&amp;CMD[remove]=1').'">'.$this->removeButton().'</a>';
 						}
 
 						$extensions[] = $this->extensionListRow($extKey,$list[$extKey],array('<td class="bgColor">'.$loadUnloadLink.'</td>'));
@@ -766,7 +766,7 @@
 				}
 				if(count($extensions)) {
 					$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><br /></td></tr>';
-					$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/i/sysf.gif"', 'width="18" height="16"').' align="top" alt="" /><strong>'.$this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName).'</strong></td></tr>';
+					$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/i/sysf.gif', 'width="18" height="16"').' align="top" alt="" /><strong>'.$this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName).'</strong></td></tr>';
 					$lines[] = implode(chr(10),$extensions);
 				}
 			}
@@ -774,7 +774,7 @@
 
 		$content.= t3lib_BEfunc::cshItem('_MOD_tools_em', 'loaded', $GLOBALS['BACK_PATH'],'');
 		$content.= '<form action="index.php" method="post" name="lookupform">';
-		$content.= '<label for="_lookUp">' . $GLOBALS['LANG']->getLL('look_up') . '</label> <input type="text" id="_lookUp" name="_lookUp" value="' . htmlspecialchars($this->lookUpStr) . '" /><input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:search') . '" /><br /><br />';
+		$content.= '<label for="lookUp">' . $GLOBALS['LANG']->getLL('look_up') . '</label> <input type="text" id="lookUp" name="lookUp" value="' . htmlspecialchars($this->lookUpStr) . '" /><input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:search') . '" /><br /><br />';
 
 		$content.= '</form>
 
@@ -816,8 +816,8 @@
 							($list[$extKey]['EM_CONF']['state']!='obsolete' || $this->MOD_SETTINGS['display_obsolete'])
 					 && $this->searchExtension($extKey,$list[$extKey]))	{
 						$loadUnloadLink = t3lib_extMgm::isLoaded($extKey)?
-						'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&CMD[remove]=1&CMD[clrCmd]=1&SET[singleDetails]=info').'">'.$this->removeButton().'</a>':
-						'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&CMD[load]=1&CMD[clrCmd]=1&SET[singleDetails]=info').'">'.$this->installButton().'</a>';
+						'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&amp;CMD[remove]=1&amp;CMD[clrCmd]=1&amp;SET[singleDetails]=info').'">'.$this->removeButton().'</a>':
+						'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&amp;CMD[load]=1&amp;CMD[clrCmd]=1&amp;SET[singleDetails]=info').'">'.$this->installButton().'</a>';
 						if (in_array($extKey,$this->requiredExt))	{
 							$loadUnloadLink = '<strong>' . $GLOBALS['TBE_TEMPLATE']->rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '</strong>';
 						}
@@ -827,7 +827,7 @@
 				}
 				if(count($extensions)) {
 					$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><br /></td></tr>';
-					$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/i/sysf.gif"', 'width="18" height="16"').'align="top" alt="" /><strong>'.$this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName).'</strong></td></tr>';
+					$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/i/sysf.gif', 'width="18" height="16"').'align="top" alt="" /><strong>'.$this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName).'</strong></td></tr>';
 					$lines[] = implode(chr(10),$extensions);
 				}
 			}
@@ -848,7 +848,7 @@
 			$content.= sprintf($GLOBALS['LANG']->getLL('how_to_install'), $this->installButton()) . ' <br />' .
 						sprintf($GLOBALS['LANG']->getLL('how_to_uninstall'), $this->removeButton()). ' <br /><br />';
 			$content .= '<form action="index.php" method="post" name="lookupform">';
-			$content .= '<label for="_lookUp">' . $GLOBALS['LANG']->getLL('look_up') . '</label> <input type="text" id="_lookUp" name="_lookUp" value="' . htmlspecialchars($this->lookUpStr) . '" /><input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:search') . '" /></form><br /><br />';
+			$content .= '<label for="lookUp">' . $GLOBALS['LANG']->getLL('look_up') . '</label> <input type="text" id="lookUp" name="lookUp" value="' . htmlspecialchars($this->lookUpStr) . '" /><input type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:search') . '" /></form><br /><br />';
 			$content.= $this->securityHint.'<br /><br />';
 
 			$content.= '<table border="0" cellpadding="2" cellspacing="1">'.implode('',$lines).'</table>';
@@ -902,7 +902,7 @@
 					foreach($cat[$this->MOD_SETTINGS['listOrder']] as $catName => $extEkeys)	{
 						if (count($extEkeys))	{
 							$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><br /></td></tr>';
-							$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/i/sysf.gif"', 'width="18" height="16"').'align="top" alt="" /><strong>'.$this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName).'</strong></td></tr>';
+							$lines[]='<tr><td colspan="'.(3+$this->detailCols[$this->MOD_SETTINGS['display_details']]).'"><img '.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],'gfx/i/sysf.gif', 'width="18" height="16"').'align="top" alt="" /><strong>'.$this->listOrderTitle($this->MOD_SETTINGS['listOrder'],$catName).'</strong></td></tr>';
 
 							natcasesort($extEkeys);
 							reset($extEkeys);
@@ -918,7 +918,7 @@
 											// update
 										if ($inst_list[$extKey]['EM_CONF']['state'] != 'excludeFromUpdates') {
 											$loc= ($inst_list[$extKey]['type']=='G'?'G':'L');
-											$aUrl = 'index.php?CMD[importExt]='.$extKey.'&CMD[extVersion]='.$version.'&CMD[loc]='.$loc;
+											$aUrl = 'index.php?CMD[importExt]='.$extKey.'&amp;CMD[extVersion]='.$version.'&amp;CMD[loc]='.$loc;
 											$loadUnloadLink .= '<a href="' . htmlspecialchars($aUrl) . '"><img src="' . $GLOBALS['BACK_PATH'] . 'gfx/import_update.gif" width="12" height="12" title="' . sprintf($GLOBALS['LANG']->getLL('do_update'), ($loc == 'G' ? $GLOBALS['LANG']->getLL('global') : $GLOBALS['LANG']->getLL('local'))) . '" alt="" /></a>';
 										} else {
 												// extension is marked as "excludeFromUpdates"
@@ -926,7 +926,7 @@
 										}
 									} else {
 											// import
-										$aUrl = 'index.php?CMD[importExt]='.$extKey.'&CMD[extVersion]='.$version.'&CMD[loc]=L';
+										$aUrl = 'index.php?CMD[importExt]='.$extKey.'&amp;CMD[extVersion]='.$version.'&amp;CMD[loc]=L';
 										$loadUnloadLink .= '<a href="' . htmlspecialchars($aUrl) . '"><img src="' . $GLOBALS['BACK_PATH'] . 'gfx/import.gif" width="12" height="12" title="' . $GLOBALS['LANG']->getLL('import_to_local_dir') . '" alt="" /></a>';
 									}
 								} else {
@@ -948,9 +948,9 @@
 
 						// CSH:
 					$content .= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'], '|<br />');
-					$onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
+					$onsubmit = "window.location.href='index.php?ter_connect=1&amp;ter_search='+escape(this.elements['lookUp'].value);return false;";
 					$content .= '<form action="index.php" method="post" onsubmit="' . htmlspecialchars($onsubmit) .
-							'"><label for="_lookUp">' .
+							'"><label for="lookUp">' .
 							sprintf($GLOBALS['LANG']->getLL('list_or_look_up'),
 								($this->MOD_SETTINGS['display_unchecked'] ?
 									'<strong style="color:#900;">' . $GLOBALS['LANG']->getLL('list_or_look_up_all') . '</strong>'
@@ -958,7 +958,7 @@
 								)
 							) .
 							'</label><br />
-							<input type="text" id="_lookUp" name="_lookUp" value="' . htmlspecialchars($this->listRemote_search) .
+							<input type="text" id="lookUp" name="lookUp" value="' . htmlspecialchars($this->listRemote_search) .
 							'" /> <input type="submit" value="' . $GLOBALS['LANG']->getLL('look_up_button') . '" /></form><br /><br />';
 
  					$content .= $this->browseLinks();
@@ -985,8 +985,8 @@
 							if((strlen($this->listRemote_search) && !stristr($extKey,$this->listRemote_search)) || isset($this->xmlhandler->extensionsXML[$extKey])) continue;
 
 							$loadUnloadLink = t3lib_extMgm::isLoaded($extKey)?
-							'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&CMD[remove]=1&CMD[clrCmd]=1&SET[singleDetails]=info').'">'.$this->removeButton().'</a>':
-							'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&CMD[load]=1&CMD[clrCmd]=1&SET[singleDetails]=info').'">'.$this->installButton().'</a>';
+							'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&amp;CMD[remove]=1&amp;CMD[clrCmd]=1&amp;SET[singleDetails]=info').'">'.$this->removeButton().'</a>':
+							'<a href="'.htmlspecialchars('index.php?CMD[showExt]='.$extKey.'&amp;CMD[load]=1&amp;CMD[clrCmd]=1&amp;SET[singleDetails]=info').'">'.$this->installButton().'</a>';
 							if (in_array($extKey,$this->requiredExt)) {
 								$loadUnloadLink = '<strong>' .$GLOBALS['TBE_TEMPLATE']->rfw($GLOBALS['LANG']->getLL('extension_required_short')) . '</strong>';
 							}
@@ -1005,9 +1005,9 @@
 				}
 			} else {
 				$content .= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import_ter', $GLOBALS['BACK_PATH'], '|<br />');
-				$onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
+				$onsubmit = "window.location.href='index.php?ter_connect=1&amp;ter_search='+escape(this.elements['lookUp'].value);return false;";
 				$content .= '<form action="index.php" method="post" onsubmit="' . htmlspecialchars($onsubmit) .
-					'"><label for="_lookUp">' .
+					'"><label for="lookUp">' .
 					sprintf($GLOBALS['LANG']->getLL('list_or_look_up'),
 						($this->MOD_SETTINGS['display_unchecked'] ?
 							'<strong style="color:#900;">' . $GLOBALS['LANG']->getLL('list_or_look_up_all') . '</strong>'
@@ -1015,7 +1015,7 @@
 						)
 					) .
 					'</label><br />
-					<input type="text" id="_lookUp" name="_lookUp" value="' . htmlspecialchars($this->listRemote_search) .
+					<input type="text" id="lookUp" name="lookUp" value="' . htmlspecialchars($this->listRemote_search) .
 					'" /> <input type="submit" value="' . $GLOBALS['LANG']->getLL('look_up_button') . '" /></form><br /><br />';
 
 				$content .= '<p><strong>' . $GLOBALS['LANG']->getLL('no_matching_extensions') . '</strong></p>';
@@ -1029,9 +1029,9 @@
 				// CSH
 			$content .= t3lib_BEfunc::cshItem('_MOD_tools_em', 'import', $GLOBALS['BACK_PATH'], '|<br />');
 
-			$onsubmit = "window.location.href='index.php?ter_connect=1&ter_search='+escape(this.elements['_lookUp'].value);return false;";
+			$onsubmit = "window.location.href='index.php?ter_connect=1&amp;ter_search='+escape(this.elements['lookUp'].value);return false;";
 			$content .= '<form action="index.php" method="post" onsubmit="' . htmlspecialchars($onsubmit) .
-				'"><label for="_lookUp">' .
+				'"><label for="lookUp">' .
 				sprintf($GLOBALS['LANG']->getLL('list_or_look_up'),
 					($this->MOD_SETTINGS['display_unchecked'] ?
 						'<strong style="color:#900;">' . $GLOBALS['LANG']->getLL('list_or_look_up_all') . '</strong>'
@@ -1039,7 +1039,7 @@
 					)
 				) .
 				'</label><br />
-				<input type="text" id="_lookUp" name="_lookUp" value="" /> <input type="submit" value="' .
+				<input type="text" id="lookUp" name="lookUp" value="" /> <input type="submit" value="' .
 				$GLOBALS['LANG']->getLL('look_up_button') . '" /><br /><br />';
 
 			if ($this->CMD['fetchMetaData'])	{	// fetches mirror/extension data from online rep.
@@ -1167,10 +1167,11 @@
 			<fieldset><legend>' . $GLOBALS['LANG']->getLL('mirror_selection') . '</legend>
 			<table border="0" cellpadding="2" cellspacing="2">
 				<tr class="bgColor4">
-					<td><label for="set_mirror_list_url">' . $GLOBALS['LANG']->getLL('mirror_list_url') . '</label></a></td>
+					<td><label for="set_mirror_list_url">' . $GLOBALS['LANG']->getLL('mirror_list_url') . '</label></td>
 					<td><input type="text" size="50" id="set_mirror_list_url" name="SET[mirrorListURL]" value="'.htmlspecialchars($this->MOD_SETTINGS['mirrorListURL']).'" /></td>
 				</tr>
 			</table>
+			</fieldset>
 			<br />
 			<p>' . $GLOBALS['LANG']->getLL('mirror_select') . '<br /><br /></p>
 			<fieldset><legend>' . $GLOBALS['LANG']->getLL('mirror_list') . '</legend>';
@@ -1199,7 +1200,7 @@
 		if(is_array($extMirrors)) {
 			foreach($extMirrors as $k => $v) {
 				if(isset($v['sponsor'])) {
-					$sponsor = '<a href="'.htmlspecialchars($v['sponsor']['link']).'" target="_new"><img src="'.$v['sponsor']['logo'].'" title="'.htmlspecialchars($v['sponsor']['name']).'" alt="'.htmlspecialchars($v['sponsor']['name']).'" /></a>';
+					$sponsor = '<a href="'.htmlspecialchars($v['sponsor']['link']).'" target="_blank"><img src="'.$v['sponsor']['logo'].'" title="'.htmlspecialchars($v['sponsor']['name']).'" alt="'.htmlspecialchars($v['sponsor']['name']).'" /></a>';
 				}
 				$selected = ($this->MOD_SETTINGS['selectedMirror']==$k) ? 'checked="checked"' : '';
 				$content.='<tr class="bgColor4">
@@ -1209,6 +1210,7 @@
 		$content.= '
 			</table>
 			</fieldset>
+			<fieldset>
 			<br />
 			<table border="0" cellpadding="2" cellspacing="2">
 				<tr class="bgColor4">
@@ -1273,7 +1275,7 @@
 					<td>' . $GLOBALS['LANG']->getLL('languages_to_fetch') . '</td>
 					<td>
 					  <select name="SET[selectedLanguages][]" multiple="multiple" size="10">
-					  <option></option>'.
+					  <option>&nbsp;</option>'.
 			implode('',$opt).'
 			</select>
 		  </td>
@@ -1286,7 +1288,6 @@
 			<br />
 			<input type="submit" value="' . $GLOBALS['LANG']->getLL('translation_save_selection') . '" />
 			<br />
-			</fieldset>
 			</form>';
 
 		$this->content .= $this->doc->section($GLOBALS['LANG']->getLL('translation_settings'), $content, 0, 1);
@@ -1613,7 +1614,7 @@
 		}
 
 			// "Select version" box:
-		$onClick = 'window.location.href=\'index.php?CMD[importExtInfo]='.$extKey.'&CMD[extVersion]=\'+document.pageform.extVersion.options[document.pageform.extVersion.selectedIndex].value; return false;';
+		$onClick = 'window.location.href=\'index.php?CMD[importExtInfo]='.$extKey.'&amp;CMD[extVersion]=\'+document.pageform.extVersion.options[document.pageform.extVersion.selectedIndex].value; return false;';
 		$select = '<select name="extVersion">' . implode('', $opt) .
 			'</select> <input type="submit" value="' . $GLOBALS['LANG']->getLL('ext_load_details_button') .
 			'" onclick="' . htmlspecialchars($onClick) . '" />';
@@ -1624,8 +1625,8 @@
 			if ($inst_list[$extKey]['EM_CONF']['state'] != 'excludeFromUpdates') {
 				$onClick = '
 						window.location.href=\'index.php?CMD[importExt]='.$extKey.'\'
-							+\'&CMD[extVersion]=\'+document.pageform.extVersion.options[document.pageform.extVersion.selectedIndex].value
-							+\'&CMD[loc]=\'+document.pageform.loc.options[document.pageform.loc.selectedIndex].value;
+							+\'&amp;CMD[extVersion]=\'+document.pageform.extVersion.options[document.pageform.extVersion.selectedIndex].value
+							+\'&amp;CMD[loc]=\'+document.pageform.loc.options[document.pageform.loc.selectedIndex].value;
 							return false;';
 				$select .= ' ' . $GLOBALS['LANG']->getLL('ext_or') . '<br /><br />
 					<input type="submit" value="' . $GLOBALS['LANG']->getLL('ext_import_update_button') .
@@ -2092,7 +2093,7 @@
 												}
 
 												list($new_list) = $this->getInstalledExtensions();
-												$updateContent = $this->updatesForm($extKey, $new_list[$extKey], 1, 'index.php?CMD[showExt]=' . $extKey . '&SET[singleDetails]=info');
+												$updateContent = $this->updatesForm($extKey, $new_list[$extKey], 1, 'index.php?CMD[showExt]=' . $extKey . '&amp;SET[singleDetails]=info');
 											}
 
 											$flashMessage = t3lib_div::makeInstance(
@@ -2108,10 +2109,10 @@
 												$content .= '<h3>' . $GLOBALS['LANG']->getLL('ext_import_install_uninstall') . '</h3>';
 												$content.= $new_list[$extKey] ?
 													'<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey .
-													'&CMD[remove]=1&CMD[clrCmd]=1&SET[singleDetails]=info') . '">' .
+													'&amp;CMD[remove]=1&amp;CMD[clrCmd]=1&amp;SET[singleDetails]=info') . '">' .
 													$this->removeButton() . ' ' . $GLOBALS['LANG']->getLL('ext_import_uninstall') . '</a>' :
 													'<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey .
-													'&CMD[load]=1&CMD[clrCmd]=1&SET[singleDetails]=info') . '">' .
+													'&amp;CMD[load]=1&amp;CMD[clrCmd]=1&amp;SET[singleDetails]=info') . '">' .
 													$this->installButton() . ' ' . $GLOBALS['LANG']->getLL('ext_import_install') . '</a>';
 											} else {
 												$content = $GLOBALS['LANG']->getLL('ext_import_imported') .
@@ -2436,11 +2437,11 @@
 						if (!in_array($extKey,$this->requiredExt))	{
 							if ($TYPO3_LOADED_EXT[$extKey])	{
 								$content = '<strong>' . $GLOBALS['LANG']->getLL('ext_details_loaded_and_running') . '</strong><br />' .
-									'<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey . '&CMD[remove]=1') .
+									'<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey . '&amp;CMD[remove]=1') .
 									'">' . $GLOBALS['LANG']->getLL('ext_details_remove_button') . ' ' . $this->removeButton() . '</a>';
 							} else {
 								$content = $GLOBALS['LANG']->getLL('ext_details_not_loaded') . '<br />'.
-									'<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey . '&CMD[load]=1') .
+									'<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey . '&amp;CMD[load]=1') .
 									'">' . $GLOBALS['LANG']->getLL('ext_details_install_button') . ' ' . $this->installButton() . '</a>';
 							}
 						} else {
@@ -2727,7 +2728,7 @@
 				$this->content .= $this->doc->section(
 					$GLOBALS['LANG']->getLL('extDumpTables_static_tables'),
 					$msg . '<hr /><strong><a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey .
-					'&CMD[writeSTATICdump]=1') . '">' . $GLOBALS['LANG']->getLL('extDumpTables_write_static') . '</a></strong>',
+					'&amp;CMD[writeSTATICdump]=1') . '">' . $GLOBALS['LANG']->getLL('extDumpTables_write_static') . '</a></strong>',
 					0, 1
 				);
 				$this->content.=$this->doc->spacer(20);
@@ -2766,7 +2767,7 @@
 				$this->content.=$this->doc->section(
 					$GLOBALS['LANG']->getLL('extDumpTables_tables_fields'),
 					$msg . '<hr /><strong><a href="' . htmlspecialchars('index.php?CMD[showExt]=' .
-						$extKey . '&CMD[writeTFdump]=1') .
+						$extKey . '&amp;CMD[writeTFdump]=1') .
 						'">' . $GLOBALS['LANG']->getLL('extDumpTables_write_dump') . '</a></strong><hr />
 						<pre>' . htmlspecialchars($dump_tf) . '</pre>',
 					0, 1
@@ -2817,7 +2818,7 @@
 				$lines[] = '
 				<tr class="bgColor4">
 					<td><a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey .
-						'&CMD[downloadFile]=' . rawurlencode($file)) .
+						'&amp;CMD[downloadFile]=' . rawurlencode($file)) .
 						'" title="' . $GLOBALS['LANG']->getLL('extFileList_download') . '">' .
 						substr($file, strlen($extPath)) . '</a></td>
 					<td>'.t3lib_div::formatSize(filesize($file)).'</td>
@@ -2825,7 +2826,7 @@
 								t3lib_div::inList($this->editTextExtensions,
 									($fI['fileext'] ? $fI['fileext'] : $fI['filebody'])) ?
 										'<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $extKey .
-										'&CMD[editFile]=' . rawurlencode($file)) . '">' .
+										'&amp;CMD[editFile]=' . rawurlencode($file)) . '">' .
 										$GLOBALS['LANG']->getLL('extFileList_edit_file') . '</a>' : ''
 							) . '</td>
 				</tr>';
@@ -2886,7 +2887,7 @@
 				$areYouSure = $GLOBALS['LANG']->getLL('extDelete_sure');
 				$deleteFromServer = $GLOBALS['LANG']->getLL('extDelete_from_server');
 				$onClick = "if (confirm('$areYouSure')) {window.location.href='index.php?CMD[showExt]=" .
-					$extKey . '&CMD[doDelete]=1&CMD[absPath]=' . rawurlencode($absPath) . "';}";
+					$extKey . '&amp;CMD[doDelete]=1&amp;CMD[absPath]=' . rawurlencode($absPath) . "';}";
 				$content .= '<a href="#" onclick="' . htmlspecialchars($onClick) .
 					' return false;"><strong>' . $deleteFromServer . '</strong> ' .
 					sprintf($GLOBALS['LANG']->getLL('extDelete_from_location'),
@@ -2914,7 +2915,7 @@
 			$sure = $GLOBALS['LANG']->getLL('extUpdateEMCONF_sure');
 			$updateEMConf = $GLOBALS['LANG']->getLL('extUpdateEMCONF_file');
 			$onClick = "if (confirm('$sure')) {window.location.href='index.php?CMD[showExt]=" .
-				$extKey . "&CMD[doUpdateEMCONF]=1';}";
+				$extKey . "&amp;CMD[doUpdateEMCONF]=1';}";
 			$content .= '<a href="#" onclick="' . htmlspecialchars($onClick) .
 				' return false;"><strong>' . $updateEMConf . '</strong> ' .
 				sprintf($GLOBALS['LANG']->getLL('extDelete_from_location'),
@@ -2965,7 +2966,7 @@
 					$GLOBALS['LANG']->getLL('extBackup_select') . '</strong></td></tr>';
 				$lines[]='<tr class="bgColor4"><td><strong>' .
 					$GLOBALS['LANG']->getLL('extBackup_files') . '</strong></td><td>' .
-					'<a href="' . htmlspecialchars('index.php?CMD[doBackup]=1&CMD[showExt]=' . $extKey) .
+					'<a href="' . htmlspecialchars('index.php?CMD[doBackup]=1&amp;CMD[showExt]=' . $extKey) .
 					'">' . sprintf($GLOBALS['LANG']->getLL('extBackup_download'),
 						$extKey
 					) . '</a><br />
@@ -3006,7 +3007,7 @@
 				$count = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('*', $tN);
 				$tables[$tN] = '<tr><td>&nbsp;</td><td>
 					<a href="' . htmlspecialchars('index.php?CMD[dumpTables]=' . rawurlencode($tN) .
-					 '&CMD[showExt]=' . $extKey) .
+					 '&amp;CMD[showExt]=' . $extKey) .
 					 '" title="' .
 					 sprintf($GLOBALS['LANG']->getLL('extBackup_dump_table'),
 					 	$tN) .
@@ -3021,7 +3022,7 @@
 		$label = '<table border="0" cellpadding="0" cellspacing="0">'.implode('',array_merge($tables,$tablesNA)).'</table>';// Candidate for t3lib_div::array_merge() if integer-keys will some day make trouble...
 		if (count($tables))	{
 			$label = '<a href="' . htmlspecialchars('index.php?CMD[dumpTables]=' .
-				rawurlencode(implode(',', array_keys($tables))) . '&CMD[showExt]=' . $extKey) .
+				rawurlencode(implode(',', array_keys($tables))) . '&amp;CMD[showExt]=' . $extKey) .
 				'" title="' . $GLOBALS['LANG']->getLL('extBackup_dump_all_tables') . '">' .
 				$GLOBALS['LANG']->getLL('extBackup_download_all_data') . '</a><br /><br />' . $label;
 		}
@@ -3420,7 +3421,7 @@
 		}
 
 			// Extension title:
-		$cells[] = '<td nowrap="nowrap"><a href="' . htmlspecialchars($altLinkUrl ? $altLinkUrl : 'index.php?CMD[showExt]=' . $extKey . '&SET[singleDetails]=info') . '" title="' . htmlspecialchars($extInfo['EM_CONF']['description']) . '">' . t3lib_div::fixed_lgd_cs($extInfo['EM_CONF']['title'] ? $extInfo['EM_CONF']['title'] : '<em>' . $extKey . '</em>', 40) . '</a></td>';
+		$cells[] = '<td nowrap="nowrap"><a href="' . htmlspecialchars($altLinkUrl ? $altLinkUrl : 'index.php?CMD[showExt]=' . $extKey . '&amp;SET[singleDetails]=info') . '" title="' . htmlspecialchars($extInfo['EM_CONF']['description']) . '">' . t3lib_div::fixed_lgd_cs($extInfo['EM_CONF']['title'] ? $extInfo['EM_CONF']['title'] : '<em>' . $extKey . '</em>', 40) . '</a></td>';
 
 			// Based on the display mode you will see more or less details:
 		if (!$this->MOD_SETTINGS['display_details'])	{
@@ -3482,7 +3483,7 @@
 			$cells[] = '<td nowrap="nowrap">'.($verDiff ? '<strong>'.$GLOBALS['TBE_TEMPLATE']->rfw(htmlspecialchars($extInfo['EM_CONF']['version'])).'</strong>' : $extInfo['EM_CONF']['version']).'</td>';
 			if (!$import) {		// Listing extension on LOCAL server:
 					// Extension Download:
-				$cells[] = '<td nowrap="nowrap"><a href="' . htmlspecialchars('index.php?CMD[doBackup]=1&SET[singleDetails]=backup&CMD[showExt]=' . $extKey) . '">
+				$cells[] = '<td nowrap="nowrap"><a href="' . htmlspecialchars('index.php?CMD[doBackup]=1&amp;SET[singleDetails]=backup&amp;CMD[showExt]=' . $extKey) . '">
 					<img src="download.png" width="13" height="12" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:download') . '" alt="" /></a></td>';
 
 					// Manual download
@@ -4958,14 +4959,14 @@
 							$depK);
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<img src="' . $GLOBALS['BACK_PATH'] .
 							'gfx/import.gif" width="12" height="12" title="' . $GLOBALS['LANG']->getLL('checkDependencies_import_ext') . '" alt="" />&nbsp;
-							<a href="index.php?CMD[importExt]=' . $depK . '&CMD[loc]=L&CMD[standAlone]=1" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
+							<a href="index.php?CMD[importExt]=' . $depK . '&amp;CMD[loc]=L&amp;CMD[standAlone]=1" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $depK . ']" id="checkIgnore_' . $depK . '" />
 							<label for="checkIgnore_' . $depK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_ext_requirement') . '</label>';
 					} else {
 						$msg[] = '<br />' . sprintf($GLOBALS['LANG']->getLL('checkDependencies_ext_not_installed'),
 							$depK, $instExtInfo[$depK]['EM_CONF']['title']);
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;' . $this->installButton() . '&nbsp;
-							<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $depK . '&CMD[load]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
+							<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $depK . '&amp;CMD[load]=1&amp;CMD[clrCmd]=1&amp;CMD[standAlone]=1&amp;SET[singleDetails]=info') .
 							'" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>';
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $depK . ']" id="checkIgnore_' . $depK . '" />
 							<label for="checkIgnore_' . $depK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_ext_requirement') . '</label>';
@@ -5023,7 +5024,7 @@
 					$msg[] = sprintf($GLOBALS['LANG']->getLL('checkDependencies_conflict_remove'),
 						$extKey, $conflictK, $instExtInfo[$conflictK]['EM_CONF']['title'], $conflictK, $extKey);
 					$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;' . $this->removeButton() . '&nbsp;
-						<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $conflictK . '&CMD[remove]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
+						<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $conflictK . '&amp;CMD[remove]=1&amp;CMD[clrCmd]=1&amp;CMD[standAlone]=1&amp;SET[singleDetails]=info') .
 						'" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_remove_now') . '</a>';
 					$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $conflictK . ']" id="checkIgnore_' . $conflictK . '" />
 						<label for="checkIgnore_' . $conflictK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_conflict') . '</label>';
@@ -5056,14 +5057,14 @@
 							$suggestK);
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<img src="' . $GLOBALS['BACK_PATH'] .
 							'gfx/import.gif" width="12" height="12" title="' . $GLOBALS['LANG']->getLL('checkDependencies_import_ext') . '" alt="" />&nbsp;
-							<a href="index.php?CMD[importExt]=' . $suggestK . '&CMD[loc]=L&CMD[standAlone]=1" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
+							<a href="index.php?CMD[importExt]=' . $suggestK . '&amp;CMD[loc]=L&amp;CMD[standAlone]=1" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_import_now') . '</a>';
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $suggestK . ']" id="checkIgnore_' . $suggestK . '" />
 							<label for="checkIgnore_' . $suggestK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_suggestion') . '</label>';
 					} else {
 						$msg[] = sprintf($GLOBALS['LANG']->getLL('checkDependencies_suggest_installation'),
 							$suggestK, $instExtInfo[$suggestK]['EM_CONF']['title']);
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;' . $this->installButton() . '&nbsp;
-							<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $suggestK . '&CMD[load]=1&CMD[clrCmd]=1&CMD[standAlone]=1&SET[singleDetails]=info') .
+							<a href="' . htmlspecialchars('index.php?CMD[showExt]=' . $suggestK . '&amp;CMD[load]=1&amp;CMD[clrCmd]=1&amp;CMD[standAlone]=1&amp;SET[singleDetails]=info') .
 							'" target="_blank">' . $GLOBALS['LANG']->getLL('checkDependencies_install_now') . '</a>';
 						$msg[] = '&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" value="1" name="depsolver[ignore][' . $suggestK . ']" id="checkIgnore_' . $suggestK . '" />
 							<label for="checkIgnore_' . $suggestK . '">' . $GLOBALS['LANG']->getLL('checkDependencies_ignore_suggestion') . '</label>';
@@ -5556,7 +5557,7 @@
 				// Resetting the menu (stop)
 			if (count($MOD_MENU['constant_editor_cat']) > 1) {
 				$menu = $GLOBALS['LANG']->getLL('extInfoArray_category') . ' ' .
-					t3lib_BEfunc::getFuncMenu(0, 'SET[constant_editor_cat]', $MOD_SETTINGS['constant_editor_cat'], $MOD_MENU['constant_editor_cat'], '', '&CMD[showExt]=' . $extKey);
+					t3lib_BEfunc::getFuncMenu(0, 'SET[constant_editor_cat]', $MOD_SETTINGS['constant_editor_cat'], $MOD_MENU['constant_editor_cat'], '', '&amp;CMD[showExt]=' . $extKey);
 				$this->content.=$this->doc->section('','<span class="nobr">'.$menu.'</span>');
 				$this->content.=$this->doc->spacer(10);
 			}