Fixed bug #14814: Improve texts in the 1-2-3 Install Tool
authorJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Jun 2010 13:35:40 +0000 (13:35 +0000)
committerJeff Segars <jsegars@alumni.rice.edu>
Tue, 22 Jun 2010 13:35:40 +0000 (13:35 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8035 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/install/index.php
typo3/sysext/install/Resources/Private/Templates/StepOutput.html
typo3/sysext/install/mod/class.tx_install.php

index d817f84..dd2e8c5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-22  Jeff Segars  <jeff@webempoweredchurch.org>
+
+       * Fixed bug #14814: Improve texts in the 1-2-3 Install Tool
+
 2010-06-22  Oliver Hader  <oliver@typo3.org>
 
        * Cleanup: Updated ext_emconf.php files in system extensions
 2010-06-22  Oliver Hader  <oliver@typo3.org>
 
        * Cleanup: Updated ext_emconf.php files in system extensions
index d1bf53f..46f1ff9 100755 (executable)
@@ -88,28 +88,27 @@ if (1==2 || !is_file($enableInstallToolFile)) {
        $markers = array(
                'styleSheet' => $stylesheet,
                'javascript' => $javascript,
        $markers = array(
                'styleSheet' => $stylesheet,
                'javascript' => $javascript,
-               'title' => 'The install tool is locked',
+               'title' => 'The Install Tool is locked',
                'content' => '
                        <p>
                'content' => '
                        <p>
-                               To enable access to the install tool, you have the following option<span class="t3-install-locked-user-settings">s</span>:
+                               To enable the Install Tool, the file ENABLE_INSTALL_TOOL must be created.
                        </p>
                        <ul>
                                <li>
                        </p>
                        <ul>
                                <li>
-                                       Create a file named <strong>ENABLE_INSTALL_TOOL</strong>
-                                       and put it into the folder <strong>typo3conf/</strong>.<br />
-                                       This file may simply be empty.
+                                       In the typo3conf/ folder, create a file named ENABLE_INSTALL_TOOL. The file name is 
+                                       case sensitive, but the file itself can simply be an empty file.
                                </li>
                                <li class="t3-install-locked-user-settings">
                                </li>
                                <li class="t3-install-locked-user-settings">
-                                       Go to <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a> and let TYPO3 create this file for you.
+                                       Alternatively, in the Backend, go to <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a>
+                                       and let TYPO3 create this file for you. When you\'re finished, you can also visit 
+                                       <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a> and delete the file from there.
                                </li>
                        </ul>
                        <p>
                                </li>
                        </ul>
                        <p>
-                               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.
                        </p>
                        <p>
                        </p>
                        <p>
-                               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.
                        </p>
                '
        );
                        </p>
                '
        );
index 4be605b..31b6fa9 100644 (file)
@@ -41,6 +41,7 @@
                <!-- ###STEP1### end -->
                
                <!-- ###STEP2### begin -->
                <!-- ###STEP1### end -->
                
                <!-- ###STEP2### begin -->
+               <p>###LLDESCRIPTION###</p>
                <form method="post" action="###ACTION###">
                        <fieldset class="t3-install-form-label-width-7">
                                <ol>
                <form method="post" action="###ACTION###">
                        <fieldset class="t3-install-form-label-width-7">
                                <ol>
index 63eec1c..b76bb32 100755 (executable)
@@ -897,7 +897,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                        // Define the markers content
                $markers = array(
                        'stepHeader' => $this->stepHeader(),
                        // 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
                );
 
                        'skip123' => $this->scriptSelf
                );
 
@@ -912,7 +912,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                Host: <em>' . TYPO3_db_host . '</em>,
                                Using Password: YES)
                                <br />
                                Host: <em>' . TYPO3_db_host . '</em>,
                                Using Password: YES)
                                <br />
-                               Go to Step 1 and enter a proper username/password!
+                               Go to Step 1 and enter a valid username and password!
                        </p>
                ';
                $error_missingDB = '
                        </p>
                ';
                $error_missingDB = '
