###TITLE###

not · not

tag
+	 * @param string $label The header label
+	 * @return string HTML of the table
 	 */
-	function displayFields($arr, $pre=0, $label='')	{
-		$out='';
-		$out.=''.$this->fw('Field name:').''.$this->fw($label?$label:'Info:').'';
-		if (is_array($arr))	{
-			reset($arr);
-			while(list($fieldname, $fieldContent)=each($arr))	{
-				if ($pre)	{
+	function displayFields($arr, $pre=0, $label='') {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'DisplayFields.html');
+			// Get the template part from the file
+		$template = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+			// Define the markers content
+		$templateMarkers = array(
+			'headerFieldName' => 'Field name:',
+			'headerLabel' => $label ? $label : 'Info:'
+		);
+		if (is_array($arr)) {
+			$rows = array();
+				// Get the subpart for rows
+			$rowsSubpart = $this->contentObject->getSubpart($template, '###ROWS###');
+			foreach ($arr as $fieldname => $fieldContent) {
+				if ($pre) {
 					$fieldContent = ''.trim($fieldContent).'';
-				} else {
-					$fieldContent = $this->fw($fieldContent);
 				}
-				$out.=''.$this->fw($fieldname).''.$fieldContent.'';
+					// Define the markers content
+				$rowsMarkers = array(
+					'fieldName' => $fieldname,
+					'fieldContent' => $fieldContent
+				);
+					// Fill the markers in the subpart
+				$rows[] = $this->contentObject->substituteMarkerArray(
+					$rowsSubpart,
+					$rowsMarkers,
+					'###|###',
+					1,
+					1
+				);
 			}
 		}
-		$out = '' . $out . '';
-		return $out;
+			// Substitute the subpart for rows
+		$template = $this->contentObject->substituteSubpart(
+			$template,
+			'###ROWS###',
+			implode(chr(10), $rows)
+		);
+			// Fill the markers
+		$template = $this->contentObject->substituteMarkerArray(
+			$template,
+			$templateMarkers,
+			'###|###',
+			1,
+			1
+		);
+		return $template;
 	}
 
 	/**
-	 * [Describe function...]
+	 * Generates an HTML table with comparison between database and $TCA
+	 * Used in 'Database analyzer > Compare with $TCA'
 	 *
-	 * @param	[type]		$arr: ...
-	 * @param	[type]		$arr_db: ...
-	 * @return	[type]		...
+	 * @param array $arr Description of the table with fieldname and fieldcontent
+	 * @param array $arr_db The actual content of a field in the database
+	 * @return string HTML of the table
 	 */
-	function displayFieldComp($arr, $arr_db)	{
-		$out='';
-		$out.=''.$this->fw('Field name:').'
-			'.$this->fw("Suggested value from \$TCA:").'
-			'.$this->fw('Actual value from database:').'
-			';
-		if (is_array($arr))	{
-			reset($arr);
-			while(list($fieldname, $fieldContent)=each($arr))	{
+	function displayFieldComp($arr, $arr_db) {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'DisplayFieldComp.html');
+			// Get the template part from the file
+		$template = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+			// Define the markers content
+		$templateMarkers = array(
+			'headerFieldName' => 'Field name:',
+			'headerSuggested' => 'Suggested value from $TCA:',
+			'headerActual' => 'Actual value from database:'
+		);
+		$rows = array();
+		if (is_array($arr)) {
+				// Get the subpart for rows
+			$rowsSubpart = $this->contentObject->getSubpart($template, '###ROWS###');
+			foreach ($arr as $fieldname => $fieldContent) {
 					// This tries to equalize the types tinyint and int
 				$str1 = $fieldContent;
 				$str2 = trim($arr_db[$fieldname]);
@@ -4328,76 +7005,151 @@
 				$str1 = str_replace('int(10)','int(11)',$str1);
 				$str2 = str_replace('int(10)','int(11)',$str2);
 					// Compare:
-				if (strcmp($str1,$str2))	{
+				if (strcmp($str1,$str2)) {
 					$bgcolor=' class="warning"';
 				} else {
-					$bgcolor=' class="generalTableBackground"';
+					$bgcolor='';
 				}
-				$fieldContent = $this->fw($fieldContent);
-				$fieldContent_db = $this->fw($arr_db[$fieldname]);
-				$out.='
-					'.$this->fw($fieldname).'
-					'.$fieldContent.'
-					'.$fieldContent_db.'
-					';
+					// Define the markers content
+				$rowsMarkers = array(
+					'fieldName' => $fieldname,
+					'fieldContent' => $fieldContent,
+					'fieldContentDb' => $arr_db[$fieldname],
+					'class' => $bgcolor
+				);
+					// Fill the markers in the subpart
+				$rows[] = $this->contentObject->substituteMarkerArray(
+					$rowsSubpart,
+					$rowsMarkers,
+					'###|###',
+					1,
+					1
+				);
 			}
 		}
-		$out= ''.$out.'';
+			// Substitute the subpart for rows
+		$template = $this->contentObject->substituteSubpart(
+			$template,
+			'###ROWS###',
+			implode(chr(10), $rows)
+		);
+			// Fill the markers
+		$out = $this->contentObject->substituteMarkerArray(
+			$template,
+			$templateMarkers,
+			'###|###',
+			1,
+			1
+		);
 		return $out;
 	}
 
 	/**
-	 * [Describe function...]
+	 * Generates an HTML table with $TCA suggestions looking at the type of field
+	 * Used in 'Database analyzer > Compare with $TCA'
 	 *
-	 * @param	[type]		$arr: ...
-	 * @param	[type]		$excludeList: ...
-	 * @return	[type]		...
+	 * @param array $arr Description of the table with fieldname and fieldcontent
+	 * @param string $excludeList Comma separated list of fields which should be excluded from this table
+	 * @return string HTML of the table
 	 */
-	function displaySuggestions($arr, $excludeList='')	{
-		$out='';
-		$out.=''.$this->fw('Field name:').''.$this->fw('Info / Suggestion for the field:').'';
+	function displaySuggestions($arr, $excludeList='') {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'DisplaySuggestions.html');
+			// Get the template part from the file
+		$template = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+
+		$templateMarkers = array();
 		$fC=0;
-		if (is_array($arr))	{
-			reset($arr);
-			while(list($fieldname, $fieldContent)=each($arr))	{
-				if (!t3lib_div::inList($excludeList,$fieldname) && substr($fieldname,0,strlen($this->deletedPrefixKey))!=$this->deletedPrefixKey && substr($fieldname,-1)!='.')	{
-					$fieldContent = $this->fw($fieldContent);
-					if ($arr[$fieldname.'.'])	{
-						$fieldContent.= '';
-						$fieldContent.= ''.trim($arr[$fieldname.'.']).'';
+		$rows = array();
+		if (is_array($arr)) {
+				// Get the subpart for rows
+			$rowsSubpart = $this->contentObject->getSubpart($template, '###ROWS###');
+			foreach ($arr as $fieldname => $fieldContent) {
+				if (!t3lib_div::inList($excludeList,$fieldname) && substr($fieldname,0,strlen($this->deletedPrefixKey))!=$this->deletedPrefixKey && substr($fieldname,-1)!='.') {
+					if ($arr[$fieldname.'.']) {
+							// Get the subpart for pre
+						$preSubpart = $this->contentObject->getSubpart($rowsSubpart, '###PRE###');
+							// Define the markers content
+						$preMarkers = array(
+							'code' => '' . trim($arr[$fieldname.'.']) . ''
+						);
+							// Fill the markers in the subpart
+						$preSubpart = $this->contentObject->substituteMarkerArray(
+							$preSubpart,
+							$preMarkers,
+							'###|###',
+							1,
+							1
+						);
 					}
-					$out.=''.$this->fw($fieldname).''.$fieldContent.'';
+						// Substitute the subpart for pre
+					$row = $this->contentObject->substituteSubpart(
+						$rowsSubpart,
+						'###PRE###',
+						$preSubpart
+					);
+						// Define the markers content
+					$rowsMarkers = array(
+						'headerFieldName' => 'Field name:',
+						'headerLabel' => 'Info:',
+						'headerSuggestion' => 'Suggestion for the field:',
+						'fieldName' => $fieldname,
+						'fieldContent' => $fieldContent,
+					);
+						// Fill the markers in the subpart
+					$rows[] = $this->contentObject->substituteMarkerArray(
+						$row,
+						$rowsMarkers,
+						'###|###',
+						1,
+						1
+					);
 					$fC++;
 				}
 			}
 		}
-		$out= ''.$out.'';
+			// Substitute the subpart for rows
+		$template = $this->contentObject->substituteSubpart(
+			$template,
+			'###ROWS###',
+			implode(chr(10), $rows)
+		);
+			// Fill the markers
+		$out = $this->contentObject->substituteMarkerArray(
+			$template,
+			$templateMarkers,
+			'###|###',
+			1,
+			1
+		);
 		return array($out,$fC);
 	}
 
 	/**
 	 * Compares an array with field definitions with $TCA array
 	 *
-	 * @param	[type]		$FDsrc: ...
-	 * @param	[type]		$TCA: ...
-	 * @param	[type]		$onlyFields: ...
-	 * @return	[type]		...
+	 * @param array $FDsrc Field definition source
+	 * @param array $TCA The TCA array
+	 * @param boolean $onlyFields
+	 * @return array
 	 */
-	function compareDatabaseAndTCA($FDsrc, $TCA, $onlyFields=0)	{
+	function compareDatabaseAndTCA($FDsrc, $TCA, $onlyFields=0) {
 		$extraArr=array();
-		if (is_array($FDsrc))	{
-			reset($FDsrc);
-			while(list($table,$info)=each($FDsrc))	{
-				if (!isset($TCA[$table]))	{
-					if (!$onlyFields)	{
-						$extraArr[$table]=$info;		// If the table was not in the FDcomp-array, the result array is loaded with that table.
+		if (is_array($FDsrc)) {
+			foreach ($FDsrc as $table => $info) {
+				if (!isset($TCA[$table])) {
+					if (!$onlyFields) {
+							// If the table was not in the FDcomp-array, the result array is loaded with that table.
+						$extraArr[$table]=$info;
 						$extraArr[$table]['whole_table']=1;
 						unset($extraArr[$table]['keys']);
 					}
 				} else {
 					$theKey='fields';
 					$excludeListArr=array();
-					if (is_array($TCA[$table]['ctrl']['enablecolumns']))	$excludeListArr[]=$TCA[$table]['ctrl']['enablecolumns'];
+					if (is_array($TCA[$table]['ctrl']['enablecolumns'])) {
+						$excludeListArr[]=$TCA[$table]['ctrl']['enablecolumns'];
+					}
 					$excludeListArr[]=$TCA[$table]['ctrl']['tstamp'];
 					$excludeListArr[]=$TCA[$table]['ctrl']['sortby'];
 					$excludeListArr[]=$TCA[$table]['ctrl']['delete'];
@@ -4405,24 +7157,23 @@
 					$excludeListArr[]=$TCA[$table]['ctrl']['crdate'];
 					$excludeListArr[]='uid';
 					$excludeListArr[]='pid';
-					if ($table=='pages')	{
+					if ($table=='pages') {
 						$excludeListArr[]='perms_userid';
 						$excludeListArr[]='perms_groupid';
 						$excludeListArr[]='perms_user';
 						$excludeListArr[]='perms_group';
 						$excludeListArr[]='perms_everybody';
 					}
-					if ($table=='sys_dmail')	{
+					if ($table=='sys_dmail') {
 						$excludeListArr[]='scheduled';
 						$excludeListArr[]='scheduled_begin';
 						$excludeListArr[]='scheduled_end';
 						$excludeListArr[]='query_info';
 					}
 
-					if (is_array($info[$theKey]))	{
-						reset($info[$theKey]);
-						while(list($fieldN,$fieldC)=each($info[$theKey]))	{
-							if (!isset($TCA[$table]['columns'][$fieldN]) && !in_array($fieldN,$excludeListArr))	{
+					if (is_array($info[$theKey])) {
+						foreach ($info[$theKey] as $fieldN => $fieldC) {
+							if (!isset($TCA[$table]['columns'][$fieldN]) && !in_array($fieldN,$excludeListArr)) {
 								$extraArr[$table][$theKey][$fieldN] = $info['fields'][$fieldN];
 								$extraArr[$table][$theKey][$fieldN.'.']=$this->suggestTCAFieldDefinition($fieldN,$fieldC);
 							}
@@ -4437,26 +7188,23 @@
 	/**
 	 * Compares the $TCA array with a field definition array
 	 *
-	 * @param	[type]		$TCA: ...
-	 * @param	[type]		$FDcomp: ...
-	 * @return	[type]		...
+	 * @param array $TCA The TCA
+	 * @param array $FDcomp Field definition comparison
+	 * @return array
 	 */
-	function compareTCAandDatabase($TCA, $FDcomp)	{
-		$extraArr=array();
-		$matchingArr=array();
-		if (is_array($TCA))	{
-			reset($TCA);
-			while(list($table)=each($TCA))	{
-				$info=$TCA[$table];
-				if (!isset($FDcomp[$table]))	{
-//					$extraArr[$table]=$info;		// If the table was not in the FDcomp-array, the result array is loaded with that table.
+	function compareTCAandDatabase($TCA, $FDcomp) {
+		$matchingArr = $extraArr = array();
+		if (is_array($TCA)) {
+			foreach ($TCA as $table => $info) {
+				if (!isset($FDcomp[$table])) {
+						// If the table was not in the FDcomp-array, the result array is loaded with that table.
+					//$extraArr[$table]=$info;
 					$extraArr[$table]['whole_table']=1;
 				} else {
-					reset($info['columns']);
-					while(list($fieldN,$fieldC)=each($info['columns']))	{
+					foreach ($info['columns'] as $fieldN => $fieldC) {
 						$fieldDef = $this->suggestFieldDefinition($fieldC);
-						if (!is_array($fieldDef))	{
-							if (!isset($FDcomp[$table]['fields'][$fieldN]))	{
+						if (!is_array($fieldDef)) {
+							if (!isset($FDcomp[$table]['fields'][$fieldN])) {
 								$extraArr[$table]['fields'][$fieldN]=$fieldDef;
 							} else {
 								$matchingArr[$table]['fields'][$fieldN]=$fieldDef;
@@ -4472,18 +7220,18 @@
 	/**
 	 * Suggests a field definition for a TCA config array.
 	 *
-	 * @param	[type]		$fieldInfo: ...
-	 * @return	[type]		...
+	 * @param array $fieldInfo Info of a field
+	 * @return string The suggestion
 	 */
-	function suggestFieldDefinition($fieldInfo)	{
+	function suggestFieldDefinition($fieldInfo) {
 		$out='';
-		switch($fieldInfo['config']['type'])	{
+		switch($fieldInfo['config']['type']) {
 			case 'input':
-				if (preg_match('/date|time|int|year/',$fieldInfo['config']['eval']))	{
+				if (preg_match('/date|time|int|year/',$fieldInfo['config']['eval'])) {
 					$out = "int(11) NOT NULL default '0'";
 				} else {
 					$max = intval($fieldInfo['config']['max']);
-					if ($max>0 && $max<200)	{
+					if ($max>0 && $max<200) {
 						$out = 'varchar('.$max.") NOT NULL default ''";
 					} else {
 						$out = 'tinytext';
@@ -4494,42 +7242,45 @@
 				$out = 'text';
 			break;
 			case 'check':
-				if (is_array($fieldInfo['config']['items']) && count($fieldInfo['config']['items'])>8)	{
+				if (is_array($fieldInfo['config']['items']) && count($fieldInfo['config']['items'])>8) {
 					$out = "int(11) NOT NULL default '0'";
 				} else {
 					$out = "tinyint(3) NOT NULL default '0'";
 				}
 			break;
 			case 'radio':
-				if (is_array($fieldInfo['config']['items']))	{
+				if (is_array($fieldInfo['config']['items'])) {
 					$out = $this->getItemArrayType($fieldInfo['config']['items']);
 				} else {
 					$out = 'ERROR: Radiobox did not have items!';
 				}
 			break;
 			case 'group':
-				if ($fieldInfo['config']['internal_type']=='db')	{
+				if ($fieldInfo['config']['internal_type']=='db') {
 					$max = t3lib_div::intInRange($fieldInfo['config']['maxitems'],1,10000);
-					if (count(explode(',',$fieldInfo['config']['allowed']))>1)	{
-						$len = $max*(10+1+5+1);		// Tablenames are 10, "_" 1, uid's 5, comma 1
+					if (count(explode(',',$fieldInfo['config']['allowed']))>1) {
+							// Tablenames are 10, "_" 1, uid's 5, comma 1
+						$len = $max*(10+1+5+1);
 						$out=$this->getItemBlobSize($len);
 					} elseif ($max<=1) {
 						$out = "int(11) NOT NULL default '0'";
 					} else {
-						$len = $max*(5+1);		// uid's 5, comma 1
+							// uid's 5, comma 1
+						$len = $max*(5+1);
 						$out=$this->getItemBlobSize($len);
 					}
 				}
-				if ($fieldInfo['config']['internal_type']=='file')	{
+				if ($fieldInfo['config']['internal_type']=='file') {
 					$max = t3lib_div::intInRange($fieldInfo['config']['maxitems'],1,10000);
-					$len = $max*(30+1);		// Filenames is 30+ chars....
+						// Filenames is 30+ chars....
+					$len = $max*(30+1);
 					$out=$this->getItemBlobSize($len);
 				}
 			break;
 			case 'select':
 				$max = t3lib_div::intInRange($fieldInfo['config']['maxitems'],1,10000);
-				if ($max<=1)	{
-					if ($fieldInfo['config']['foreign_table'])	{
+				if ($max<=1) {
+					if ($fieldInfo['config']['foreign_table']) {
 						$out = "int(11) NOT NULL default '0'";
 					} else {
 						$out = $this->getItemArrayType($fieldInfo['config']['items']);
@@ -4547,25 +7298,24 @@
 	}
 
 	/**
+	 * Check if field needs to be varchar or int
 	 * Private
 	 *
-	 * @param	[type]		$arr: ...
-	 * @return	[type]		...
+	 * @param array $arr
+	 * @return string The definition
 	 */
-	function getItemArrayType($arr)	{
-		if (is_array($arr))	{
-			reset($arr);
-			$type[]=0;
-			$intSize[]=0;
-			while(list(,$item)=each($arr))	{
-				if (!t3lib_div::testInt($item[1]) && $item[1]!='--div--')	{
+	function getItemArrayType($arr) {
+		if (is_array($arr)) {
+			$type[] = $intSize[] = 0;
+			foreach ($arr as $item) {
+				if (!t3lib_div::testInt($item[1]) && $item[1]!='--div--') {
 					$type[]=strlen($item[1]);
 				} else {
 					$intSize[]=$item[1];
 				}
 			}
 			$us = min($intSize)>=0 ? ' unsigned' : '';
-			if (max($type)>0)	{
+			if (max($type)>0) {
 				$out = 'varchar('.max($type).") NOT NULL default ''";
 			} else {
 				$out = "int(11) NOT NULL default '0'";
@@ -4575,25 +7325,26 @@
 	}
 
 	/**
+	 * Defines the blob size of an item by a given length
 	 * Private
 	 *
-	 * @param	[type]		$len: ...
-	 * @return	[type]		...
+	 * @param integer $len The length
+	 * @return string The blob definition
 	 */
-	function getItemBlobSize($len)	{
+	function getItemBlobSize($len) {
 		return ($len>255 ? 'tiny' : '').'blob';
 	}
 
 	/**
 	 * Should suggest a TCA configuration for a specific field.
 	 *
-	 * @param	[type]		$fieldName: ...
-	 * @param	[type]		$fieldInfo: ...
-	 * @return	[type]		...
+	 * @param string $fieldName The field name
+	 * @param string $fieldInfo The field information
+	 * @return string Suggested TCA configuration
 	 */
-	function suggestTCAFieldDefinition($fieldName,$fieldInfo)	{
+	function suggestTCAFieldDefinition($fieldName,$fieldInfo) {
 		list($type,$len) = preg_split('/ |$|$/', $fieldInfo, 3);
-		switch($type)	{
+		switch($type) {
 			case 'int':
 $out="
 '".$fieldName."' => array (
@@ -4626,7 +7377,7 @@
 ),";
 			break;
 			case 'varchar':
-				if ($len>10)	{
+				if ($len>10) {
 					$out="
 '".$fieldName."' => array (
 	'label' => '".strtoupper($fieldName).":',
@@ -4732,26 +7483,25 @@
 	/**
 	 * Includes TCA
 	 *
-	 * @return	[type]		...
+	 * @return void
 	 */
-	function includeTCA()	{
+	function includeTCA() {
 		global $TCA;
 
 		include (TYPO3_tables_script ? PATH_typo3conf.TYPO3_tables_script : PATH_t3lib.'stddb/tables.php');
 
 			// Extension additions
-		if ($GLOBALS['TYPO3_LOADED_EXT']['_CACHEFILE'])	{
+		if ($GLOBALS['TYPO3_LOADED_EXT']['_CACHEFILE']) {
 			include(PATH_typo3conf.$GLOBALS['TYPO3_LOADED_EXT']['_CACHEFILE'].'_ext_tables.php');
 		} else {
 			include(PATH_t3lib.'stddb/load_ext_tables.php');
 		}
 
-		if (TYPO3_extTableDef_script)	{
+		if (TYPO3_extTableDef_script) {
 			include (PATH_typo3conf.TYPO3_extTableDef_script);
 		}
 
-		reset($TCA);
-		while(list($table)=each($TCA))	{
+		foreach ($TCA as $table => $conf) {
 			t3lib_div::loadTCA($table);
 		}
 	}
@@ -4770,440 +7520,806 @@
 	 **********************/
 
 	/**
-	 * This creates a link to the given $url. If $link is set, that'll be the link-text
-	 *
-	 * @param	[type]		$url: ...
-	 * @param	[type]		$link: ...
-	 * @return	[type]		...
-	 */
-	function linkIt($url,$link='')	{
-		return ''.($link?$link:$url).'';
-	}
-
-	/**
 	 * Setting a message in the message-log and sets the fatalError flag if error type is 3.
 	 *
-	 * @param	string		Section header
-	 * @param	string		A short description
-	 * @param	string		A long (more detailed) description
-	 * @param	integer		-1=OK sign, 0=message, 1=notification, 2=warning, 3=error
-	 * @param	boolean		Print message also in "Advanced" mode (not only in 1-2-3 mode)
-	 * @return	void
+	 * @param string $head Section header
+	 * @param string $short_string A short description
+	 * @param string $long_string A long (more detailed) description
+	 * @param integer $type -1=OK sign, 0=message, 1=notification, 2=warning, 3=error
+	 * @param boolean $force Print message also in "Advanced" mode (not only in 1-2-3 mode)
+	 * @return void
 	 */
-	function message($head, $short_string='', $long_string='', $type=0, $force=0)	{
-		if (!$force && $this->mode=='123' && $type<2)	{ return; }	// Return directly if mode-123 is enabled.
+	function message($head, $short_string='', $long_string='', $type=0, $force=0) {
+			// Return directly if mode-123 is enabled.
+		if (!$force && $this->mode=='123' && $type<2) {
+			return;
+		}
 
-		if ($type==3)	{ $this->fatalError=1; }
-		if ($this->messageFunc_nl2br && !preg_match('/<\/table>/', $long_string))	{
-			$long_string = nl2br(trim($long_string));
-		} else {
-			$long_string = trim($long_string);
-		}
+		if ($type==3) { $this->fatalError=1; }
+
+		$long_string = trim($long_string);
+
 		if (!$this->silent)	$this->printSection($head, $short_string, $long_string, $type);
 	}
 
 	/**
 	 * This "prints" a section with a message to the ->sections array
 	 *
-	 * @param	string		Section header
-	 * @param	string		A short description
-	 * @param	string		A long (more detailed) description
-	 * @param	integer		-1=OK sign, 0=message, 1=notification, 2=warning , 3=error
-	 * @return	void
+	 * @param string $head Section header
+	 * @param string $short_string A short description
+	 * @param string $long_string A long (more detailed) description
+	 * @param integer $type -1=OK sign, 0=message, 1=notification, 2=warning , 3=error
+	 * @return void
 	 */
-	function printSection($head, $short_string, $long_string, $type)	{
-		switch($type)	{
+	function printSection($head, $short_string, $long_string, $type) {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'PrintSection.html');
+			// Get the template part from the file
+		$template = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+
+		switch($type) {
 			case 3:
-				$cssClass = ' class="typo3-message message-error"';
+				$messageType = 'message-error';
 			break;
 			case 2:
-				$cssClass = ' class="typo3-message message-warning"';
+				$messageType = 'message-warning';
 			break;
 			case 1:
-				$cssClass =' class="typo3-message message-notice"';
+				$messageType = 'message-notice';
 				break;
 			case 0:
-				$cssClass = ' class="typo3-message message-information"';
+				$messageType = 'message-information';
 				break;
 			case -1:
-				$cssClass = ' class="typo3-message message-ok"';
+				$messageType = 'message-ok';
 			break;
 		}
 
-		if (!trim($short_string))	{
-			$this->sections[$head][]='';
+		if (!trim($short_string)) {
+			$content = '';
 		} else {
-			$this->sections[$head][]='
-			' . '' . $this->fw($short_string) . '' . (trim($long_string) ? '
-			' . $this->fw($long_string) . '

' : '');
+			if (trim($long_string)) {
+					// Get the subpart for the long string
+				$longStringSubpart = $this->contentObject->getSubpart($template, '###LONGSTRINGAVAILABLE###');
+			}
+				// Substitute the subpart for the long string
+			$content = $this->contentObject->substituteSubpart(
+				$template,
+				'###LONGSTRINGAVAILABLE###',
+				$longStringSubpart
+			);
+				// Define the markers content
+			$markers = array(
+				'messageType' => $messageType,
+				'shortString' => $short_string,
+				'longString' => $long_string
+			);
+				// Fill the markers
+			$content = $this->contentObject->substituteMarkerArray(
+				$content,
+				$markers,
+				'###|###',
+				1,
+				1
+			);
 		}
+		$this->sections[$head][] = $content;
 	}
 
 	/**
-	 * Wraps the str in a font-tag with verdana 1
+	 * This prints all the messages in the ->section array
 	 *
-	 * @param	[type]		$str: ...
-	 * @param	[type]		$size: ...
-	 * @return	[type]		...
+	 * @return string HTML of all the messages
 	 */
-	function fw($str,$size=1)	{
+	function printAll() {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'PrintAll.html');
+			// Get the template part from the file
+		$template = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+		$sections = array();
 
-		if (preg_match('/^$/', $str)) {
-			// no wrap
-		} else {
-			if($size==1) {
-				$size = 'class="smalltext"';
-			} elseif ($size==2) {
-				$size = 'class="bodytext"';
-			} else {
-				$size = 'size="size'.$size.'text"';
-			}
-			$str = ''.$str.'';
+		foreach ($this->sections as $header => $valArray) {
+				// Get the subpart for sections
+			$sectionSubpart = $this->contentObject->getSubpart($template, '###SECTIONS###');
+				// Define the markers content
+			$sectionMarkers = array(
+				'header' => $header . ':',
+				'sectionContent' => implode(chr(10), $valArray)
+			);
+				// Fill the markers in the subpart
+			$sections[] = $this->contentObject->substituteMarkerArray(
+				$sectionSubpart,
+				$sectionMarkers,
+				'###|###',
+				1,
+				1
+			);
 		}
-		return $str;
-	}
+			// Substitute the subpart for the sections
+		$content = $this->contentObject->substituteSubpart(
+			$template,
+			'###SECTIONS###',
+			implode(chr(10), $sections)
+		);
 
-	/**
-	 * Wraps the str in a font-tag with verdana 1
-	 *
-	 * @param	[type]		$str: ...
-	 * @return	[type]		...
-	 */
-	function fwheader($str)	{
-		return ''.$this->fw($str,3).'';
+		return $content;
 	}
 
 	/**
-	 * Wrapping labal/content in a table-row.
+	 * This wraps and returns the main content of the page into proper html-code.
 	 *
-	 * @param	[type]		$label: ...
-	 * @param	[type]		$content: ...
-	 * @return	[type]		...
+	 * @param string $content The page content
+	 * @return string The full HTML page
 	 */
-	function wrapInCells($label,$content)	{
-		return '';
-	}
+	function outputWrapper($content) {
+			// Get the template file
+		if (!$this->passwordOK) {
+			$this->template = @file_get_contents(PATH_site . $this->templateFilePath . 'Install_login.html');
+		} elseif ($this->mode == '123') {
+			$this->template = @file_get_contents(PATH_site . $this->templateFilePath . 'Install_123.html');
+		} else {
+			$this->template = @file_get_contents(PATH_site . $this->templateFilePath . 'Install.html');
+		}
 
-	/**
-	 * This prints all the messages in the ->section array
-	 *
-	 * @return	[type]		...
-	 */
-	function printAll()	{
-		reset($this->sections);
-		$out='';
-		while(list($header,$valArray)=each($this->sections))	{
-			$out.='
-			
-			
-			';
-			$out.=implode($valArray,chr(10));
+			// Include the default stylesheets
+		$this->stylesheets[] = '';
+		$this->stylesheets[] = '';
+
+			// Include the stylesheets based on screen
+		if ($this->mode == '123') {
+			$this->stylesheets[] = '';
+		} elseif ($this->passwordOK) {
+			$this->stylesheets[] = '';
+			if (!$this->session->inBackend()) {
+				$this->stylesheets[] = '';
+			}
+		} else {
+			$this->stylesheets[] = '';
+			if (!$this->session->inBackend()) {
+				$this->stylesheets[] = '';
+			}
 		}
-		return ''.$this->fw($label).'   '.$this->fw($content).'
 
'.$this->fw($header.':',2).'
'.$out.'';
-	}
 
-	/**
-	 * This wraps and returns the main content of the page into proper html-code.
-	 *
-	 * @param	string		The page content
-	 * @return	string		The full HTML page
-	 */
-	function outputWrapper($content)	{
-		$out='
-
-
-
-
-'.$this->headerStyle.'
-		
- 		TYPO3 Install Tool
-		'.($this->JSmessage?'
-
+			// Include javascript message
+		$this->javascript[] = $this->JSmessage ?
+			'' :
+			'';
 
-		':'').'
-
-	
-	'.$this->contentBeforeTable.'
-		';
-		if($this->INSTALL['type'] == 'about') {
-			$out .= '';
+			// Define the markers content
+		if ($this->mode == '123') {
+			$this->markers['headTitle'] = 'Installing TYPO3 ' . TYPO3_branch;
 		} else {
-			$out .= '';
+			$this->markers['headTitle'] = '
+				TYPO3 ' . TYPO3_version . '
+				Install tool on site: ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '
+			';
 		}
-		$out .= '
-			
-		
-		
-			
-		
-		

-				
-					
-						
-					
-				
-						TYPO3 '.TYPO3_branch.' Install Tool
-						Site: '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].'
-						'.($this->passwordOK ? 'Version: '.TYPO3_version.'
':'').'

+		$this->markers['title'] = 'TYPO3 ' . TYPO3_version;
+		$this->markers['javascript'] = implode(chr(10), $this->javascript);
+		$this->markers['stylesheets'] = implode(chr(10), $this->stylesheets);
+		$this->markers['llErrors'] = 'The following errors occured';
+		$this->markers['copyright'] = $this->copyright();
+		$this->markers['charset'] = $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'] ? $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'] : 'iso-8859-1';
+		$this->markers['backendUrl'] = '../index.php';
+		$this->markers['backend'] = 'Backend admin';
+		$this->markers['frontendUrl'] = '../../index.php';
+		$this->markers['frontend'] = 'Frontend website';
 
-'.($this->step?$this->stepHeader():$this->menu()).$content.''.$this->note123().$this->endNotes().'
-						
-			
-		
-	
-';
-		return $out;
+		$this->markers['metaCharset'] = 'Content-Type" content="text/html; charset=';
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'])) {
+			$this->markers['metaCharset'] .= $GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset'];
+		} else {
+			$this->markers['metaCharset'] .= 'iso-8859-1';
+		}
+
+			// Add the error messages
+		if (!empty($this->errorMessages)) {
+				// Get the subpart for all error messages
+			$errorMessagesSubPart = $this->contentObject->getSubpart($this->template, '###ERRORMESSAGES###');
+				// Get the subpart for a single error message
+			$errorMessageSubPart = $this->contentObject->getSubpart($errorMessagesSubPart, '###MESSAGES###');
+			$errors = array();
+
+			foreach ($this->errorMessages as $errorMessage) {
+					// Define the markers content
+				$errorMessageMarkers = array(
+					'message' => $errorMessage
+				);
+					// Fill the markers in the subpart
+				$errors[] = $this->contentObject->substituteMarkerArray(
+					$errorMessageSubPart,
+					$errorMessageMarkers,
+					'###|###',
+					1,
+					1
+				);
+			}
+				// Substitute the subpart for a single message
+			$errorMessagesSubPart = $this->contentObject->substituteSubpart(
+				$errorMessagesSubPart,
+				'###MESSAGES###',
+				implode(chr(10), $errors)
+			);
+		}
+
+			// Version subpart is only allowed when password is ok
+		if ($this->passwordOK) {
+				// Get the subpart for the version
+			$versionSubPart = $this->contentObject->getSubpart($this->template, '###VERSIONSUBPART###');
+				// Define the markers content
+			$versionSubPartMarkers['version'] = 'Version: ' . TYPO3_version;
+				// Fill the markers in the subpart
+			$versionSubPart = $this->contentObject->substituteMarkerArray(
+				$versionSubPart,
+				$versionSubPartMarkers,
+				'###|###',
+				1,
+				1
+			);
+		}
+			// Substitute the version subpart
+		$this->template = $this->contentObject->substituteSubpart(
+			$this->template,
+			'###VERSIONSUBPART###',
+			$versionSubPart
+		);
+			// Substitute the menu subpart
+		$this->template = $this->contentObject->substituteSubpart(
+			$this->template,
+			'###MENU###',
+			$this->menu()
+		);
+			// Substitute the error messages subpart
+		$this->template = $this->contentObject->substituteSubpart(
+			$this->template,
+			'###ERRORMESSAGES###',
+			$errorMessagesSubPart
+		);
+			// Substitute the content subpart
+		$this->template = $this->contentObject->substituteSubpart(
+			$this->template,
+			'###CONTENT###',
+			$content
+		);
+			// Fill the markers
+		$this->template = $this->contentObject->substituteMarkerArray(
+			$this->template,
+			$this->markers,
+			'###|###',
+			1,
+			1
+		);
+
+		return $this->template;
 	}
 
 	/**
 	 * Sends the page to the client.
 	 *
-	 * @param	string		The HTML page
+	 * @param string $content The HTML page
+	 * @return void
 	 */
-	function output($content)	{
+	function output($content) {
 		header ('Content-Type: text/html; charset=' .
 			($GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset']?$GLOBALS['TYPO3_CONF_VARS']['BE']['forceCharset']:'iso-8859-1'));
 		echo $content;
 	}
 
 	/**
-	 * [Describe function...]
+	 * Generates the main menu
 	 *
-	 * @return	[type]		...
+	 * @return string HTML of the main menu
 	 */
-	function menu()	{
-		if (!$this->passwordOK)	return;
+	function menu() {
+		if ($this->mode !='123') {
+			if (!$this->passwordOK)	return;
 
-		reset($this->menuitems);
-		$c=0;
-		$out=array();
-		while(list($k,$v)=each($this->menuitems))	{
-			$bgcolor = ($this->INSTALL['type']==$k ? ' class="activeMenu"' : ' class="generalTableBackground"');
-			$c++;
-			$out[]=''.$this->fw($c.': '.$v).'';
+			$c = 0;
+			$items = array();
+				// Get the subpart for the main menu
+			$menuSubPart = $this->contentObject->getSubpart($this->template, '###MENU###');
+				// Get the subpart for each single menu item
+			$menuItemSubPart = $this->contentObject->getSubpart($this->template, '###MENUITEM###');
+
+			foreach ($this->menuitems as $k => $v) {
+					// Define the markers content
+				$markers = array(
+					'class' => ($this->INSTALL['type']==$k ? 'class="act"' : ''),
+					'id' => $k,
+					'url' => htmlspecialchars(
+						$this->scriptSelf .
+						'?TYPO3_INSTALL[type]=' .
+						$k .
+						($this->mode ? '&mode=' . rawurlencode($this->mode) : '')
+					),
+					'item' => $v
+				);
+					// Fill the markers in the subpart
+				$items[] = $this->contentObject->substituteMarkerArray(
+					$menuItemSubPart,
+					$markers,
+					'###|###',
+					1,
+					1
+				);
+			}
+				// Substitute the subpart for the single menu items
+			$menuSubPart = $this->contentObject->substituteSubpart(
+				$menuSubPart,
+				'###MENUITEM###',
+				implode(chr(10), $items)
+			);
+
+			return $menuSubPart;
 		}
-
-		$code = ''.implode($out,chr(10)).'';
-		$code = ''.$code.'';
-		return ''.$code.'';
 	}
 
 	/**
-	 * [Describe function...]
+	 * Generates the step header for 1-2-3 mode, the numbers at the top
 	 *
-	 * @return	[type]		...
+	 * @return string HTML for the step header
 	 */
-	function stepHeader()	{
-		$msg1='Type in your database parameters here:';
-		$msg2='Database';
-		$msg3='Import the database sql-file';
-		$msg4='You\'re done!';
-		$out='
-
-
-
-
-
-
+	function stepHeader() {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'StepHeader.html');
+			// Get the template part from the file
+		$template = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+			// Get the subpart for each item
+		$stepItemSubPart = $this->contentObject->getSubpart($template, '###STEPITEM###');
 
+		$steps = array();
 
-		
';
-		$msg='';
-		switch(strtolower($this->step))	{
-			case 1:
-				$msg=$msg1;
-			break;
-			case 2:
-				$msg=$msg2;
-			break;
-			case 3:
-				$msg=$msg3;
-			break;
-			case 'go':
-				$msg=$msg4;
-			break;
-			default:
-			break;
+		for ($counter = 2; $counter <= $this->totalSteps; $counter++) {
+			$state = '';
+
+			if ($this->step === $counter) {
+				$state = 'act';
+			} elseif ($this->step === 'go' || $counter < $this->step) {
+				$state = 'done';
+			}
+				// Define the markers content
+			$stepItemMarkers = array(
+				'class' => 'class="step' . ($counter - 1) . ($state ? ' ' . $state : '') . '"',
+				'url' => $this->scriptSelf . '?mode=' . $this->mode . '&step=' . $counter,
+				'step' => $counter
+			);
+				// Fill the markers in the subpart
+			$steps[] = $this->contentObject->substituteMarkerArray(
+				$stepItemSubPart,
+				$stepItemMarkers,
+				'###|###',
+				1,
+				1
+			);
 		}
-		$out.='
'.$this->fw($msg,2).'';
+			// Substitute the subpart for the items
+		$content = $this->contentObject->substituteSubpart(
+			$template,
+			'###STEPITEM###',
+			implode(chr(10), $steps)
+		);
 
-		return $out;
+		return $content;
 	}
 
 	/**
-	 * [Describe function...]
+	 * Generate HTML for the security risk message
 	 *
-	 * @return	[type]		...
+	 * @return string HTML for the security risk message
 	 */
-	function note123()	{
-		if ($this->mode=='123')	{
-			$c='
-				
-			' . $this->fontTag1 . 'NOTICE: Install Tool is running in \'123\' mode. Click here to disable.';
-			return $c;
-		}
+	function securityRisk() {
+		return '
+			
+				This script is a
+				great danger to the security of TYPO3
+				if you don\'t secure it somehow.
+				

+				We suggest one of the following:
+			
+			
+				
+					Change the password as defined by the md5-hash in
+					TYPO3_CONF_VARS[BE][installToolPassword]
+				
+				
+					Delete the folder \'typo3/install/\' with this script in or
+					just insert an \'exit;\' line in the script-file there
+				
+				
+					Password protect the \'typo3/install/\' folder, eg. with a
+					.htaccess file
+				
+			
+			
+				The TYPO3_CONF_VARS[BE][installToolPassword] is always active,
+				but choosing one of the other options will improve security and
+				is recommended highly.
+			
+		';
 	}
 
 	/**
-	 * [Describe function...]
+	 * Generates the form to alter the password of the install tool
 	 *
-	 * @return	[type]		...
+	 * @return string HTML of the form
 	 */
-	function endNotes()	{
-		if ($this->mode!='123' && $this->passwordOK)	{
-			$c.='OS detected: '.(TYPO3_OS=='WIN'?'WIN':'UNIX').'
';
-			$c.='UNIX/CGI detected: '.(PHP_SAPI=='cgi' ? 'YES' : 'NO').'
';
-			$c.='PATH_thisScript: '.PATH_thisScript.'
';
-			$c.='
';
-			$c.='Backend admin in new window.
';
-			$c.='Frontend website in new window.
';
+	function alterPasswordForm() {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'AlterPasswordForm.html');
+			// Get the template part from the file
+		$template = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+			// Define the markers content
+		$markers = array(
+			'action' => $this->scriptSelf.'?TYPO3_INSTALL[type]=extConfig',
+			'enterPassword' => 'Enter new password:',
+			'enterAgain' => 'Enter again:',
+			'submit' => 'Set new password'
+		);
+			// Fill the markers
+		$content = $this->contentObject->substituteMarkerArray(
+			$template,
+			$markers,
+			'###|###',
+			1,
+			1
+		);
 
-			return $this->fw($c);
-		}
+		return $content;
 	}
 
 	/**
-	 * Convert a size from human-readable form into bytes
+	 * Generate HTML for the copyright
 	 *
-	 * @param	string		A string containing the size in bytes, kilobytes or megabytes. Example: 64M
-	 * @return	string		The string is returned in bytes and can also hold floating values
+	 * @return string HTML of the copyright
 	 */
-	function convertByteSize($bytes)	{
-		if (stristr($bytes,'m'))	{
-			$bytes=doubleval($bytes)*1024*1024;
-		} elseif (stristr($bytes,'k'))	{
-			$bytes=doubleval($bytes)*1024;
-		}
-		return $bytes;
-	}
-
-	/**
-	 * [Describe function...]
-	 *
-	 * @return	[type]		...
-	 */
-	function securityRisk()	{
-		$c='This script is a great danger to the security of TYPO3 if you don\'t secure it somehow.
-			We suggest one of the following:
-
-			- change the password as defined by the md5-hash in TYPO3_CONF_VARS[BE][installToolPassword].
-			- delete the folder \'typo3/install/\' with this script in or just insert an \'exit;\' line in the script-file there.
-			- password protect the \'typo3/install/\' folder, eg. with a .htaccess file
-
-			The TYPO3_CONF_VARS[BE][installToolPassword] is always active, but choosing one of the other options will improve security and is recommended highly.
+	function copyright() {
+		$content = '
+			
+				TYPO3 CMS. Copyright � 1998-' . date('Y') . '
+				Kasper Sk�rh�j. Extensions are copyright of their respective
+				owners. Go to http://typo3.com/
+				for details. TYPO3 comes with ABSOLUTELY NO WARRANTY;
+				click for details.
+				This is free software, and you are welcome to redistribute it
+				under certain conditions; click for details. Obstructing the
+				appearance of this notice is prohibited by law.
+			
+			
+				Donate |
+				TYPO3.org
+			
 		';
-		return $c;
-	}
 
-	/**
-	 * [Describe function...]
-	 *
-	 * @return	[type]		...
-	 */
-	function alterPasswordForm()	{
-			$content = '
-			Enter new password:
-			
Enter again:
-			
-			
-			

-			';
-			return $content;
+		return $content;
 	}
 
 	/**
-	 * [Describe function...]
+	 * Generate HTML for the message that the basic setup has been finished
 	 *
-	 * @return	[type]		...
+	 * @return string HTML of the message
 	 */
-	function messageBasicFinished()	{
-		$msg ='
+	function messageBasicFinished() {
+		return '
+			
 				Apparently you have completed the basic setup of the TYPO3 database.
+				

 				Now you can choose between these options:
-
-				- Go to the frontend pages
-
-				- Go to the backend login
-				 (username may be: admin, password may be: password.)
-
-				- Continue to configure TYPO3 (Recommended).
-				 This will let you analyse and verify that everything in your PHP installation is alright. Also if you want to configure TYPO3 to use all the cool features, you must dig into the this!
-				';
-		return $msg;
+			
+			
+				
+					
+						Go to the frontend pages
+					
+				
+				
+					
+						Go to the backend login
+					
+					

+			 		(username may be: admin, password may be: password.)
+				
+				
+					
+						Continue to configure TYPO3
+					 (Recommended).
+					

+			 		This will let you analyse and verify that everything in your
+			 		PHP installation is alright. Also if you want to configure
+			 		TYPO3 to use all the cool features, you must dig
+			 		into the this!
+			 	
+			 
+		';
 	}
 
 	/**
-	 * [Describe function...]
+	 * Make the url of the script according to type, mode and step
 	 *
-	 * @param	[type]		$type: ...
-	 * @return	[type]		...
+	 * @param string $type The type
+	 * @return string The url
 	 */
-	function setScriptName($type)	{
+	function setScriptName($type) {
 		$value = $this->scriptSelf.'?TYPO3_INSTALL[type]='.$type.($this->mode?'&mode='.rawurlencode($this->mode):'').($this->step?'&step='.rawurlencode($this->step):'');
 		return $value;
 	}
 
 	/**
-	 * [Describe function...]
+	 * Return the filename that will be used for the backup.
+	 * It is important that backups of PHP files still stay as a PHP file, otherwise they could be viewed un-parsed in clear-text.
 	 *
-	 * @param	[type]		$size: ...
-	 * @param	[type]		$textarea: ...
-	 * @param	[type]		$styleOverride: ...
-	 * @return	[type]		...
+	 * @param string $filename Full path to a file
+	 * @return string The name of the backup file (again, including the full path)
 	 */
-	function formWidth($size=48,$textarea=0,$styleOverride='') {
-			// Input or text-field attribute (size or cols)
-		$wAttrib = $textarea?'cols':'size';
-		if (!$GLOBALS['CLIENT']['FORMSTYLE'])	{	// If not setting the width by style-attribute
-			$size = ceil($size*1);
-			$retVal = ' '.$wAttrib.'="'.$size.'"';
-		} else {	// Setting width by style-attribute. "cols" MUST be avoided with NN6+
-			$pixels = ceil($size*10);
-			$retVal = $styleOverride ? ' style="'.$styleOverride.'"' : ' style="width:'.$pixels.'px;"';
+	function getBackupFilename($filename) {
+		if (preg_match('/\.php$/', $filename)) {
+			$backupFile = str_replace('.php', '_bak.php', $filename);
+		} else {
+			$backupFile = $filename.'~';
 		}
-		return $retVal;
+
+		return $backupFile;
 	}
 
 	/**
-	 * [Describe function...]
+	 * Creates a table which checkboxes for updating database.
 	 *
-	 * @param	[type]		$size: ...
-	 * @param	[type]		$styleOverride: ...
-	 * @param	[type]		$wrap: ...
-	 * @return	[type]		...
+	 * @param array $arr Array of statements (key / value pairs where key is used for the checkboxes)
+	 * @param string $label Label for the table.
+	 * @param boolean $checked If set, then checkboxes are set by default.
+	 * @param boolean $iconDis If set, then icons are shown.
+	 * @param array $currentValue Array of "current values" for each key/value pair in $arr. Shown if given.
+	 * @param boolean $cVfullMsg If set, will show the prefix "Current value" if $currentValue is given.
+	 * @return string HTML table with checkboxes for update. Must be wrapped in a form.
 	 */
-	function formWidthText($size=48,$styleOverride='',$wrap='') {
-		$wTags = $this->formWidth($size,1,$styleOverride);
-			// Netscape 6+ seems to have this ODD problem where there WILL ALWAYS be wrapping with the cols-attribute set and NEVER without the col-attribute...
-		if (strtolower(trim($wrap))!='off' && $GLOBALS['CLIENT']['BROWSER']=='net' && $GLOBALS['CLIENT']['VERSION']>=5)	{
-			$wTags.=' cols="'.$size.'"';
+	function generateUpdateDatabaseForm_checkboxes($arr,$label,$checked=1,$iconDis=0,$currentValue=array(),$cVfullMsg=0) {
+		$out = array();
+		$tableId = uniqid('table');
+		$templateMarkers = array();
+		if (is_array($arr)) {
+				// Get the template file
+			$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'GenerateUpdateDatabaseFormCheckboxes.html');
+				// Get the template part from the file
+			$content = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+				// Define the markers content
+			$templateMarkers = array(
+				'label' => $label,
+				'tableId' => $tableId
+			);
+				// Select/Deselect All
+			if (count($arr) > 1) {
+					// Get the subpart for multiple tables
+				$multipleTablesSubpart = $this->contentObject->getSubpart($content, '###MULTIPLETABLES###');
+					// Define the markers content
+				$multipleTablesMarkers = array(
+					'label' => $label,
+					'tableId' => $tableId,
+					'checked' => ($checked ? ' checked="checked"' : ''),
+					'selectAllId' => $tableId . '-checkbox',
+					'selectDeselectAll' => 'select/deselect all'
+				);
+					// Fill the markers in the subpart
+				$multipleTablesSubpart = $this->contentObject->substituteMarkerArray(
+					$multipleTablesSubpart,
+					$multipleTablesMarkers,
+					'###|###',
+					1,
+					1
+				);
+			}
+				// Substitute the subpart for multiple tables
+			$content = $this->contentObject->substituteSubpart(
+				$content,
+				'###MULTIPLETABLES###',
+				$multipleTablesSubpart
+			);
+				// Rows
+			foreach ($arr as $key => $string) {
+					// Get the subpart for rows
+				$rowsSubpart = $this->contentObject->getSubpart($content, '###ROWS###');
+				$currentSubpart = '';
+				$ico = '';
+				$warnings = array();
+					// Define the markers content
+				$rowsMarkers = array(
+					'checkboxId' => 'db-' . $key,
+					'name' => $this->dbUpdateCheckboxPrefix . '[' . $key . ']',
+					'checked' => ($checked ? 'checked="checked"' : ''),
+					'string' => htmlspecialchars($string)
+				);
+
+				if ($iconDis) {
+					$iconMarkers['backPath'] = $this->backPath;
+					if (preg_match('/^TRUNCATE/i', $string)) {
+						$iconMarkers['iconText'] = '';
+						$warnings['clear_table_info'] = 'Clearing the table is sometimes neccessary when adding new keys. In case of cache_* tables this should not hurt at all. However, use it with care.';
+					} elseif (stristr($string,' user_')) {
+						$iconMarkers['iconText'] = '(USER)';
+					} elseif (stristr($string,' app_')) {
+						$iconMarkers['iconText'] = '(APP)';
+					} elseif (stristr($string,' ttx_') || stristr($string,' tx_')) {
+						$iconMarkers['iconText'] = '(EXT)';
+					}
+
+					if (!empty($iconMarkers)) {
+							// Get the subpart for icons
+						$iconSubpart = $this->contentObject->getSubpart($content, '###ICONAVAILABLE###');
+							// Fill the markers in the subpart
+						$iconSubpart = $this->contentObject->substituteMarkerArray(
+							$iconSubpart,
+							$iconMarkers,
+							'###|###',
+							1,
+							1
+						);
+					}
+				}
+					// Substitute the subpart for icons
+				$rowsSubpart = $this->contentObject->substituteSubpart(
+					$rowsSubpart,
+					'###ICONAVAILABLE###',
+					$iconSubpart
+				);
+
+				if (isset($currentValue[$key])) {
+						// Get the subpart for current
+					$currentSubpart = $this->contentObject->getSubpart($rowsSubpart, '###CURRENT###');
+						// Define the markers content
+					$currentMarkers = array (
+						'message' => (!$cVfullMsg ? 'Current value:': ''),
+						'value' => $currentValue[$key]
+					);
+						// Fill the markers in the subpart
+					$currentSubpart = $this->contentObject->substituteMarkerArray(
+						$currentSubpart,
+						$currentMarkers,
+						'###|###',
+						1,
+						1
+					);
+				}
+					// Substitute the subpart for current
+				$rowsSubpart = $this->contentObject->substituteSubpart(
+					$rowsSubpart,
+					'###CURRENT###',
+					$currentSubpart
+				);
+					// Fill the markers in the subpart
+				$rowsSubpart = $this->contentObject->substituteMarkerArray(
+					$rowsSubpart,
+					$rowsMarkers,
+					'###|###',
+					1,
+					1
+				);
+
+				$rows[] = $rowsSubpart;
+			}
+				// Substitute the subpart for rows
+			$content = $this->contentObject->substituteSubpart(
+				$content,
+				'###ROWS###',
+				implode(chr(10), $rows)
+			);
+
+			if (count($warnings)) {
+					// Get the subpart for warnings
+				$warningsSubpart = $this->contentObject->getSubpart($content, '###WARNINGS###');
+
+				foreach ($warnings as $warning) {
+						// Get the subpart for single warning items
+					$warningItemSubpart = $this->contentObject->getSubpart($warningsSubpart, '###WARNINGITEM###');
+						// Define the markers content
+					$warningItemMarker['warning'] = $warning;
+						// Fill the markers in the subpart
+					$warningItem[] = $this->contentObject->substituteMarkerArray(
+						$warningItemSubpart,
+						$warningItemMarker,
+						'###|###',
+						1,
+						1
+					);
+				}
+					// Substitute the subpart for single warning items
+				$warningsSubpart = $this->contentObject->substituteSubpart(
+					$warningsSubpart,
+					'###WARNINGITEM###',
+					implode(chr(10), $warningItems)
+				);
+			}
+				// Substitute the subpart for warnings
+			$content = $this->contentObject->substituteSubpart(
+				$content,
+				'###WARNINGS###',
+				implode(chr(10), $warningsSubpart)
+			);
 		}
-		return $wTags;
+			// Fill the markers
+		$content = $this->contentObject->substituteMarkerArray(
+			$content,
+			$templateMarkers,
+			'###|###',
+			1,
+			1
+		);
+
+		return $content;
 	}
 
 	/**
-	 * Return the filename that will be used for the backup.
-	 * It is important that backups of PHP files still stay as a PHP file, otherwise they could be viewed un-parsed in clear-text.
+	 * Returns HTML-code, which is a visual representation of a multidimensional array
+	 * Returns false if $array_in is not an array
 	 *
-	 * @param	string		Full path to a file
-	 * @return	string		The name of the backup file (again, including the full path)
+	 * @param mixed $incomingValue Array to view
+	 * @return string HTML output
 	 */
-	function getBackupFilename($filename)	{
-		if (preg_match('/\.php$/', $filename))	{
-			$backupFile = str_replace('.php', '_bak.php', $filename);
-		} else {
-			$backupFile = $filename.'~';
+	function viewArray($incomingValue) {
+			// Get the template file
+		$templateFile = @file_get_contents(PATH_site . $this->templateFilePath . 'ViewArray.html');
+
+		if (is_array($incomingValue) && !empty($incomingValue)) {
+				// Get the template part from the file
+			$content = $this->contentObject->getSubpart($templateFile, '###TEMPLATE###');
+				// Get the subpart for a single item
+			$itemSubpart = $this->contentObject->getSubpart($content, '###ITEM###');
+
+			foreach ($incomingValue as $key => $value) {
+				if (is_array($value)) {
+					$description = $this->viewArray($value);
+				} elseif (is_object($value)) {
+					$description = get_class($value);
+					if (method_exists($value, '__toString')) {
+						$description .= ': ' . (string)$value;
+					}
+				} else {
+					if (gettype($value) == 'object') {
+						$description = 'Unknown object';
+					} else {
+						$description = htmlspecialchars((string) $value);
+					}
+				}
+					// Define the markers content
+				$itemMarkers = array(
+					'key' => htmlspecialchars((string) $key),
+					'description' => !empty($description) ? $description : ' '
+				);
+					// Fill the markers in the subpart
+				$items[] = $this->contentObject->substituteMarkerArray(
+					$itemSubpart,
+					$itemMarkers,
+					'###|###',
+					1,
+					1
+				);
+			}
+				// Substitute the subpart for single item
+			$content = $this->contentObject->substituteSubpart(
+				$content,
+				'###ITEM###',
+				implode(chr(10), $items)
+			);
 		}
-
-		return $backupFile;
+		return $content;
 	}
 
 	/**
 	 * Returns a newly created TYPO3 encryption key with a given length.
 	 *
-	 * @param  integer  $keyLength  desired key length
-	 * @return string
+	 * @param integer $keyLength Desired key length
+	 * @return string The encryption key
 	 */
 	protected function createEncryptionKey($keyLength = 96) {
 		$bytes = t3lib_div::generateRandomBytes($keyLength);
@@ -5211,8 +8327,7 @@
 	}
 }
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php'])	{
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php']) {
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/install/mod/class.tx_install.php']);
 }
-
-?>
+?>
\ No newline at end of file
Index: typo3/sysext/install/mod/class.tx_install_session.php
===================================================================

--- typo3/sysext/install/mod/class.tx_install_session.php	(revision 7289)
+++ typo3/sysext/install/mod/class.tx_install_session.php	(working copy)
@@ -75,6 +75,13 @@
 	private $regenerateSessionIdTime = 5;
 
 	/**
+	 * part of the referer when the install tool has been called from the backend
+	 *
+	 * @var string
+	 */
+	private $backendFile = 'backend.php';
+
+	/**
 	 * Constructor. Starts PHP session handling in our own private store
 	 *
 	 * Side-effect: might set a cookie, so must be called before any other output.
@@ -136,6 +143,14 @@
 	 */
 	public function startSession() {
 		$_SESSION['created'] = time();
+
+		$referer = parse_url(t3lib_div::getIndpEnv('HTTP_REFERER'));
+		if (strpos($referer['path'], $this->backendFile)) {
+			$_SESSION['backend'] = TRUE;
+		} else {
+			$_SESSION['backend'] = FALSE;
+		}
+
 		return session_id();
 	}
 
@@ -240,6 +255,18 @@
 	}
 
 	/**
+	 * Check if the install tool is called in the backend
+	 *
+	 * @return boolean True if the install tool has been called from the backend
+	 */
+	public function inBackend() {
+		if ($_SESSION['backend']) {
+			return TRUE;
+		}
+		return FALSE;
+	}
+
+	/**
 	 * Refreshes our session information, rising the expire time.
 	 * Also generates a new session ID every 5 minutes to minimize the risk of
 	 * session hijacking.
Index: typo3/sysext/install/mod/install.css
===================================================================
--- typo3/sysext/install/mod/install.css	(revision 7289)
+++ typo3/sysext/install/mod/install.css	(working copy)
@@ -1,282 +0,0 @@
-/* $Id$ */
-
-body, p, td, a, span, input, .bodytext {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-size: 1em;
-	color: #000;
-	text-align: left;
-	word-wrap: break-word;
-}
-
-h1,
-h2 {
-	font-family: verdana, arial, helvetica, sans-serif;
-	font-weight: bold;
-}
-
-h1 {
-	font-size: 14pt;
-}
-
-h2 {
-	font-size: 12pt;
-}
-
-a {
-	color: #600;
-	text-decoration: none;
-}
-
-a:active {
-	text-decoration: none;
-}
-
-a:hover {
-	color: #006;
-	text-decoration: underline;
-}
-
-table {
-	width: 100%;
-}
-
-th {
-	font-size: 10pt;
-	font-weight: bold;
-}
-
-textarea {
-	width: 99%;
-}
-
-.outerTable {
-	width: 80%;
-	max-width: 900px;
-}
-
-* html .outerTable {
-	width: 900px;
-}
-
-.smallOuterTable {
-	width:600px;
-}
-
-.logo {
-	text-align: center;
-}
-
-.smalltext {
-	font-size: 0.9em;
-	display: inline;
-}
-
-.bodytext {
-	display: inline;
-}
-
-.size3text {
-	font-size: 1.2em;
-}
-
-.size4text {
-	font-size: 1.5em;
-}
-
-.generalTableBackground {
-	background-color: #efeff4;
-}
-
-.activeMenu {
-	background-color: #66a552;
-}
-
-.createBorder {
-	background-color: black;
-}
-
-.editFile {
-	text-align: center;
-	max-width: 900px;
-	width: 80%;
-	margin: auto;
-}
-
-* html .editFile {
-	width: 900px;
-}
-
-.siteInfo {
-	color: navy;
-}
-
-.updateWizardBoxes {
-	border: 1px solid;
-	margin: 10px;
-	padding: 0px 10px 10px;
-}
-
-
-.tcaTableHeader {
-	background-color: #b3b7bd;
-	padding: 2px;
-}
-.tcaTableBackground {
-	background-color: #e4e5f0;
-	padding: 2px;
-}
-
-/* Styles for messages (matching flash messages) */
-
-.typo3-message {
-	padding: 6px;
-	padding-left: 26px;
-	margin-bottom: 4px;
-	background-repeat: no-repeat;
-	background-position: 5px 7px;
-	border: 1px solid;
-}
-.message-notice {
-	background-image: url("../../../gfx/notice.png");
-	background-color: #f6f7fa;
-	border-color: #c2cbcf;
-}
-.message-information {
-	background-image: url("../../../gfx/information.png");
-	background-color: #ddeef9;
-	border-color: #8aafc4;
-}
-.message-ok {
-	background-image: url("../../../gfx/ok.png");
-	background-color: #cdeaca;
-	border-color: #58b548;
-}
-.message-warning {
-	background-image: url("../../../gfx/warning.png");
-	background-color: #fbffb3;
-	border-color: #c4b70d;
-}
-.message-error {
-	background-image: url("../../../gfx/error.png");
-	background-color: #fbb19b;
-	border-color: #dc4c42;
-}
-/* Colors to match above message styles, but without the icon in the background */
-.warning {
-	background-color: #fbffb3;
-}
-.notice {
-	background-color: #f6f7fa;
-}
-
-
-/* Menus */
-#imageMenu,
-#menu {
-	width: 300px;
-	background-color: #b3b7bd;
-}
-
-#imageMenu td.generalTableBackground a,
-#menu td.generalTableBackground a,
-#menu td.activeMenu a {
-	display: block;
-	text-decoration: none;
-}
-
-#imageMenu td.generalTableBackground a:hover,
-#menu td.generalTableBackground a:hover {
-	display: block;
-	background-color: #fa8800;
-	text-decoration: none;
-}
-
-#imageMenu td.activeMenu a span,
-#imageMenu td.generalTableBackground a:hover span,
-#menu td.activeMenu a span,
-#menu td.generalTableBackground a:hover span {
-	color: #fff;
-	text-decoration: none;
-}
-
-#imageMenu td.activeMenu a,
-#menu td.activeMenu a {
-	color: #fff;
-	text-decoration: none;
-}
-
-
-/* phpinfo */
-pre {
-	margin: 0px;
-	font-family: monospace;
-}
-.phpinfo table {
-	border-collapse: collapse;
-}
-.center {
-	text-align: center;
-}
-.center table {
-	margin-left: auto;
-	margin-right: auto;
-	text-align: left;
-}
-
-.center th {
-	text-align: center !important;
-}
-.phpinfo td,
-.phpinfo th {
-	border: 1px solid #000000;
-	font-size: 75%;
-	vertical-align: baseline;
-}
-
-h1 {
-	font-size: 150%;
-}
-
-h2 {
-	font-size: 125%;
-}
-
-.p {
-	text-align: left;
-}
-
-.e {
-	background-color: #ccf;
-	font-weight: bold;
-	color: #000000;
-}
-
-.h {
-	background-color: #99c;
-	font-weight: bold;
-	color: #000000;
-}
-
-.v {
-	background-color: #ccc;
-	color: #000000;
-}
-
-.vr {
-	background-color: #ccc;
-	text-align: right;
-	color: #000000;
-}
-
-.phpinfo img {
-	float: right;
-	border: 0px;
-}
-
-.phpinfo hr {
-	width: 600px;
-	background-color: #ccc;
-	border: 0px;
-	height: 1px;
-	color: #000000;
-}
Index: typo3/sysext/install/mod/install.js
===================================================================
--- typo3/sysext/install/mod/install.js	(revision 7289)
+++ typo3/sysext/install/mod/install.js	(working copy)
@@ -1,49 +0,0 @@
-/***************************************************************
-*
-*  Javascript functions to provide AJAX calls for install tool
-*
-*  Copyright notice
-*
-*  (c) 2009 Marcus Krause, Helmut Hummel 
-*  All rights reserved
-*
-*  This script is part of the TYPO3 backend provided by
-*  Kasper Skaarhoj  together with TYPO3
-*
-*  Released under GNU/GPL (see license file in /typo3/)
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*
-*  This copyright notice MUST APPEAR in all copies of this script
-*
-***************************************************************/
-
-
-/**
- *
- * @author	Marcus Krause
- */
-var EncryptionKey = {
-	thisScript: '../../index.php',
-	eID: 'tx_install_ajax',
-	cmd: 'encryptionKey',
-
-		// loads the ecryption key by an AJAX call
-	load: function(obj) {
-			// fallback if AJAX is not possible (e.g. IE < 6)
-		if (typeof Ajax.getTransport() != 'object') {
-			window.location.href = this.thisScript + '?eID=' + this.eID + '&cmd=' + this.cmd;
-			return;
-		}
-
-		new Ajax.Request(this.thisScript, {
-			method: 'get',
-			parameters: '?eID=' + this.eID + '&cmd=' + this.cmd,
-			onComplete: function(xhr) {
-				document.getElementsByName('TYPO3_INSTALL[localconf.php][encryptionKey]').item(0).value=xhr.responseText;
-			}.bind(this)
-		});
-	}
-};
Index: typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html	(revision 0)
@@ -0,0 +1,39 @@
+
+
+
+
+	
+		
+		Template: Alter Password Form
+	
+	
+		
+		
+			
+				
+					
+						###ENTERPASSWORD###
+						
+					
+					
+						###ENTERAGAIN###
+						
+					
+					
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html	(revision 0)
@@ -0,0 +1,51 @@
+
+
+
+
+	
+		
+		Template: Check ImageMagick
+	
+	
+		
+		
+			
+			
+				
+				
+				
+			
+			
+		###FILE### ###TYPE### ###VERSION###

+		
+		
+		
+		
+			
+				
+					
+						
+						###LZWLABEL###
+					
+					
+						###CHECKPATH###
+						
+					
+					
+						###COMMENT###
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CheckMail.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CheckMail.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CheckMail.html	(revision 0)
@@ -0,0 +1,39 @@
+
+
+
+
+	
+		
+		Template: Check Mail
+	
+	
+		
+		
+		###MESSAGE###
+		
+		
+			
+				
+					
+						###ENTEREMAIL###
+						
+					
+					
+						
+						###USEHTMLMAILLABEL###
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html	(revision 0)
@@ -0,0 +1,35 @@
+
+
+
+
+	
+		
+		Template: Check the database admin user
+	
+	
+		
+		
+			
+				
+					###USERNAME###
+					
+				
+			
+		
+		
+			
+				
+					###PASSWORD###
+					
+				
+				
+					###REPEATPASSWORD###
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html	(revision 0)
@@ -0,0 +1,48 @@
+
+
+
+
+	
+		
+		Template: Check the database cache
+	
+	
+		
+		
+			
+			
+				###TABLENAME###
+			
+			
+		
+		
+		
+		
+		
+			
+				
+				
+				
+				
+					
+						###TABLE###
+					
+					
+						###COUNT###
+					
+					
+						###LABEL###
+					
+				
+				
+				
+				
+				 
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html	(revision 0)
@@ -0,0 +1,50 @@
+
+
+
+
+	
+		
+		Template: Check the database Import
+	
+	
+		
+		
+		
+			
+				
+				
+					
+					
+						
+							###TABLE###
+						
+						
+							###ROWLABEL### ###COUNT###
+						
+						
+							
+							
+							###TABLEEXISTS###
+							
+						
+					
+				
+				
+			
+		
+		
+		
+			
+				
+					
+					
+						###LABEL###
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseMenu.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseMenu.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseMenu.html	(revision 0)
@@ -0,0 +1,117 @@
+
+
+
+
+	
+		
+		Template: Check the database Menu
+	
+	
+		
+		
+			
+				
+				
+				
+				
+			
+			
+				
+				
+				
+				
+			
+			
+				
+			
+			
+			
+				
+				
+				
+				
+			
+			
+			
+				
+				
+			
+			
+				
+				
+			
+			
+				
+				
+			
+			
+				
+				
+			
+		
+					###UPDATEREQUIREDTABLES###
+				 
+					
+						###COMPARE###
+					
+				 
+					 
+				 
+					 
+				

+					###DUMPSTATICDATA###
+				 
+					 
+				 
+					
+						###IMPORT###
+					
+				 
+					 
+				

+					 
+				

+					###FILESHORTNAME### (###FILESIZE###)
+				 
+					
+						###COMPARE###
+					
+				 
+					
+						###IMPORT######SPECS###
+					
+				 
+					
+						###VIEW######SPECS###
+					
+				

+					 
+				 
+					
+						###COMPAREWITHTCA###
+					
+				

+					 
+				 
+					
+						###CREATEADMINUSER###
+					
+				

+					 
+				 
+					
+						###RESETUSERPREFERENCES###
+					
+				

+					 
+				 
+					
+						###CLEARTABLES###
+					
+				
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html	(revision 0)
@@ -0,0 +1,23 @@
+
+
+
+
+	
+		
+		Template: Check the database UC
+	
+	
+		
+		
+			
+				
+					
+					###CLEARBEUSERS###
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html	(revision 0)
@@ -0,0 +1,44 @@
+
+
+
+
+	
+		
+		Template: Clean up manager
+	
+	
+		
+		
+			
+				###NUMBERCACHED###
+			
+			
+				###NUMBER###
+			
+		
+		
+			
+				
+					
+						###CLEANUP###
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html	(revision 0)
@@ -0,0 +1,45 @@
+
+
+
+
+	
+		
+		Template: Display fields compare
+	
+	
+		
+		
+			
+				
+					
+					
+					
+				
+			
+			
+				
+				
+					
+					
+					
+				
+				
+			
+		
+						###HEADERFIELDNAME###
+					 
+						###HEADERSUGGESTED###
+					 
+						###HEADERACTUAL###
+					

+						###FIELDNAME###
+					 
+						###FIELDCONTENT###
+					 
+						###FIELDCONTENTDB###
+					

+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/DisplayFields.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/DisplayFields.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/DisplayFields.html	(revision 0)
@@ -0,0 +1,39 @@
+
+
+
+
+	
+		
+		Template: Display fields
+	
+	
+		
+		
+			
+				
+					
+					
+				
+			
+			
+			
+			
+				
+				
+			
+			
+			
+		
+						###HEADERFIELDNAME###
+					 
+						###HEADERLABEL###
+					

+					###FIELDNAME###
+				 
+					###FIELDCONTENT###
+				

+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html	(revision 0)
@@ -0,0 +1,53 @@
+
+
+
+
+	
+		
+		Template: Display suggestions
+	
+	
+		
+		
+		
+			
+				
+					
+					
+				
+			
+			
+				
+					
+				
+				
+					
+				
+			
+			
+				
+					
+					
+				
+			
+		
+						###HEADERFIELDNAME###
+					 
+						###HEADERLABEL###
+					

+						###HEADERSUGGESTION###
+					

+						
+						###CODE###
+						
+					
+						###FIELDNAME###
+					 
+						###FIELDCONTENT###
+					
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html	(revision 0)
@@ -0,0 +1,112 @@
+
+
+
+
+	
+		
+		Template: Display twin image
+	
+	
+		
+		
+		
+			
+				
+					
+					
+				
+			
+		
+						
+					 
+						
+					
+		
+			
+				
+					
+					
+				
+			
+			
+				
+					
+					
+				
+			
+		
+						###YOURSERVER###
+					 
+						###REFERENCE###
+					

+						###YOURSERVERINFORMATION###
+					 
+						###REFERENCEINFORMATION###
+					
+		
+		
+			
+				
+					
+				
+			
+			
+				
+					
+					
+				
+			
+		
+						###MESSAGE###
+					

+						###YOURSERVERFILESIZE###
+					 
+						###REFERENCEFILESIZE###
+					
+		
+		
+		###MESSAGE###
+		
+		
+		
+			
+				###MESSAGE###
+			
+			

+			###LABEL###
+		
+		
+		
+		
+			###MESSAGE###
+		
+		
+			
+				
+					###COMMANDS###
+				
+			
+		
+		
+		
+		
+		
+			###MESSAGE###
+			

+			###LABEL###
+		
+		
+		
+			
+				
+					###COMMANDS###
+		
+			
+		
+		
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html	(revision 0)
@@ -0,0 +1,41 @@
+
+
+
+
+	
+		
+		Template: Generate config form
+	
+	
+		
+		
+			
+				
+					###DESCRIPTION###
+				
+				
+				
+					###KEY### = ###LABEL###
+					###VALUE###
+				
+				
+				
+				
+					
+					
+					###KEY### = ###LABEL###
+				
+				
+				
+				
+					###KEY### = ###LABEL###
+					
+				
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html	(revision 0)
@@ -0,0 +1,49 @@
+
+
+
+
+	
+		
+		Template: Generate Update Database Form Checkboxes
+	
+	
+		
+		
+			###LABEL###
+			
+				
+				
+					
+					###SELECTDESELECTALL###
+				
+				
+				
+				
+					
+					
+						
+						
+						###ICONTEXT###
+						
+						###STRING###
+						
+						

+						###MESSAGE### ###VALUE###
+						
+					
+				
+				
+				
+				
+				
+					###WARNING###
+				
+				
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/GetUpdateDbFormWrap.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/GetUpdateDbFormWrap.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/GetUpdateDbFormWrap.html	(revision 0)
@@ -0,0 +1,35 @@
+
+
+
+
+	
+		
+		Template: Generate update database form wrap
+	
+	
+		
+		
+			
+				
+					
+						
+					
+				
+			
+			###CONTENT###
+			
+				
+					
+						
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/ImageMenu.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/ImageMenu.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/ImageMenu.html	(revision 0)
@@ -0,0 +1,24 @@
+
+
+
+
+	
+		
+		Template: Image menu
+	
+	
+		
+		
+			
+			
+				
+					###ITEM###
+				
+			
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html	(revision 0)
@@ -0,0 +1,32 @@
+
+
+
+
+	
+		
+		Template: Init ext config
+	
+	
+		
+		
+			###CONTENT###
+			
+				
+					
+						
+					
+					
+						###NOTICE### 
+						###EXPLANATION###
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/Install.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/Install.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/Install.html	(revision 0)
@@ -0,0 +1,70 @@
+
+
+
+
+	
+		
+		###HEADTITLE###
+		###JAVASCRIPT###
+		###STYLESHEETS###
+	
+	
+		###CONTENTBEFORETABLE###
+		
+			###TITLE###
+			###HEADTITLE###
+			
+				
+				 
+				
+					
+					
+						
+							###ITEM###
+						
+					
+					
+				
+				 
+				
+				
+					
+						
+							###BACKEND###
+						
+					
+					
+						
+							###FRONTEND###
+						
+					
+				
+			
+			
+				 
+				
+					
+					
+						###LLERRORS###
+						
+							
+							
+								###MESSAGE###
+							
+							
+						
+					
+					
+					
+					
+				
+				 
+			
+			
+				###COPYRIGHT###
+			
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/Install_123.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/Install_123.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/Install_123.html	(revision 0)
@@ -0,0 +1,40 @@
+
+
+
+
+	
+		
+		###HEADTITLE###
+		###JAVASCRIPT###
+		###STYLESHEETS###
+	
+	
+		###CONTENTBEFORETABLE###
+		
+			###TITLE###
+			 
+			###HEADTITLE###
+			
+				
+				
+					
+					
+						
+							###ITEM###
+						
+					
+					
+				
+				
+				
+				
+			
+			 
+			
+				###COPYRIGHT###
+			
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/Install_login.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/Install_login.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/Install_login.html	(revision 0)
@@ -0,0 +1,20 @@
+
+
+
+
+	
+		
+		###HEADTITLE###
+		###JAVASCRIPT###
+		###STYLESHEETS###
+	
+	
+		
+			###TITLE###
+			
+			
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/LoginForm.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/LoginForm.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/LoginForm.html	(revision 0)
@@ -0,0 +1,62 @@
+
+
+
+
+	
+		
+		Template: Login Form
+	
+	
+		
+		 
+		###HEADTITLE###
+		
+			###SITENAME###
+			
+				
+					
+						
+							###ENTERPASSWORD###
+							
+						
+						
+							
+						
+					
+				
+				
+					
+						
+							
+						
+					
+				
+			
+		
+		 
+		
+		
+			###PASSWORDMESSAGE###
+			

+			###PASSWORD###
+		
+		
+		
+		
+			###MESSAGE###
+		
+		
+		###MESSAGE###
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/PhpInformation.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/PhpInformation.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/PhpInformation.html	(revision 0)
@@ -0,0 +1,25 @@
+
+
+
+
+	
+		
+		Template: PHP information
+	
+	
+		
+		
+			###EXPLANATION###
+		
+		
+			
+				
+					###DEBUGINFO###
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/PrintAll.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/PrintAll.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/PrintAll.html	(revision 0)
@@ -0,0 +1,23 @@
+
+
+
+
+	
+		
+		Template: Print All
+	
+	
+		
+			
+				
+				
+				###HEADER###
+				###SECTIONCONTENT###
+				
+				
+			
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/PrintSection.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/PrintSection.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/PrintSection.html	(revision 0)
@@ -0,0 +1,19 @@
+
+
+
+
+	
+		
+		Template: Print Section
+	
+	
+		
+		###SHORTSTRING###
+		
+		###LONGSTRING###
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/SetupGeneral.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/SetupGeneral.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/SetupGeneral.html	(revision 0)
@@ -0,0 +1,257 @@
+
+
+
+
+	
+		
+		Template: Setup General
+	
+	
+		
+		
+			
+			
+				
+					
+						###LABELUSERNAME###
+						
+					
+					
+					
+						###LABELSQLSAFEMODEUSER###
+						

+						
+							###SQLSAFEMODEUSER###
+						
+					
+					
+					
+						###LABELPASSWORD###
+						
+					
+					
+						###LABELHOST###
+						
+					
+				
+			
+			
+			
+				
+					
+					
+						###LABELDATABASE###
+						
+					
+					
+						###LABELCREATEDATABASE###
+						
+					
+					
+					
+					
+						###LABELDATABASE###
+						
+							###TYPO3DB###
+						
+						

+						###LABELNODATABASE###
+						
+					
+					
+				
+			
+			
+			
+			
+			
+				
+					
+						###LABELSITENAME###
+						
+					
+				
+			
+			
+				
+					
+						###LABELENCRYPTIONKEY###
+						
+							
+							

+							
+						
+					
+				
+			
+			
+			
+				
+					
+						###LABELDISABLEEXECFUNCTION###
+						
+							###STRONGDISABLEEXECFUNCTION###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTDISABLEEXECFUNCTION###
+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELGDLIB###
+						
+							###STRONGGDLIB###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTGDLIB###
+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELGDLIBPNG###
+						
+							###STRONGGDLIBPNG###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTGDLIBPNG###
+							

+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELIMAGEMAGICK###
+						
+							###STRONGIMAGEMAGICK###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTIMAGEMAGICK###
+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELIMCOMBINEFILENAME###
+						
+							###STRONGIMCOMBINEFILENAME###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTIMCOMBINEFILENAME###
+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELIMVERSION5###
+						
+							###STRONGIMVERSION5###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTIMVERSION5###
+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELIMPATH###
+						
+							###STRONGIMPATH###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTIMPATH###
+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELIMPATHLZW###
+						
+							###STRONGIMPATHLZW###
+							

+							###LABELCURRENTVALUEIS### ###DEFAULTIMPATH###
+							

+							
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						###LABELTTFDPI###
+						
+					
+				
+			
+			
+			
+			
+				
+					
+						
+					
+					
+						###LABELNOTICE### 
+						###LABELCOMMENTUPDATELOCALCONF###
+					
+				
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/StepHeader.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/StepHeader.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/StepHeader.html	(revision 0)
@@ -0,0 +1,24 @@
+
+
+
+
+	
+		
+		Template: Step Header
+	
+	
+		
+		
+			
+			
+				
+					###STEP###
+				
+			
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/StepOutput.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/StepOutput.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/StepOutput.html	(revision 0)
@@ -0,0 +1,162 @@
+
+
+
+
+	
+		
+		Template: Step Output
+	
+	
+		
+		###STEPHEADER###
+		###HEADER###
+		###STEP###
+		
+			
+				###NOTICE###
+			
+		
+		
+		
+		
+		###LLINTRODUCTION###
+		
+			
+				
+					
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+		
+		
+		
+			
+				
+					
+						
+						
+						
+					
+					
+						###LABELUSERNAME###
+						
+					
+					
+						###LABELPASSWORD###
+						
+					
+					
+						###LABELHOST###
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+		
+		
+		###LLOPTIONS###
+		
+			
+				
+					
+						
+					
+					
+						###LLOPTION1###
+						###LLREMARK1###
+						
+					
+					
+						###LLOPTION2###
+						###LLREMARK2###
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+		
+		
+		###LLSUMMARY###
+		
+			###LLUSERNAME###
+			###USERNAME###
+			###LLHOST###
+			###HOST###
+			###LLDATABASE###
+			###DATABASE###
+			###LLNUMBERTABLES###
+			###NUMBERTABLES###
+		
+		
+			
+				
+					
+						
+						
+						
+						
+					
+					
+						###LLDATABASETYPE###
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+
+		
+		###MESSAGEBASICFINISHED###
+		###LLIMPORTANT###
+		###SECURITYRISK###
+		###LLSWITCHMODE###
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/Typo3ConfEdit.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/Typo3ConfEdit.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/Typo3ConfEdit.html	(revision 0)
@@ -0,0 +1,101 @@
+
+
+
+
+	
+		
+		Template: TYPO3 Conf Edit
+	
+	
+		
+		
+			
+			
+				
+					###FILENAME###
+				
+			
+			
+				###FILESIZE### 
+			
+			
+		
+		
+			###EDITPATH###
+		
+		
+		
+			
+				
+					
+						###PATHSITE###
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+		
+			
+				###DELETETEMPCACHED###
+			
+		
+		
+		
+			###LLEDITING### ###FILE###
+		
+		###MESSAGES###
+		
+			###MD5SUM###
+		
+		
+			
+				
+					
+						
+						
+						
+						
+						
+					
+					
+						###FILECONTENT###
+					
+				
+			
+			
+				
+					
+						
+						###WINTOUNIXBR###
+					
+					
+						
+						###BACKUP###
+					
+				
+			
+			
+				
+					
+						
+						
+						
+						
+					
+				
+			
+		
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/Typo3TempManager.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/Typo3TempManager.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/Typo3TempManager.html	(revision 0)
@@ -0,0 +1,73 @@
+
+
+
+
+	
+		
+		Template: TYPO3 Temp Manager
+	
+	
+		
+		
+			
+				###NUMBERTEMPORARY###
+			
+			
+				###TEMPORARY###
+			
+			
+				###NUMBERMATCHING###
+			
+			
+				###MATCHING### ###DELETETYPE###
+			
+			
+				###NUMBERDELETED###
+			
+			
+				###DELETED###
+			
+		
+		
+			
+				
+					
+						###DELETECONDITION###
+						
+					
+					
+						###NUMBERFILES###
+						
+					
+					
+						###FROMSUBDIRECTORY###
+						
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		###EXPLANATION###
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/UpdateWizardParts.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/UpdateWizardParts.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/UpdateWizardParts.html	(revision 0)
@@ -0,0 +1,140 @@
+
+
+
+
+	
+		
+		Template: Update wizard parts
+	
+	
+		
+		
+		
+		
+			
+				
+					
+						
+					
+				
+			
+			
+			###IDENTIFIER###
+			###EXPLANATION###
+			
+				
+					
+						
+					
+				
+			
+			
+		
+		
+		###FINALSTEP###
+		###FINALSTEPEXPLANATION###
+		###COMPAREDATABASE### 
+		
+		
+		
+		
+		
+			
+				
+					
+						
+					
+				
+			
+			
+				
+					###INTRODUCTION###
+				
+			
+			
+			
+				
+					###NOUPDATES###
+				
+			
+			
+			
+			
+				
+					
+						
+					
+				
+			
+			
+				
+					###IDENTIFIER###
+				
+			
+			###IDENTIFIERMETHOD###
+			
+			
+				
+					
+						
+						###SHOWDATABASEQUERIES###
+					
+				
+			
+			
+				
+					
+						
+					
+				
+			
+		
+		
+		
+		
+			
+			
+				
+					###IDENTIFIER###
+				
+			
+				
+				###CUSTOMOUTPUT###
+				

+				

+				
+					###GOBACK###
+				
+				
+				
+				
+					###UPDATESTATUS###
+				
+				
+				

+				###QUERY###
+				
+				
+				
+				

+				###CUSTOM###
+				
+				
+				
+				
+				
+					###NOUPDATEMETHOD###
+				
+				
+			
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/ViewArray.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/ViewArray.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/ViewArray.html	(revision 0)
@@ -0,0 +1,25 @@
+
+
+
+
+	
+		
+		Template: View Array
+	
+	
+		
+		
+			
+			
+				###KEY###
+			
+			
+				###DESCRIPTION###
+			
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Private/Templates/WriteToLocalConfControl.html
===================================================================
--- typo3/sysext/install/Resources/Private/Templates/WriteToLocalConfControl.html	(revision 0)
+++ typo3/sysext/install/Resources/Private/Templates/WriteToLocalConfControl.html	(revision 0)
@@ -0,0 +1,37 @@
+
+
+
+
+	
+		
+		Template: Write to localconf control
+	
+	
+		
+		###HEADER###
+		
+			
+			
+				###MESSAGE###
+			
+			
+		
+		
+			
+				###LABEL###
+			
+		
+		
+		
+		###HEADER###
+		###MESSAGE###
+		
+			
+				###LABEL###
+			
+		
+		
+	
+
\ No newline at end of file
Index: typo3/sysext/install/Resources/Public/Images/body-background.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\body-background.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/button-background.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\button-background.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/content-background.jpg
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\content-background.jpg
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/content-bottom.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\content-bottom.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/content-top.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\content-top.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/input-background.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\input-background.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/login-icon-key.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\login-icon-key.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\logo.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuAbout.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuAbout.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuBackground.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuBackground.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuCleanup.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuCleanup.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuConfig.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuConfig.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuDatabase.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuDatabase.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuExtConfig.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuExtConfig.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuImages.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuImages.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuPhpinfo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuPhpinfo.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuTypo3confEdit.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuTypo3confEdit.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuTypo3temp.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuTypo3temp.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/menuUpdate.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\menuUpdate.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Images/numbers.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: typo3\sysext\install\Resources\Public\Images\numbers.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: typo3/sysext/install/Resources/Public/Javascript/install.js
===================================================================
--- typo3/sysext/install/Resources/Public/Javascript/install.js	(revision 0)
+++ typo3/sysext/install/Resources/Public/Javascript/install.js	(revision 0)
@@ -0,0 +1,49 @@
+/***************************************************************
+*
+*  Javascript functions to provide AJAX calls for install tool
+*
+*  Copyright notice
+*
+*  (c) 2009 Marcus Krause, Helmut Hummel 
+*  All rights reserved
+*
+*  This script is part of the TYPO3 backend provided by
+*  Kasper Skaarhoj  together with TYPO3
+*
+*  Released under GNU/GPL (see license file in /typo3/)
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*
+*  This copyright notice MUST APPEAR in all copies of this script
+*
+***************************************************************/
+
+
+/**
+ *
+ * @author	Marcus Krause
+ */
+var EncryptionKey = {
+	thisScript: '../../index.php',
+	eID: 'tx_install_ajax',
+	cmd: 'encryptionKey',
+
+		// loads the ecryption key by an AJAX call
+	load: function(obj) {
+			// fallback if AJAX is not possible (e.g. IE < 6)
+		if (typeof Ajax.getTransport() != 'object') {
+			window.location.href = this.thisScript + '?eID=' + this.eID + '&cmd=' + this.cmd;
+			return;
+		}
+
+		new Ajax.Request(this.thisScript, {
+			method: 'get',
+			parameters: '?eID=' + this.eID + '&cmd=' + this.cmd,
+			onComplete: function(xhr) {
+				document.getElementsByName('TYPO3_INSTALL[localconf.php][encryptionKey]').item(0).value=xhr.responseText;
+			}.bind(this)
+		});
+	}
+};
Index: typo3/sysext/install/Resources/Public/Stylesheets/general.css
===================================================================
--- typo3/sysext/install/Resources/Public/Stylesheets/general.css	(revision 0)
+++ typo3/sysext/install/Resources/Public/Stylesheets/general.css	(revision 0)
@@ -0,0 +1,342 @@
+@CHARSET "UTF-8";
+
+/* Font size 62.8% = 1em = 10px */
+body {
+	font: 62.8% Verdana, Arial, Helvetica, sans-serif;
+}
+
+p, form, fieldset, h3, h4, h5, h6, dl { 
+	margin: 1em 0 1em 0;
+}
+
+ol, ul { 
+	margin: 1em 0 1em 1.5em;
+	padding: 0 0 0 1em;
+}
+
+ul { 
+	list-style:disc;
+}
+
+ol { 
+	list-style: decimal;
+}
+
+h2 {
+	margin: 2.5em 0 1.7em 0.8em;
+	color: #585858;
+	font-size: 120%;
+	font-weight: bold;
+}
+
+h3 {
+	font-size: 120%;
+	margin: 0.7em 0 1.5em
+}
+
+.clearfix:after { 
+	content: "."; 
+	display: block; 
+	height: 0; 
+	clear: both; 
+	visibility: hidden;
+}
+
+* html .clearfix { 
+	height: 1%; 
+}
+
+legend {
+	margin-left: 1em;
+	font-weight: bold;
+}
+
+fieldset ol {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+fieldset li {
+	margin-bottom: 0.5em;
+	float: left;
+	clear: left;
+	width: 100%;
+}
+
+label {
+	float: left;
+	width: 18em;
+	margin-right: 1em;
+	padding: 0.2em 0;
+}
+
+fieldset span {
+	float: left;
+	width: 29em;
+}
+
+.labelAfter input {
+	float: left;
+}
+
+.labelAfter label,
+.labelAbove label {
+	float: none;
+	display: block;
+	width: auto;
+	margin-right: 0;
+}
+
+.labelAbove label {
+	margin-bottom: 0.5em;
+}
+
+.labelAfter label {
+	padding-left: 3em;
+}
+
+.labelWidth7 label {
+	width: 7em;
+}
+
+.labelWidth21 label {
+	width: 21em;
+}
+
+fieldset.submit {
+	float: none;
+	width: auto;
+}
+
+fieldset select,
+input.inputText,
+textarea {
+	background: url('../Images/input-background.gif') repeat-x scroll 0 0 #FFFFFF;
+	border: 1px solid #7C7C7C;
+	color: #000000;
+	font-size: 1.1em;
+	line-height: 1.7em;
+	margin: 0;
+	width: 14.7em;
+}
+
+fieldset select {
+	height: 2em;
+	padding: 0.2em;
+	width: 17.4em;
+}
+
+input.inputText {
+	height: 1.7em;
+	padding: 0.1em 2.1em 0 0.45em;
+}
+
+textarea {
+	width: 99%;
+	font-size: 1.2em;
+}
+
+button {
+	color: #606060;
+	font-size: 1.1em;
+	padding: 0.3em 0.6em;
+	border: 1px solid #7c7c7c;
+	background: #f6f6f6 url('../Images/button-background.jpg') repeat-x left bottom;
+	cursor: pointer;
+}
+
+button span {
+	background-repeat: no-repeat;
+	display: inline-block;
+	width: 16px;
+	height: 16px;
+	margin-left: 0.6em;
+	float: none;
+}
+
+button span.negative {
+	background-image: url('../../../../../gfx/error.png');
+}
+
+button span.positive {
+	background-image: url('../../../../../gfx/ok.png');
+}
+
+.hidden {
+	display: none;
+}
+
+.strong {
+	font-weight: bold;
+}
+
+#container {
+	width: 76em;
+	margin: 1em auto;
+}
+
+#left {
+	float: left;
+	width: 19em;
+	clear: both;
+}
+
+#right {
+	padding-left: 19em;
+	width: 57em;
+}
+
+#menu {
+	margin: 0;
+	padding: 0.5em 0;
+	list-style: none;
+	width: 16em;
+	font-size: 110%;
+	line-height: 2em;
+}
+
+#menu li {
+	padding: 0 0 0 2.8em;
+}
+
+#menu li.act {
+	background-color: #585858;
+}
+
+#menu a {
+	color: #606060;
+	text-decoration: none;
+}
+
+#menu a:hover {
+	text-decoration: underline;
+}
+
+#menu li.act a {
+	font-weight: bold;
+	color: #ffffff;
+}
+
+#menu li {
+	background-repeat: no-repeat;
+	background-position: 0.7em center;
+}
+
+#menu #config {
+	background-image: url('../Images/menuConfig.png');
+}
+
+#menu #database {
+	background-image: url('../Images/menuDatabase.png');
+}
+
+#menu #update {
+	background-image: url('../Images/menuUpdate.png');
+}
+
+#menu #images {
+	background-image: url('../Images/menuImages.png');
+}
+
+#menu #extConfig {
+	background-image: url('../Images/menuExtConfig.png');
+}
+
+#menu #typo3temp {
+	background-image: url('../Images/menuTypo3temp.png');
+}
+
+#menu #cleanup {
+	background-image: url('../Images/menuCleanup.png');
+}
+
+#menu #phpinfo {
+	background-image: url('../Images/menuPhpinfo.png');
+}
+
+#menu #typo3conf_edit {
+	background-image: url('../Images/menuTypo3confEdit.png');
+}
+
+#menu #about {
+	background-image: url('../Images/menuAbout.png');
+}
+
+#links {
+	margin: 2em 0 0 0.8em;
+	padding: 0;
+	list-style: none;
+	width: 15.2em;
+	font-size: 110%;
+	line-height: 2em;
+}
+
+#links a {
+	color: #797878;
+	text-decoration: none;
+}
+
+#links a:hover {
+	text-decoration: underline;
+}
+
+#content {
+	font-size: 110%;
+	line-height: 1.5em;
+	padding: 0.1em 1.8em 1em 1.8em;
+	color: #606060;
+}
+
+.typo3-message {
+	padding: 0.6em 0.6em 0.6em 2.6em;
+	background-repeat: no-repeat;
+	background-position: 0.5em 0.7em;
+	border: 1px solid;
+	color: #000000;
+}
+
+.typo3-message h4 {
+	margin-top: 0;
+}
+
+.message-notice {
+	background-image: url("../../../../../gfx/notice.png");
+	background-color: #f6f7fa;
+	border-color: #c2cbcf;
+}
+
+.message-information {
+	background-image: url("../../../../../gfx/information.png");
+	background-color: #ddeef9;
+	border-color: #8aafc4;
+}
+
+.message-ok {
+	background-image: url("../../../../../gfx/ok.png");
+	background-color: #cdeaca;
+	border-color: #58b548;
+}
+
+.message-warning {
+	background-image: url("../../../../../gfx/warning.png");
+	background-color: #fbffb3;
+	border-color: #c4b70d;
+}
+
+.message-error {
+	background-image: url("../../../../../gfx/error.png");
+	background-color: #fbb19b;
+	border-color: #dc4c42;
+}
+
+#copyright {
+	color: #797878;
+	border-top: 1px #5f5f5f solid;
+	margin-top: 3.7em;
+	clear: both;
+}
+
+#copyright a {
+	color: #797878;
+}
\ No newline at end of file
Index: typo3/sysext/install/Resources/Public/Stylesheets/install.css
===================================================================
--- typo3/sysext/install/Resources/Public/Stylesheets/install.css	(revision 0)
+++ typo3/sysext/install/Resources/Public/Stylesheets/install.css	(revision 0)
@@ -0,0 +1,385 @@
+@CHARSET "UTF-8";
+
+body {
+	background-color: #f2f2f2;
+}
+
+h1,
+#menuTop,
+#menuBottom,
+#links,
+#contentTop,
+#contentBottom,
+#copyright {
+	display: none;
+}
+
+#content,
+#menu {
+	border: 1px #dcdcdc solid;
+	background-color: #ffffff;
+}
+
+/* 0: Login form */
+
+/* 1: Basic configuration */
+#checkImageMagick label {
+	width: 27em;
+}
+
+#systemInformation dt {
+	float: left;
+	width: 11em;
+}
+
+#systemInformation dd {
+	padding-left: 11em;
+	font-weight: bold;
+}
+
+#imageMagickVersions td {
+	padding-right: 1em;
+}
+
+/* 2: Database Analyzer */
+#databaseMenu {
+	width: 100%;
+}
+
+#databaseConnected dt,
+#checkTheDatabaseExplanation dt {
+	float: left;
+	width: 7em;
+}
+
+#databaseConnected dd,
+#checkTheDatabaseExplanation dd {
+	padding-left: 7em;
+}
+
+#databaseConnected dd,
+#checkTheDatabaseExplanation dt {
+	font-weight: bold;
+}
+
+#checkTheDatabaseImport label span,
+#checkTheDatabaseCache label span {
+	float: none;
+	display: inline-block;
+	vertical-align: top;
+}
+
+#checkTheDatabaseImport label span {
+	width: 32%;
+}
+
+#checkTheDatabaseCache label span.column1 {
+	width: 27%;
+}
+#checkTheDatabaseCache label span.column3 {
+	width: 56%;
+}
+
+#checkTheDatabaseCache label span.column2 {
+	width: 15%;
+}
+
+.displayFields,
+.displaySuggestions,
+.displayFieldsCompare {
+	width: 100%;
+	margin-bottom: 1em;
+}
+
+.displayFields th,
+.displaySuggestions th,
+.displayFieldsCompare th {
+	text-align: left;
+	background-color: #B3B7BD;
+}
+
+.displaySuggestions .tfootHeader {
+	font-weight: bold;
+	background-color: #d0d0d0;
+}
+
+.displayFields th,
+.displayFields td,
+.displaySuggestions th,
+.displaySuggestions td,
+.displayFieldsCompare th,
+.displayFieldsCompare td {
+	padding: 0.2em;
+}
+
+.displayFields thead,
+.displayFields tbody,
+.displaySuggestions thead,
+.displaySuggestions tfoot,
+.displaySuggestions tbody,
+.displayFieldsCompare thead,
+.displayFieldsCompare tbody {
+	border: 1px #B3B7BD solid;
+}
+
+.displayFields .column1,
+.displaySuggestions .column1 {
+	width: 35%;
+}
+
+.displaySuggestions tr {
+	border-top: 1px #B3B7BD solid;
+}
+
+.displaySuggestions pre {
+	font-size: 110%;
+}
+
+.displayFieldsCompare .warning {
+	color: red;
+}
+
+/* 4: Image processing */
+#imageProcessingIm dt,
+#imageProcessingOther dt,
+#imageProcessingFileFormats dt {
+	float: left;
+	width: 19em;
+}
+
+#imageProcessingIm dd,
+#imageProcessingOther dd,
+#imageProcessingFileFormats dd {
+	font-weight: bold;
+	padding-left: 19em;
+}
+
+#imageProcessingIm dd span,
+#imageProcessingOther dd span,
+#imageProcessingFileFormats dd span {
+	font-weight: normal;
+}
+
+.displayTwinImageTextarea {
+	width: 48em; 
+	overflow: scroll;
+	border: 1px #797878 solid;
+}
+
+.displayTwinImageTextarea textarea {
+	width: 300em; 
+	border: 0;
+}
+
+.displayTwinImageImages,
+.displayTwinImageReference,
+.displayTwinImageDifferentFileSize {
+	width: 100%;
+	margin: 0.3em 0;
+}
+
+.displayTwinImageImages td,
+.displayTwinImageReference th,
+.displayTwinImageReference td,
+.displayTwinImageDifferentFileSize th,
+.displayTwinImageDifferentFileSize td {
+	text-align: center;
+}
+
+/* 5: All configuration */
+
+/* 6: typo3temp/ */
+#tempManagerNumbers dt {
+	float: left;
+	width: 19em;
+}
+
+#tempManagerNumbers dd {
+	font-weight: bold;
+	padding-left: 19em;
+}
+
+#tempManagerNumbers dd span {
+	font-weight: normal;
+}
+
+/* 7: Clean up database */
+#cleanupManagerNumbers dt {
+	float: left;
+	width: 19em;
+}
+
+#cleanupManagerNumbers dd {
+	font-weight: bold;
+	padding-left: 19em;
+}
+
+#cleanupManagerNumbers dd span {
+	font-weight: normal;
+}
+
+/* 8: phpinfo() */
+#debugInformation {
+	width: 48em; 
+	height: 20em; 
+	overflow: scroll;
+	border: 1px #797878 solid;
+}
+
+#debugInformation textarea {
+	width: 200em; 
+	height: 68em;
+	border: 0;
+}
+
+.viewArray {
+	border: 1px solid #B3B7BD;
+	border-bottom: 0;
+}
+
+.viewArray .viewArray {
+	border: 0;
+}
+
+.viewArray dt {
+	float: left;
+	width: 19em;
+	font-weight: bold;
+}
+
+.viewArray dd {
+	padding-left: 19em;
+	border-bottom: 1px #d0d0d0 solid
+}
+
+.viewArray .viewArray dt {
+	width: 10em;
+}
+
+.viewArray .viewArray dd {
+	padding-left: 10em;
+	border: 0;
+}
+
+.viewArray dl {
+	margin: 0;
+}
+
+.phpinfo pre {
+	margin: 0px;
+	font-family: monospace;
+}
+
+.phpinfo table {
+	border-collapse: collapse;
+	width: 100%;
+	table-layout: fixed;
+}
+
+.phpinfo .center table {
+	margin-left: auto;
+	margin-right: auto;
+	text-align: left;
+}
+
+.phpinfo .center th {
+	text-align: center !important;
+}
+
+.phpinfo td,
+.phpinfo th {
+	border: 1px solid #000000;
+	vertical-align: baseline;
+	padding: 0.3em;
+	overflow: hidden;
+}
+
+.phpinfo h1 {
+	font-size: 150%;
+	background-image: none;
+	text-indent: 0;
+	height: auto;
+	color: #000000;
+	margin: 1em 0 1em 0;
+	text-align: center;
+	float: none;
+}
+
+.phpinfo h2 {
+	margin: 1em 0 1em 0;
+	color: #000000;
+	padding: 0;
+	text-align: center;
+	background-color: transparent;
+	float: none;
+}
+
+.phpinfo .p {
+	text-align: left;
+}
+
+.phpinfo .e {
+	background-color: #ccf;
+	font-weight: bold;
+	color: #000000;
+}
+
+.phpinfo .h {
+	background-color: #99c;
+	font-weight: bold;
+	color: #000000;
+}
+
+.phpinfo .v {
+	background-color: #ccc;
+	color: #000000;
+}
+
+.phpinfo .vr {
+	background-color: #ccc;
+	text-align: right;
+	color: #000000;
+}
+
+.phpinfo img {
+	float: right;
+	border: 0px;
+}
+
+.phpinfo hr {
+	background-color: #ccc;
+	border: 0px;
+	height: 1px;
+	color: #000000;
+}
+
+/* 9: Edit files in typo3conf/ */
+#confEditFileList dt {
+	float: left;
+	width: 45em;
+}
+
+#confEditFileList dd {
+	padding-left: 45em;
+}
+
+#confEditFileList dt a {
+	color: blue;
+	text-decoration: none;
+}
+
+#confEditFileList dt a:hover {
+	text-decoration: underline;
+}
+
+#confEditFileList dt.act a {
+	font-weight: bold;
+}
+
+#fileEdit textarea {
+	height: 10em;
+	width: 99%;
+	padding: 0;
+}
+
+/* 10: About */
\ No newline at end of file
Index: typo3/sysext/install/Resources/Public/Stylesheets/install_123.css
===================================================================
--- typo3/sysext/install/Resources/Public/Stylesheets/install_123.css	(revision 0)
+++ typo3/sysext/install/Resources/Public/Stylesheets/install_123.css	(revision 0)
@@ -0,0 +1,201 @@
+@CHARSET "UTF-8";
+
+/* Font size 62.8% = 1em = 10px */
+body {
+	background: #4f4f4f url('../Images/body-background.jpg') repeat-x fixed;
+}
+
+#container {
+	width: 43em;
+	margin-left: 16em;
+}
+
+h1 {
+	background: url('../Images/logo.gif') no-repeat scroll 0 0 transparent;
+	text-indent:-999em;
+	margin: 2em 0 3.7em 0;
+	height: 34px;
+}
+
+h2 {
+	background-color: #585858;
+	font-size: 120%;
+	font-weight: bold;
+	color: #ffffff;
+	padding: 0.5em 1.8em 0.5em 1.8em;
+	margin: 0;
+}
+
+h3 {
+	font-size: 163%;
+}
+
+#contentTop {
+	height: 3px;
+	background: #3e3e3e url('../Images/content-top.png') no-repeat center bottom;
+}
+
+#contentBottom {
+	height: 3px;
+	background: #4d4c4d url('../Images/content-bottom.png') no-repeat center top;
+}
+
+#content {
+	color: #787878;
+	background: #ebebeb url('../Images/content-background.jpg') repeat-x left bottom;
+	padding: 1em 1.8em 1em;
+}
+
+/* 1-2-3 General */
+#stepHeader {
+	list-style: none;
+	margin: 1em 0 0;
+	padding: 0;
+}
+
+#stepHeader li {
+	float: left;
+	text-indent:-999em;
+	width: 35px;
+	height: 35px;
+	margin-right: 1.1em;
+	background: url('../Images/numbers.png') no-repeat scroll 0 0 transparent;
+}
+
+#stepHeader li a {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+#stepHeader li.step1 {
+	background-position: 0 0;
+}
+
+#stepHeader li.step1.act {
+	background-position: 0 center;
+}
+
+#stepHeader li.step1.done {
+	background-position: 0 bottom;
+}
+
+#stepHeader li.step2 {
+	background-position: -35px 0;
+}
+
+#stepHeader li.step2.act {
+	background-position: -35px center;
+}
+
+#stepHeader li.step2.done {
+	background-position: -35px bottom;
+}
+
+#stepHeader li.step3 {
+	background-position: -70px 0;
+}
+
+#stepHeader li.step3.act {
+	background-position: -70px center;
+}
+
+#stepHeader li.step3.done {
+	background-position: -70px bottom;
+}
+
+#stepHeader li.step4 {
+	background-position: -105px 0;
+}
+
+#stepHeader li.step4.act {
+	background-position: -105px center;
+}
+
+#stepHeader li.step4.done {
+	background-position: -105px bottom;
+}
+
+#stepHeader li.step5 {
+	background-position: -140px 0;
+}
+
+#stepHeader li.step5.act {
+	background-position: -140px center;
+}
+
+#stepHeader li.step5.done {
+	background-position: -140px bottom;
+}
+
+#stepHeader li.step6 {
+	background-position: -175px 0;
+}
+
+#stepHeader li.step6.act {
+	background-position: -175px center;
+}
+
+#stepHeader li.step6.done {
+	background-position: -175px bottom;
+}
+
+#stepHeader li.step7 {
+	background-position: -210px 0;
+}
+
+#stepHeader li.step7.act {
+	background-position: -210px center;
+}
+
+#stepHeader li.step7.done {
+	background-position: -210px bottom;
+}
+
+#stepHeader li.step8 {
+	background-position: -245px 0;
+}
+
+#stepHeader li.step8.act {
+	background-position: -245px center;
+}
+
+#stepHeader li.step8.done {
+	background-position: -245px bottom;
+}
+
+#skip123 {
+	text-align: right;
+	font-size: 0.91em;
+}
+
+#skip123 a {
+	color: #888888;
+	text-decoration: none;
+}
+
+#skip123 a:hover {
+	text-decoration: underline;
+}
+
+/* 1-2-3: Step 3 */
+#step3 label {
+	float: none;
+	font-weight: bold;
+}
+
+#step3 p {
+	margin: 0 0 0.5em;
+}
+
+/* 1-2-3: Step 4 */
+#stepOutputSummary dt {
+	float: left;
+	clear: both;
+	width: 15em;
+	margin-right: 1em;
+}
+
+#stepOutputSummary dd {
+	float: left;
+}
\ No newline at end of file
Index: typo3/sysext/install/Resources/Public/Stylesheets/install_login.css
===================================================================
--- typo3/sysext/install/Resources/Public/Stylesheets/install_login.css	(revision 0)
+++ typo3/sysext/install/Resources/Public/Stylesheets/install_login.css	(revision 0)
@@ -0,0 +1,49 @@
+@CHARSET "UTF-8";
+
+body {
+	background-color: #f2f2f2;
+}
+
+#container {
+	width: 43em;
+	margin: 1em auto;
+}
+
+h1,
+#contentTop,
+#contentBottom {
+	display: none;
+}
+
+.login h1 {
+	float: none;
+}
+
+.login h2 {
+	background: url('../Images/login-icon-key.gif') no-repeat scroll 1em center #585858;
+	color: #ffffff;
+	font-size: 120%;
+	padding:0.5em 0 0.5em 3.35em;
+	margin: 0;
+}
+
+h3 {
+	margin: 1em 0 2em 0;
+}
+
+#content {
+	border: 1px #dcdcdc solid;
+	border-top: 0;
+	color: #606060;
+	background-color: #eeeeee;
+	padding: 1em 3.6em 1em;
+}
+
+.typo3-message {
+	font-size: 110%;
+	line-height: 1.5em;
+}
+
+.message-information {
+	color: #64859c;
+}
\ No newline at end of file
Index: typo3/sysext/install/Resources/Public/Stylesheets/install_standalone.css
===================================================================
--- typo3/sysext/install/Resources/Public/Stylesheets/install_standalone.css	(revision 0)
+++ typo3/sysext/install/Resources/Public/Stylesheets/install_standalone.css	(revision 0)
@@ -0,0 +1,70 @@
+@CHARSET "UTF-8";
+
+body {
+	background: #4f4f4f url('../Images/body-background.jpg') repeat-x fixed;
+}
+
+#container {
+	margin: 0 auto;
+}
+
+h1,
+#menuTop,
+#menuBottom,
+#links,
+#contentTop,
+#contentBottom,
+#copyright {
+	display: block;
+}
+
+h1 {
+	background: url('../Images/logo.gif') no-repeat scroll 0 0 transparent;
+	text-indent:-999em;
+	margin: 2em 0 3.7em 0;
+	height: 34px;
+	width: 19em;
+	float: left;
+}
+
+h2 {
+	padding: 3.3em 0 3.7em 17.5em;
+	margin: 0;
+	height: auto;
+	color: #ffffff;
+}
+
+#contentTop {
+	height: 3px;
+	background: #3e3e3e url('../Images/content-top.png') no-repeat center bottom;
+}
+
+#content {
+	background-color: #eeeeee;
+}
+
+#contentBottom {
+	height: 3px;
+	background: #4d4c4d url('../Images/content-bottom.png') no-repeat center top;
+}
+
+#menu,
+#content {
+	border: 0;
+}
+
+#menuTop {
+	width: 17.6em;
+	height: 3px;
+	background: #3e3e3e url('../Images/content-top.png') no-repeat center bottom;
+}
+
+#menu {
+	background: #ebebeb url('../Images/menuBackground.gif') repeat-x left bottom;
+}
+
+#menuBottom {
+	width: 17.6em;
+	height: 3px;
+	background: #3e3e3e url('../Images/content-top.png') no-repeat center bottom;
+}
\ No newline at end of file
Index: typo3/sysext/install/Resources/Public/Stylesheets/reset.css
===================================================================
--- typo3/sysext/install/Resources/Public/Stylesheets/reset.css	(revision 0)
+++ typo3/sysext/install/Resources/Public/Stylesheets/reset.css	(revision 0)
@@ -0,0 +1,55 @@
+@CHARSET "UTF-8";
+
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
\ No newline at end of file
Index: typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php
===================================================================
--- typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php	(revision 7289)
+++ typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php	(working copy)
@@ -52,21 +52,63 @@
 		global $TYPO3_CONF_VARS;
 
 		if ($this->compatVersionIsCurrent())	{
-			$description = 'Up to date!
If you do not use the wizard, your current TYPO3 installation is configured to use all the features included in the current release '.TYPO3_version.'.

-			There are two possibilities that you see this screen:You just updated from a previous version of TYPO3:
-			Because of some new features, the frontend output of your site might have changed. To emulate the "old" frontend behavior, change the compatibility version by continuing to step 2.
-			This is recommended after every update to make sure the frontend output is not altered. When re-running the wizard, you will see the changes needed for using the new features.
-			Please continue to step two.
-			You just made a fresh install of TYPO3:
-			Perfect! All new features will be used.
-			You can stop here and do not need this wizard now.';
+			$description = '
+				
+					Up to date!
+					

+					If you do not use the wizard, your current TYPO3
+					installation is configured to use all the features included
+					in the current release ' . TYPO3_version . '.
+					

+					There are two possibilities that you see this screen:
+				
+				
+					
+						You just updated from a previous version of
+						TYPO3:
+						Because of some new features, the frontend output of
+						your site might have changed. To emulate the "old"
+						frontend behavior, change the compatibility version
+						by continuing to step 2.
+						This is recommended after every update
+						to make sure the frontend output is not altered. When
+						re-running the wizard, you will see the changes needed
+						for using the new features.
+						Please continue to step two.
+					
+					
+						You just made a fresh install of TYPO3:
+						Perfect! All new features will be used.
+						You can stop here and do not need this wizard now.
+					
+				
+			';
 
 			if (!$TYPO3_CONF_VARS['SYS']['compat_version'])	{
 				$description .= '
-				The compatibility version has been set to the current TYPO3 version. This is a stamp and has no impact for your installation.';
+					
+						The compatibility version has been set to the current
+						TYPO3 version. This is a stamp and has no impact for
+						your installation.
+					
+				';
 			}
 		} else {
-			$description = 'Your current TYPO3 installation is configured to behave like version '.$TYPO3_CONF_VARS['SYS']['compat_version'].' of TYPO3. If you just upgraded from this version, you most likely want to use new features as well.
In the next step, you will see the things that need to be adjusted to make your installation compatible with the new features.';
+			$description = '
+				

+					Your current TYPO3 installation is configured to
+					behave like version
+					' . $TYPO3_CONF_VARS['SYS']['compat_version'] . '
+					 of TYPO3. If you just upgraded from this version,
+					you most likely want to use new features as
+					well.
+				
+				
+					In the next step, you will see the things that need to be
+					adjusted to make your installation compatible with the new
+					features.
+				
+			';
 		}
 
 		return 1;	// Return 1 in any case so user has possibility to switch back to a previous compat_version.
