Index: typo3/sysext/install/mod/class.tx_install.php =================================================================== --- typo3/sysext/install/mod/class.tx_install.php (Revision 10352) +++ typo3/sysext/install/mod/class.tx_install.php (Arbeitskopie) @@ -1081,6 +1081,7 @@ $dbArr = $this->getDatabaseList(); $dbIncluded = 0; + $step3DatabaseOptions = array(); foreach ($dbArr as $dbname) { // Define the markers content for database options $step3DatabaseOptionMarkers = array( @@ -1169,7 +1170,7 @@ array_unshift($sFiles,'Default TYPO3 Tables'); } - $opt=''; + $step4DatabaseTypeOptions = array(); foreach ($sFiles as $f) { if ($f=='Default TYPO3 Tables') $key='CURRENT_TABLES+STATIC'; else $key=htmlspecialchars($f); @@ -2785,7 +2786,7 @@

'; } - $this->message($ext, 'GIF / PNG issues', implode($msg, chr(10)), 1); + $this->message($ext, 'GIF / PNG issues', implode(chr(10), $msg), 1); } if (!$this->isTTF()) { $this->message($ext, 'FreeType is apparently not installed', ' @@ -3011,6 +3012,7 @@ // Get the subpart for each ImageMagick version $rowsSubPart = t3lib_parsehtml::getSubpart($theCode, '###ROWS###'); + $rows = array(); foreach ($this->config_array['im_versions'] as $p => $v) { $ka = array(); reset($v); @@ -3313,8 +3315,8 @@ // Get the subpart for each database table $databaseItemSubpart = t3lib_parsehtml::getSubpart($databaseAvailableSubpart, '###DATABASEITEM###'); $dbArr = $this->getDatabaseList(); - $options=''; $dbIncluded=0; + $databaseItems = array(); foreach ($dbArr as $dbname) { // Define the markers content $databaseItemMarkers = array( @@ -3483,6 +3485,7 @@ $regularModeMarkers['strongGdLibPng'] = (string) current($gdLibPngLabels); $regularModeMarkers['defaultGdLibPng'] = (integer) $GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib_png']; + $gdLibPngOptions = array(); foreach ($gdLibPngLabels as $k => $v) { list($cleanV) = explode('|', $fA['gdlib_png'][$k]); $gdLibPngMarker['value'] = htmlspecialchars($fA['gdlib_png'][$k]); @@ -3614,6 +3617,7 @@ $regularModeMarkers['defaultImPathLzw'] = (string) $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path_lzw']; $regularModeMarkers['ImPathLzw'] = (string) current($imPathLzw); + $imPathLzwOptions = array(); foreach ($labelImPathLzw as $k => $v) { list($cleanV) = explode('|', $fA['im_path_lzw'][$k]); // Define the markers content @@ -5260,7 +5264,7 @@ $imCommandsMarkers = array( 'message' => 'ImageMagick commands executed:', 'rows' => t3lib_div::intInRange(count($commands), 2, 10), - 'commands' => htmlspecialchars(implode($commands, chr(10))) + 'commands' => htmlspecialchars(implode(chr(10), $commands)) ); // Fill the markers in the subpart $imCommandsSubpart = t3lib_parsehtml::substituteMarkerArray( @@ -5297,7 +5301,7 @@ // Define the markers content $commandsMarkers = array( 'rows' => t3lib_div::intInRange(count($commands), 2, 10), - 'commands' => htmlspecialchars(implode($commands, chr(10))) + 'commands' => htmlspecialchars(implode(chr(10), $commands)) ); // Fill the markers in the subpart $commandsSubpart = t3lib_parsehtml::substituteMarkerArray( @@ -5388,6 +5392,7 @@ ); $c = 0; + $items = array(); foreach ($menuitems as $k => $v) { // Define the markers content $markers = array( @@ -5903,8 +5908,8 @@ // not been created at this point. This applies to the "pages.*" // fields defined in sysext/cms/ext_tables.sql for example. $fileContent = implode( - $this->getStatementArray($tblFileContent,1,'^CREATE TABLE '), - chr(10) + chr(10), + $this->getStatementArray($tblFileContent,1,'^CREATE TABLE ') ); $FDfile = $this->getFieldDefinitions_fileContent($fileContent); $FDdb = $this->getFieldDefinitions_database(); @@ -6347,7 +6352,6 @@ 'sys_products_orders_mm_tt_products' => 'relations between tt_products and sys_products_orders' ); - $checkBoxes=array(); $countEntries=array(); reset($tableListArr); // Get the template file @@ -6358,7 +6362,6 @@ $groupSubpart = t3lib_parsehtml::getSubpart($tableListSubpart, '###GROUP###'); // Get the subpart for a single table $singleTableSubpart = t3lib_parsehtml::getSubpart($tableListSubpart, '###SINGLETABLE###'); - $group = array(); $checkBoxes = array(); foreach ($tableListArr as $table) { if ($table!='--div--') { @@ -6593,6 +6596,7 @@ } else { // update methods might need to get custom data $updatesAvailableSubpart = t3lib_parsehtml::getSubpart($getUserInputSubpart, '###UPDATESAVAILABLE###'); + $updateItems = array(); foreach ($this->INSTALL['update'] as $identifier => $tmp) { $updateMarkers = array(); @@ -6673,6 +6677,7 @@ if (method_exists($tmpObj,'performUpdate')) { $customOutput = ''; $dbQueries = array(); + $databaseQueries = array(); if ($tmpObj->performUpdate($dbQueries, $customOutput)) { $performUpdateMarkers['updateStatus'] = 'Update successful!'; } else {