@@ -921,7 +921,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                        There is no access to the database (<em>' . TYPO3_db . '</em>)!
                                </strong>
                                <br />
                                        There is no access to the database (<em>' . TYPO3_db . '</em>)!
                                </strong>
                                <br />
-                               Go to Step 2 and select an accessible database!
+                               Go to Step 2 and select a valid database!
                        </p>
                ';
 
                        </p>
                ';
 
@@ -955,17 +955,16 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                $templateFile, '###STEP1###'
                                        );
                                                // Add header marker for main template
                                                $templateFile, '###STEP1###'
                                        );
                                                // Add header marker for main template
-                                       $markers['header'] = 'Welcome to the TYPO3 installation process';
+                                       $markers['header'] = 'Welcome to the TYPO3 Install Tool';
                                                // Define the markers content for the subpart
                                        $step1SubPartMarkers = array(
                                                'llIntroduction' => '
                                                        <p>
                                                                TYPO3 is an enterprise content management system
                                                // Define the markers content for the subpart
                                        $step1SubPartMarkers = array(
                                                'llIntroduction' => '
                                                        <p>
                                                                TYPO3 is an enterprise content management system
-                                                               that is very powerful and yet easy to install.
+                                                               that is powerful, yet easy to install.
                                                        </p>
                                                        <p>
                                                        </p>
                                                        <p>
-                                                               Choose your database, import some data and
-                                                               you\'re done!
+                                                               In three simple steps you\'ll be ready to add content to your website.
                                                        </p>
                                                ',
                                                'step' => $this->step + 1,
                                                        </p>
                                                ',
                                                'step' => $this->step + 1,
@@ -1000,7 +999,8 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                'password' => TYPO3_db_password,
                                                'labelHost' => 'Host',
                                                'host' => TYPO3_db_host ? TYPO3_db_host : 'localhost',
                                                '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(
                                        );
                                                // Add step marker for main template
                                        $markers['step'] = t3lib_parsehtml::substituteMarkerArray(
@@ -1071,12 +1071,12 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                        // Define the markers content
                                                $step3SubPartMarkers = array(
                                                        'step' => $this->step + 1,
                                                        // 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),
                                                        'action' => htmlspecialchars($this->action),
-                                                       'llOption1' => 'Create new database (recommended):',
-                                                       'llRemark1' => 'Enter your desired name for the database.',
+                                                       'llOption1' => 'Create new database (recommended):',
+                                                       'llRemark1' => 'Enter a name for your TYPO3 database.',
                                                        'llOption2' => 'Select an EMPTY existing 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
                                                        'continue' => 'Continue'
                                                );
                                                        // Add step marker for main template
@@ -1094,7 +1094,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                break;
                                case 4:
                                                // Add header marker for main template
                                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
                                                // 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 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
 
                                                                // Check if default database scheme "database.sql" already exists, otherwise create it
                                                        if (!strstr(implode(',',$sFiles).',', '/database.sql,')) {
 
                                                                // 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) {
                                                        }
 
                                                        $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(
                                                                else $key=htmlspecialchars($f);
                                                                        // Define the markers content for database type subpart
                                                                $step4DatabaseTypeOptionMarkers = array(
@@ -1153,7 +1153,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                                'llNumberTables' => 'Number of tables:',
                                                                'numberTables' => count($whichTables),
                                                                'action' => htmlspecialchars($this->action),
                                                                '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
                                                                'label' => 'Import database'
                                                        );
                                                                // Add step marker for main template
@@ -1175,7 +1175,7 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                break;
                                case 'go':
                                                // Add header marker for main template
                                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
                                                // 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 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                                                        // Define the markers content
                                                                $stepGoSubPartMarkers = array(
                                                                        'messageBasicFinished' => $this->messageBasicFinished(),
                                                                        // Define the markers content
                                                                $stepGoSubPartMarkers = array(
                                                                        'messageBasicFinished' => $this->messageBasicFinished(),
-                                                                       'llImportant' => 'Important',
+                                                                       'llImportant' => 'Important Security Warning',
                                                                        'securityRisk' => $this->securityRisk(),
                                                                        'securityRisk' => $this->securityRisk(),
-                                                                       'llSwitchMode' => 'Enter
+                                                                       'llSwitchMode' => '
                                                                                <a href="' . $this->scriptSelf . '">
                                                                                <a href="' . $this->scriptSelf . '">
-                                                                                       "Normal"
+                                                                                       Change the Install Tool password here
                                                                                </a>
                                                                                </a>
-                                                                               mode for the Install Tool to change this!
                                                                        '
                                                                );
                                                                        // Add step marker for main template
                                                                        '
                                                                );
                                                                        // Add step marker for main template
@@ -6737,11 +6736,11 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
 
                                '.(count($tables)?'':'- You haven\'t imported any tables yet.
                                ')
 
                                '.(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);
                        }
                }
                                '),-1,1);
                        }
                }