@@ -81,24 +123,64 @@
 	function getUserInput($inputPrefix)	{
 		global $TYPO3_CONF_VARS;
 		if ($this->compatVersionIsCurrent())	{
-			$content = 'You updated from an older version of TYPO3:

-			Select the version where you have upgraded from: 
+			';
 			$versions = array(
 				'3.8' => '<= 3.8',
 				'4.1' => '<= 4.1',
 				'4.2' => '<= 4.2',
 			);
 			foreach ($versions as $singleVersion => $caption)	{
-				$content .= '';
+				$content .= '
+								
+				';
 			}
-			$content .= '';
+			$content .= '
+							
+						
+					
+				
+			';
 		} else {
-			$content = 'TYPO3 output is currently compatible to version '.$TYPO3_CONF_VARS['SYS']['compat_version'].'. To use all the new features in the current TYPO3 version, make sure you follow the guidelines below to upgrade without problems.

-			Follow the steps below carefully and confirm every step!
You will see this list again after you performed the update.';
+			$content = '
+				
+					TYPO3 output is currently compatible to version ' . $TYPO3_CONF_VARS['SYS']['compat_version'] . '.
+					To use all the new features in the current TYPO3 version,
+					make sure you follow the guidelines below to upgrade without
+					problems.
+				
+				
+					
+						Follow the steps below carefully and confirm every step!
+					
+					

+					You will see this list again after you performed the update.
+				
+			';
 
 			$content .= $this->showChangesNeeded($inputPrefix);
 
-			$content.= ' Check all (ignore selection above)
WARNING: this might break the output of your website.
';
+			$content.= '
+				
+					
+						
+							
+							Check all (ignore selection above)
+						
+						
+							WARNING: this might break the output of your website.
+						
+					
+				
+			';
 		}
 		return $content;
 	}
