- To enable access to the install tool, you have the following options: + To enable the Install Tool, the file ENABLE_INSTALL_TOOL must be created.
- For security reasons, it is highly recommended to rename or - delete the file after the operation is finished. + For security reasons, it is highly recommended that you either rename or delete the file after the operation is finished.
- If the file is older than 1 hour TYPO3 has automatically deleted - it, so it needs to be created again. + As an additional security measure, if the file is older than one hour, TYPO3 will automatically delete it.
' ); Index: typo3/sysext/install/mod/class.tx_install.php =================================================================== --- typo3/sysext/install/mod/class.tx_install.php (revision 8022) +++ typo3/sysext/install/mod/class.tx_install.php (working copy) @@ -897,7 +897,7 @@ // Define the markers content $markers = array( 'stepHeader' => $this->stepHeader(), - 'notice' => 'Skip this wizard (for powerusers only)', + 'notice' => 'Skip this wizard (for power users only)', 'skip123' => $this->scriptSelf ); @@ -912,7 +912,7 @@ Host: ' . TYPO3_db_host . ', Using Password: YES)TYPO3 is an enterprise content management system - that is very powerful and yet easy to install. + that is powerful, yet easy to install.
- Choose your database, import some data and - you\'re done! + In three simple steps you\'ll be ready to add content to your website.
', 'step' => $this->step + 1, @@ -1000,7 +999,8 @@ 'password' => TYPO3_db_password, 'labelHost' => 'Host', 'host' => TYPO3_db_host ? TYPO3_db_host : 'localhost', - 'continue' => 'Continue' + 'continue' => 'Continue', + 'llDescription' => 'If you have not already created a username and password to access the database, please do so now. This can be done using tools provided by your host.' ); // Add step marker for main template $markers['step'] = t3lib_parsehtml::substituteMarkerArray( @@ -1071,12 +1071,12 @@ // Define the markers content $step3SubPartMarkers = array( 'step' => $this->step + 1, - 'llOptions' => 'You have two options in this step.', + 'llOptions' => 'You have two options:', 'action' => htmlspecialchars($this->action), - 'llOption1' => 'Create new database (recommended):', - 'llRemark1' => 'Enter your desired name for the database.', + 'llOption1' => 'Create a new database (recommended):', + 'llRemark1' => 'Enter a name for your TYPO3 database.', 'llOption2' => 'Select an EMPTY existing database:', - 'llRemark2' => 'All tables used by TYPO3 will be overwritten in step 3.', + 'llRemark2' => 'Any tables used by TYPO3 will be overwritten.', 'continue' => 'Continue' ); // Add step marker for main template @@ -1094,7 +1094,7 @@ break; case 4: // Add header marker for main template - $markers['header'] = 'Import the database sql-file'; + $markers['header'] = 'Import the Database Tables'; // There should be a database host connection at this point if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect( TYPO3_db_host, TYPO3_db_username, TYPO3_db_password @@ -1114,12 +1114,12 @@ // Check if default database scheme "database.sql" already exists, otherwise create it if (!strstr(implode(',',$sFiles).',', '/database.sql,')) { - array_unshift($sFiles,'Create default database tables'); + array_unshift($sFiles,'Default TYPO3 Tables'); } $opt=''; foreach ($sFiles as $f) { - if ($f=='Create default database tables') $key='CURRENT_TABLES+STATIC'; + if ($f=='Default TYPO3 Tables') $key='CURRENT_TABLES+STATIC'; else $key=htmlspecialchars($f); // Define the markers content for database type subpart $step4DatabaseTypeOptionMarkers = array( @@ -1153,7 +1153,7 @@ 'llNumberTables' => 'Number of tables:', 'numberTables' => count($whichTables), 'action' => htmlspecialchars($this->action), - 'llDatabaseType' => 'Please select a database dump:', + 'llDatabaseType' => 'Select database contents:', 'label' => 'Import database' ); // Add step marker for main template @@ -1175,7 +1175,7 @@ break; case 'go': // Add header marker for main template - $markers['header'] = 'You\'re done!'; + $markers['header'] = 'Congratulations!'; // There should be a database host connection at this point if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect( TYPO3_db_host, TYPO3_db_username, TYPO3_db_password @@ -1191,13 +1191,12 @@ // Define the markers content $stepGoSubPartMarkers = array( 'messageBasicFinished' => $this->messageBasicFinished(), - 'llImportant' => 'Important', + 'llImportant' => 'Important Security Warning', 'securityRisk' => $this->securityRisk(), - 'llSwitchMode' => 'Enter + 'llSwitchMode' => ' - "Normal" + Change the Install Tool password here - mode for the Install Tool to change this! ' ); // Add step marker for main template @@ -6737,11 +6736,11 @@ '.(count($tables)?'':'- You haven\'t imported any tables yet. ') - .($beuser?'':'- You haven\'t created an admin-user yet. + .($beuser?'':'- You haven\'t created an admin user yet. ') .' - You you\'re about to import a database with a complete site in it, these three points should be met. + You\'re about to import a database with a complete site in it, these three points should be met. '),-1,1); } } @@ -7851,31 +7850,22 @@ 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:
+ An unsecured Install Tool presents a security risk.
+ Minimize the risk with the following actions:
- The TYPO3_CONF_VARS[BE][installToolPassword] is always active, - but choosing one of the other options will improve security and - is recommended highly. -
'; } @@ -7942,33 +7932,29 @@ function messageBasicFinished() { return '
- Apparently you have completed the basic setup of the TYPO3 database.
-
- Now you can choose between these options:
+ You have completed the basic setup of the TYPO3 Content Management System.
+ Choose between these options to continue:
###LLDESCRIPTION###