@@ -7851,31 +7850,22 @@ $out="
        function securityRisk() {
                return '
                        <p>
        function securityRisk() {
                return '
                        <p>
-                               This script is a
-                               <strong>great danger to the security of TYPO3</strong>
-                               if you don\'t secure it somehow.
-                               <br />
-                               We suggest one of the following:
+                               <strong>An unsecured Install Tool presents a security risk.</strong>
+                               Minimize the risk with the following actions:
                        </p>
                        <ul>
                                <li>
                        </p>
                        <ul>
                                <li>
-                                       Change the password as defined by the md5-hash in
-                                       TYPO3_CONF_VARS[BE][installToolPassword]
+                                       Change the Install Tool password.
                                </li>
                                <li>
                                </li>
                                <li>
-                                       Delete the folder \'typo3/install/\' with this script in or
-                                       just insert an \'exit;\' line in the script-file there
+                                       Delete the ENABLE_INSTALL_TOOL file in the /typo3conf folder. This can be done 
+                                       manually or through User tools &gt; User settings in the backend.
                                </li>
                                <li>
                                </li>
                                <li>
-                                       Password protect the \'typo3/install/\' folder, eg. with a
-                                       .htaccess file
+                                       For additional security, the /typo3/install/ folder can be
+                                       renamed, deleted, or password protected with a .htaccess file.
                                </li>
                        </ul>
                                </li>
                        </ul>
-                       <p>
-                               The TYPO3_CONF_VARS[BE][installToolPassword] is always active,
-                               but choosing one of the other options will improve security and
-                               is recommended highly.
-                       </p>
                ';
        }
 
                ';
        }
 
@@ -7942,33 +7932,29 @@ $out="
        function messageBasicFinished() {
                return '
                        <p>
        function messageBasicFinished() {
                return '
                        <p>
-                               Apparently you have completed the basic setup of the TYPO3 database.
-                               <br />
-                               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:
                        </p>
                        <ul>
                                <li>
                        </p>
                        <ul>
                                <li>
+                                       <a href="' . $this->scriptSelf . '">Configure TYPO3</a> (Recommended)
+                                       <br />
+                                       This will let you analyze and verify that everything in your
+                                       installation is in order. In addition, you can configure advanced
+                                       TYPO3 options in this step.
+                               </li>
+                               <li>
                                        <a href="../../index.php">
                                        <a href="../../index.php">
-                                               Go to the frontend pages
+                                               Visit the frontend
                                        </a>
                                </li>
                                <li>
                                        <a href="../index.php">
                                        </a>
                                </li>
                                <li>
                                        <a href="../index.php">
-                                               Go to the backend login
+                                               Login to the backend
                                        </a>
                                        <br />
                                        </a>
                                        <br />
-                                       (username may be: <em>admin</em>, password may be: <em>password</em>.)
+                                       (Default username: <em>admin</em>, default password: <em>password</em>.)
                                </li>
                                </li>
-                               <li>
-                                       <a href="' . $this->scriptSelf . '">
-                                               Continue to configure TYPO3
-                                       </a> (Recommended).
-                                       <br />
-                                       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 <em>must</em> dig
-                                       into the this!
-                               </li>
                         </ul>
                ';
        }
                         </ul>
                ';
        }