@@ -203,15 +285,24 @@
 					$updateWizardBoxes.= '
 						
 							'.(isset($details['title'])?$details['title']:$internalName).'
-							'.$description.''.
+							' . $description .
 							(strlen($description_acknowledge) ? ''.$description_acknowledge.'' : '').
-							(strlen($inputPrefix) ? ' Acknowledged' : '').'
+							(strlen($inputPrefix) ? '
+								
+									
+										
+											
+											Acknowledged
+										
+									
+								
+							' : '').'
 						';
 				}
 			}
 		}
 		if (strlen($updateWizardBoxes))	{
-			return ''.$updateWizardBoxes.'';
+			return $updateWizardBoxes;
 		}
 		return '';
 	}
Index: typo3/sysext/install/updates/class.tx_coreupdates_installnewsysexts.php
===================================================================
--- typo3/sysext/install/updates/class.tx_coreupdates_installnewsysexts.php	(revision 7289)
+++ typo3/sysext/install/updates/class.tx_coreupdates_installnewsysexts.php	(working copy)
@@ -55,21 +55,40 @@
 	 */
 	public function checkForUpdate(&$description) {
 		$result = false;
-		$description = 'Install the following system extensions that are new in TYPO3 4.3:
';
+		$description = '
+			
+				Install the following system extensions that are new in TYPO3
+				4.3:
+			
+		';
 
+		$description .= '
+			
+		';
+
 		foreach($this->newSystemExtensions as $_EXTKEY) {
 			if (!t3lib_extMgm::isLoaded($_EXTKEY)) {
 				$EM_CONF = FALSE;
 					// extension may not been loaded at this point, so we can't use an API function from t3lib_extmgm
 				require (PATH_site . 'typo3/sysext/' . $_EXTKEY . '/ext_emconf.php');
 				$description .= '
-					' . $EM_CONF[$_EXTKEY]['title'] . ' [' . $_EXTKEY . ']
-					' . $EM_CONF[$_EXTKEY]['description'] . '
';
+					
+						
+							' . $EM_CONF[$_EXTKEY]['title'] . ' [' . $_EXTKEY . ']
+						
+						

+						' . $EM_CONF[$_EXTKEY]['description'] . '
+					
+				';
 
 				$result = true;
 			}
 		}
 
+		$description .= '
+			
+		';
+
 		return $result;
 	}
 
@@ -80,17 +99,39 @@
 	 * @return	string		HTML output
 	 */
 	public function getUserInput($inputPrefix) {
-		$content = 'Install the following system extensions that are new in TYPO3 4.3:
';
+		$content = '
+			
+				
+					Install the following system extensions that are new in
+					TYPO3 4.3:
+				
+			
+		';
+
+		$content .= '
+			
+				
+		';
+
 		foreach($this->newSystemExtensions as $_EXTKEY) {
 			if (!t3lib_extMgm::isLoaded($_EXTKEY)) {
 				$EM_CONF = FALSE;
 					// extension may not been loaded at this point, so we can't use an API function from t3lib_extmgm
 				require (PATH_site . 'typo3/sysext/' . $_EXTKEY . '/ext_emconf.php');
 				$content .= '
-					' . $EM_CONF[$_EXTKEY]['title'] . ' [' . $_EXTKEY . ']
';
+					
+						
+						' . $EM_CONF[$_EXTKEY]['title'] . ' [' . $_EXTKEY . ']
+					
+				';
 			}
 		}
 
+		$content .= '
+				
+			
+		';
+
 		return $content;
 	}
 
Index: typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php
===================================================================
--- typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php	(revision 7289)
+++ typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php	(working copy)
@@ -55,12 +55,44 @@
 	 */
 	public function checkForUpdate(&$description) {
 		$result = false;
-		$description = 'Install the following system extensions as their functionality is moved out of the TYPO3 base installation and now optional:

-		Help>About [about]
Shows info about TYPO3 and installed extensions.

-		Help>TYPO3 Manual [cshmanual]
Shows TYPO3 inline user manual.

-		Frontend Editing [feedit]
This module enables FE-editing, configuration is done by Typoscript.

-		User>Open Documents [opendocs]
Handles the list of opened documents in TYPO3 backend.

-		Simulate Static URLs [simulatestatic]
If you do not want to use RealURL or CoolURI but still want the Speaking URL feature. If you used "config.simulateStaticDocuments = 1" in this installation before, you should install this system extension. Be sure to read the manual of "simulatestatic".';
+		$description = '
+			
+				Install the following system extensions as their functionality
+				is moved out of the TYPO3 base installation and now optional:
+			
+			
+				
+					Help>About [about]
+					

+					Shows info about TYPO3 and installed extensions.
+				
+				
+					Help>TYPO3 Manual [cshmanual]
+					

+					Shows TYPO3 inline user manual.
+				
+				
+					Frontend Editing [feedit]
+					

+					This module enables FE-editing, configuration is done by
+					Typoscript.
+				
+				
+					User>Open Documents [opendocs]
+					

+					Handles the list of opened documents in TYPO3 backend.
+				
+				
+					Simulate Static URLs [simulatestatic]
+					

+					If you do not want to use RealURL or CoolURI but still want
+					the Speaking URL feature. If you used
+					"config.simulateStaticDocuments = 1" in this installation
+					before, you should install this system extension. Be sure to
+					read the manual of "simulatestatic".
+				
+			
+		';
 
 		foreach($this->newSystemExtensions as $ext) {
 			if (!t3lib_extMgm::isLoaded($ext)) {
@@ -77,12 +109,37 @@
 	 * @return	string		HTML output
 	 */
 	public function getUserInput($inputPrefix) {
-		$content = 'Install the following SystemExtensions:

-		Help>About [about]

-		Help>TYPO3 Manual [cshmanual]

-		Frontend Editing [feedit]

-		User>Open Documents [opendocs]

-		Simulate Static URLs [simulatestatic]
';
+		$content = '
+			
+				
+					Install the following SystemExtensions
+				:
+			
+			
+				
+					
+						
+						Help>About [about]
+					
+					
+						
+						Help>TYPO3 Manual [cshmanual]
+					
+					
+						
+						Frontend Editing [feedit]
+					
+					
+						
+						User>Open Documents [opendocs]
+					
+					
+						
+						Simulate Static URLs [simulatestatic]
+					
+				
+			
+		';
 
 		return $content;
 	}

'.$this->fontTag2.'Database summary:
'.$this->fontTag1.'Username:	'.$this->fontTag1.''.TYPO3_db_username.'
'.$this->fontTag1.'Host:	'.$this->fontTag1.''.TYPO3_db_host.'
'.$this->fontTag1.'Database:	'.$this->fontTag1.''.TYPO3_db.'
'.$this->fontTag1.'# of tables:	'.$this->fontTag1.''.(count($whichTables)?''.count($whichTables).'':count($whichTables)).'

- '.$this->fontTag2.'Username: -	-	- '.$this->fontTag2.' - -
- '.$this->fontTag2.'Password: -	-	- '.$this->fontTag2.' - -
- '.$this->fontTag2.'Host: -	-	- '.$this->fontTag2.' - -
- '.$this->fontTag1.' -	-	- '.$this->fontTag1.' - - - - NOTICE: By clicking this button, typo3conf/localconf.php is updated with new values for the parameters listed above! -

gd

ERRORS

'.$identifier.'

Final Step

###MESSAGE###

###TITLE###

###HEADTITLE###

###LLERRORS###

###TITLE###

###HEADTITLE###

###HEADTITLE###

###SITENAME###

###HEADER###

###SHORTSTRING###

###HEADER###

###LLSUMMARY###

###LLIMPORTANT###

+ ###LLEDITING### ###FILE### +

###IDENTIFIER###

###FINALSTEP###

###HEADER###

###HEADER###

'.(isset($details['title'])?$details['title']:$internalName).'

'.$this->fw($label).'		'.$this->fw($content).'

'.$this->fw($header.':',2).'

+ ###UPDATEREQUIREDTABLES### +	+ + ###COMPARE### + +	+ +	+ +
+ ###DUMPSTATICDATA### +	+ +	+ + ###IMPORT### + +	+ +
+ +
+ ###FILESHORTNAME### (###FILESIZE###) +	+ + ###COMPARE### + +	+ + ###IMPORT######SPECS### + +	+ + ###VIEW######SPECS### + +
+ +	+ + ###COMPAREWITHTCA### + +
+ +	+ + ###CREATEADMINUSER### + +
+ +	+ + ###RESETUSERPREFERENCES### + +
+ +	+ + ###CLEARTABLES### + +

+ ###HEADERFIELDNAME### +	+ ###HEADERLABEL### +
+ ###HEADERSUGGESTION### +
+ + ###CODE### + +
+ ###FIELDNAME### +	+ ###FIELDCONTENT### +