Added feature #14064: Install tool refactoring
authorPatrick Broens <patrick@netcreators.com>
Sun, 11 Apr 2010 14:55:19 +0000 (14:55 +0000)
committerPatrick Broens <patrick@netcreators.com>
Sun, 11 Apr 2010 14:55:19 +0000 (14:55 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7290 709f56b5-9817-0410-a4d7-c38de5d9e867

68 files changed:
ChangeLog
typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CheckMail.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseMenu.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/DisplayFields.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/GetUpdateDbFormWrap.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/ImageMenu.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/Install.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/Install_123.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/Install_login.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/LoginForm.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/PhpInformation.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/PrintAll.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/PrintSection.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/SetupGeneral.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/StepHeader.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/StepOutput.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/Typo3ConfEdit.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/Typo3TempManager.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/UpdateWizardParts.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/ViewArray.html [new file with mode: 0644]
typo3/sysext/install/Resources/Private/Templates/WriteToLocalConfControl.html [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/body-background.jpg [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/button-background.jpg [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/content-background.jpg [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/content-bottom.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/content-top.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/input-background.gif [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/login-icon-key.gif [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/logo.gif [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuAbout.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuBackground.gif [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuCleanup.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuConfig.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuDatabase.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuExtConfig.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuImages.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuPhpinfo.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuTypo3confEdit.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuTypo3temp.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/menuUpdate.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Images/numbers.png [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Javascript/install.js [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Stylesheets/general.css [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Stylesheets/install.css [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Stylesheets/install_123.css [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Stylesheets/install_login.css [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Stylesheets/install_standalone.css [new file with mode: 0644]
typo3/sysext/install/Resources/Public/Stylesheets/reset.css [new file with mode: 0644]
typo3/sysext/install/mod/class.tx_install.php
typo3/sysext/install/mod/class.tx_install_session.php
typo3/sysext/install/mod/install.css [deleted file]
typo3/sysext/install/mod/install.js [deleted file]
typo3/sysext/install/updates/class.tx_coreupdates_compatversion.php
typo3/sysext/install/updates/class.tx_coreupdates_installnewsysexts.php
typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php

index e4b7c5e..e50e71b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-11  Patrick Broens  <patrick@patrickbroens.nl>
+
+       * Added feature #14064: Install tool refactoring
+
 2010-04-11  Steffen Kamper  <info@sk-typo3.de>
 
        * Follow-up to #10327: [felogin] redirecting to referer does not work
diff --git a/typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html b/typo3/sysext/install/Resources/Private/Templates/AlterPasswordForm.html
new file mode 100644 (file)
index 0000000..05552f7
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Alter Password Form</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <form action="###ACTION###" method="post">
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="alterPassword">###ENTERPASSWORD###</label>
+                                               <input class="inputText" type="password" id="alterPassword" name="TYPO3_INSTALL[extConfig][BE][installToolPassword]" />
+                                       </li>
+                                       <li>
+                                               <label for="alterPasswordRepeat">###ENTERAGAIN###</label>
+                                               <input class="inputText" type="password" id="alterPasswordRepeat" name="installToolPassword_check" />
+                                       </li>
+                                       <li class="hidden">
+                                               <input type="hidden" name="installToolPassword_md5" value="1" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###SUBMIT###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html b/typo3/sysext/install/Resources/Private/Templates/CheckImageMagick.html
new file mode 100644 (file)
index 0000000..7af2a4d
--- /dev/null
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Check ImageMagick</title>
+       </head>
+       <body>
+               <!-- ###VERSIONS### begin -->
+               <table id="imageMagickVersions" cellpadding="0" cellspacing="0">
+                       <!-- ###ROWS### begin -->
+                       <tr>
+                               <td>###FILE###</td>
+                               <td>###TYPE###</td>
+                               <td>###VERSION###</td>
+                       </tr>
+                       <!-- ###ROWS### end -->
+               </table>
+               <!-- ###VERSIONS### end -->
+               
+               <!-- ###FORM### begin -->
+               <form id="checkImageMagick" action="###ACTIONURL###" method="post">
+                       <fieldset>
+                               <ol>
+                                       <li class="labelAfter">
+                                               <input id="checkImLzw" type="checkbox" name="TYPO3_INSTALL[checkIM][lzw]" value="1" ###LZWCHECKED### />
+                                               <label for="checkImLzw" class="strong">###LZWLABEL###</label>
+                                       </li>
+                                       <li>
+                                               <label for="checkImPath" class="strong">###CHECKPATH###</label>
+                                               <input id="checkImPath" type="text" name="TYPO3_INSTALL[checkIM][path]" value="###IMAGEMAGICKPATH###" class="inputText" />
+                                       </li>
+                                       <li>
+                                               ###COMMENT###
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###SEND###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###FORM### begin -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CheckMail.html b/typo3/sysext/install/Resources/Private/Templates/CheckMail.html
new file mode 100644 (file)
index 0000000..d42adf5
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Check Mail</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <!-- ###MAILSENT### begin -->
+               <h4 class="typo3-message message-information">###MESSAGE###</h4>
+               <!-- ###MAILSENT### end -->
+               <form action="###ACTIONURL###" method="post">
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="checkMail" class="strong">###ENTEREMAIL###</label>
+                                               <input id="checkMail" type="text" name="TYPO3_INSTALL[check_mail]" class="inputText" />
+                                       </li>
+                                       <li class="labelAfter">
+                                               <input id="useHtmlMail" type="checkbox" name="TYPO3_INSTALL[use_htmlmail]" />
+                                               <label for="useHtmlMail" class="strong">###USEHTMLMAILLABEL###</label>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###SUBMIT###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###TEMPLATE### begin -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html b/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseAdminUser.html
new file mode 100644 (file)
index 0000000..a83970a
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Check the database admin user</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <fieldset class="labelWidth21">
+                       <ol>
+                               <li>
+                                       <label for="userName">###USERNAME###</label>
+                                       <input id="userName" type="text" name="TYPO3_INSTALL[database_adminUser][username]" />
+                               </li>
+                       </ol>
+               </fieldset>
+               <fieldset class="labelWidth21">
+                       <ol>
+                               <li>
+                                       <label for="password">###PASSWORD###</label>
+                                       <input id="password" type="password" name="TYPO3_INSTALL[database_adminUser][password]" />
+                               </li>
+                               <li>
+                                       <label for="passwordRepeat">###REPEATPASSWORD###</label>
+                                       <input id="passwordRepeat" type="password" name="TYPO3_INSTALL[database_adminUser][password2]" />
+                               </li>
+                       </ol>
+               </fieldset>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html b/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseCache.html
new file mode 100644 (file)
index 0000000..d4ff8d4
--- /dev/null
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Check the database cache</title>
+       </head>
+       <body>
+               <!-- ###EMPTIEDTABLES### begin -->
+               <ul>
+                       <!-- ###TABLE### begin -->
+                       <li>
+                               ###TABLENAME###
+                       </li>
+                       <!-- ###TABLE### end -->
+               </ul>
+               <!-- ###EMPTIEDTABLES### end -->
+               
+               <!-- ###TABLELIST### begin -->
+               <fieldset id="checkTheDatabaseCache">
+                       <ol>
+                               <!-- ###SINGLETABLE### begin -->
+                               <li class="labelAfter">
+                               <input name="TYPO3_INSTALL[database_clearcache][###TABLE###]" id="database_clearcache###TABLE###" value="1" type="checkbox" ###CHECKED### />
+                               <label for="database_clearcache###TABLE###">
+                                       <span class="strong column1">
+                                               ###TABLE###
+                                       </span>
+                                       <span class="column2">
+                                               ###COUNT###
+                                       </span>
+                                       <span class="column3">
+                                               ###LABEL###
+                                       </span>
+                               </label>
+                               </li>
+                               <!-- ###SINGLETABLE### end -->
+                               <!-- ###GROUP### begin -->
+                               <li>&nbsp;</li>
+                               <!-- ###GROUP### end -->
+                       </ol>
+               </fieldset>
+               <!-- ###TABLELIST### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html b/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseImport.html
new file mode 100644 (file)
index 0000000..5ee12d2
--- /dev/null
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Check the database Import</title>
+       </head>
+       <body>
+               <!-- ###IMPORT### begin -->
+               <!-- ###REGULARMODE### begin-->
+               <fieldset id="checkTheDatabaseImport">
+                       <ol>
+                               <!-- ###ROWS### begin -->
+                               <li class="labelAfter">
+                                       <input name="TYPO3_INSTALL[database_import][###TABLE###]" id="database_import_###TABLE###" value="###DEFINITION###" type="checkbox" />
+                                       <label for="database_import_###TABLE###">
+                                               <span class="strong">
+                                                       ###TABLE###
+                                               </span>
+                                               <span>
+                                                       ###ROWLABEL### ###COUNT###
+                                               </span>
+                                               <span>
+                                                       <!-- ###EXIST### begin -->
+                                                       <img src="###BACKPATH###gfx/icon_warning.gif" alt="" height="16" width="18" />
+                                                       ###TABLEEXISTS###
+                                                       <!-- ###EXIST### end -->
+                                               </span>
+                                       </label>
+                               </li>
+                               <!-- ###ROWS### end -->
+                       </ol>
+               </fieldset>
+               <!-- ###REGULARMODE### end-->
+               <fieldset>
+                       <ol>
+                               <li class="labelAfter">
+                                       <input name="TYPO3_INSTALL[database_import_all]" id="database_import_all" value="1" type="checkbox" ###CHECKED### />
+                                       <label for="database_import_all">
+                                               ###LABEL###
+                                       </label>
+                               </li>
+                       </ol>
+               </fieldset>
+               <!-- ###IMPORT### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseMenu.html b/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseMenu.html
new file mode 100644 (file)
index 0000000..51912b8
--- /dev/null
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Check the database Menu</title>
+       </head>
+       <body>
+               <!-- ###MENU### begin -->
+               <table id="databaseMenu" cellpadding="2" cellspacing="2">
+                       <tr>
+                               <td>
+                                       ###UPDATEREQUIREDTABLES###
+                               </td>
+                               <td ###NOTICECMPFILECURRENT###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=cmpFile|CURRENT_TABLES#bottom">
+                                               ###COMPARE###
+                                       </a>
+                               </td>
+                               <td>
+                                       &nbsp;
+                               </td>
+                               <td>
+                                       &nbsp;
+                               </td>
+                       </tr>
+                       <tr>
+                               <td>
+                                       ###DUMPSTATICDATA###
+                               </td>
+                               <td>
+                                       &nbsp;
+                               </td>
+                               <td ###NOTICEIMPORTCURRENT###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=import|CURRENT_STATIC#bottom">
+                                               ###IMPORT###
+                                       </a>
+                               </td>
+                               <td>
+                                       &nbsp;
+                               </td>
+                       </tr>
+                       <tr>
+                               <td colspan="4">
+                                       &nbsp;
+                               </td>
+                       </tr>
+                       <!-- ###EXTRASQL### begin -->
+                       <tr>
+                               <td>
+                                       ###FILESHORTNAME### (###FILESIZE###)
+                               </td>
+                               <td ###NOTICECMPFILE###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=cmpFile|###FILE####bottom">
+                                               ###COMPARE###
+                                       </a>
+                               </td>
+                               <td ###NOTICEIMPORT###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=import|###FILE####bottom">
+                                               ###IMPORT######SPECS###
+                                       </a>
+                               </td>
+                               <td ###NOTICEVIEW###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=view|###FILE####bottom">
+                                               ###VIEW######SPECS###
+                                       </a>
+                               </td>
+                       </tr>
+                       <!-- ###EXTRASQL### end -->
+                       <tr>
+                               <td>
+                                       &nbsp;
+                               </td>
+                               <td colspan="3" ###NOTICECMPTCA###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=cmpTCA|#bottom">
+                                               ###COMPAREWITHTCA###
+                                       </a>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td>
+                                       &nbsp;
+                               </td>
+                               <td colspan="3" ###NOTICEADMINUSER###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=adminUser|#bottom">
+                                               ###CREATEADMINUSER###
+                                       </a>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td>
+                                       &nbsp;
+                               </td>
+                               <td colspan="3" ###NOTICEUC###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=UC|#bottom">
+                                               ###RESETUSERPREFERENCES###
+                                       </a>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td>
+                                       &nbsp;
+                               </td>
+                               <td colspan="3" ###NOTICECACHE###>
+                                       <a href="###ACTION###&amp;TYPO3_INSTALL[database_type]=cache|#bottom">
+                                               ###CLEARTABLES###
+                                       </a>
+                               </td>
+                       </tr>
+               </table>
+               <a id="bottom"></a>
+               <!-- ###MENU### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html b/typo3/sysext/install/Resources/Private/Templates/CheckTheDatabaseUc.html
new file mode 100644 (file)
index 0000000..6ea7bf6
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Check the database UC</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <fieldset class="labelAfter">
+                       <ol>
+                               <li>
+                                       <input type="checkbox" name="TYPO3_INSTALL[database_UC]" id="database_UC" value="1" checked="checked" />
+                                       <label for="database_UC">###CLEARBEUSERS###</label>
+                               </li>
+                       </ol>
+               </fieldset>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html b/typo3/sysext/install/Resources/Private/Templates/CleanUpManager.html
new file mode 100644 (file)
index 0000000..1ac3063
--- /dev/null
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Clean up manager</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <dl id="cleanupManagerNumbers">
+                       <dt>
+                               ###NUMBERCACHED###
+                       </dt>
+                       <dd>
+                               ###NUMBER###
+                       </dd>
+               </dl>
+               <form method="post" action="###ACTION###">
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="cleanupType">###CLEANUP###</label>
+                                               <select id="cleanupType" name="TYPO3_INSTALL[cleanup_type]">
+                                                       <!-- ###CLEANUPOPTIONS### begin -->
+                                                       <option value="###VALUE###">###DATA###</option>
+                                                       <!-- ###CLEANUPOPTIONS### begin -->
+                                               </select>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###EXECUTE###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html b/typo3/sysext/install/Resources/Private/Templates/DisplayFieldComp.html
new file mode 100644 (file)
index 0000000..ed276e9
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Display fields compare</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <table cellpadding="0" cellspacing="0" class="displayFieldsCompare">
+                       <thead>
+                               <tr>
+                                       <th>
+                                               ###HEADERFIELDNAME###
+                                       </th>
+                                       <th>
+                                               ###HEADERSUGGESTED###
+                                       </th>
+                                       <th>
+                                               ###HEADERACTUAL###
+                                       </th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <!-- ###ROWS### begin -->
+                               <tr>
+                                       <td>
+                                               ###FIELDNAME###
+                                       </td>
+                                       <td ###CLASS###>
+                                               ###FIELDCONTENT###
+                                       </td>
+                                       <td ###CLASS###>
+                                               ###FIELDCONTENTDB###
+                                       </td>
+                               </tr>
+                               <!-- ###ROWS### end -->
+                       </tbody>
+               </table>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/DisplayFields.html b/typo3/sysext/install/Resources/Private/Templates/DisplayFields.html
new file mode 100644 (file)
index 0000000..9add4f0
--- /dev/null
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Display fields</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <table cellpadding="0" cellspacing="0" class="displayFields">
+                       <thead>
+                               <tr>
+                                       <th class="column1">
+                                               ###HEADERFIELDNAME###
+                                       </th>
+                                       <th>
+                                               ###HEADERLABEL###
+                                       </th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                       <!-- ###ROWS### begin -->
+                       <tr>
+                               <td class="column1">
+                                       ###FIELDNAME###
+                               </td>
+                               <td>
+                                       ###FIELDCONTENT###
+                               </td>
+                       </tr>
+                       <!-- ###ROWS### end -->
+                       </tbody>
+               </table>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html b/typo3/sysext/install/Resources/Private/Templates/DisplaySuggestions.html
new file mode 100644 (file)
index 0000000..f63d611
--- /dev/null
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Display suggestions</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <!-- ###ROWS### begin -->
+               <table cellpadding="0" cellspacing="0" class="displaySuggestions">
+                       <thead>
+                               <tr>
+                                       <th class="column1">
+                                               ###HEADERFIELDNAME###
+                                       </th>
+                                       <th>
+                                               ###HEADERLABEL###
+                                       </th>
+                               </tr>
+                       </thead>
+                       <tfoot>
+                               <tr>
+                                       <td colspan="2" class="tfootHeader">
+                                               ###HEADERSUGGESTION###
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td colspan="2">
+                                               <!-- ###PRE### begin -->
+                                               ###CODE###
+                                               <!-- ###PRE### end -->
+                                       </td>
+                               </tr>
+                       </tfoot>
+                       <tbody>
+                               <tr>
+                                       <td class="column1">
+                                               ###FIELDNAME###
+                                       </td>
+                                       <td>
+                                               ###FIELDCONTENT###
+                                       </td>
+                               </tr>
+                       </tbody>
+               </table>
+               <!-- ###ROWS### end -->
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html b/typo3/sysext/install/Resources/Private/Templates/DisplayTwinImage.html
new file mode 100644 (file)
index 0000000..44e9193
--- /dev/null
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Display twin image</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <!-- ###IMAGE### begin -->
+               <table cellspacing="0" cellpadding="0" class="displayTwinImageImages">
+                       <tbody>
+                               <tr>
+                                       <td>
+                                               <img width="###DESTWIDTH###" height="###DESTHEIGHT###" src="###DESTURL###" alt="Your server" />
+                                       </td>
+                                       <td>
+                                               <img width="###VERIFYWIDTH###" height="###VERIFYHEIGHT###" src="###VERIFYURL###" alt="Reference"/>
+                                       </td>
+                               </tr>
+                       </tbody>
+               </table>
+               <table cellspacing="0" cellpadding="0" class="displayTwinImageReference">
+                       <thead>
+                               <tr>
+                                       <th>
+                                               ###YOURSERVER###
+                                       </th>
+                                       <th>
+                                               ###REFERENCE###
+                                       </th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <tr>
+                                       <td>
+                                               ###YOURSERVERINFORMATION###
+                                       </td>
+                                       <td>
+                                               ###REFERENCEINFORMATION###
+                                       </td>
+                               </tr>
+                       </tbody>
+               </table>
+               <!-- ###DIFFERENTFILESIZE### begin -->
+               <table cellspacing="0" cellpadding="0" class="displayTwinImageDifferentFileSize">
+                       <thead>
+                               <tr>
+                                       <th colspan="2">
+                                               ###MESSAGE###
+                                       </th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <tr>
+                                       <td>
+                                               ###YOURSERVERFILESIZE###
+                                       </td>
+                                       <td>
+                                               ###REFERENCEFILESIZE###
+                                       </td>
+                               </tr>
+                       </tbody>
+               </table>
+               <!-- ###DIFFERENTFILESIZE### end -->
+               <!-- ###DIFFERENTPIXELDIMENSIONS### begin -->
+               <p>###MESSAGE###</p>
+               <!-- ###DIFFERENTPIXELDIMENSIONS### end -->
+               <!-- ###NOTE### begin -->
+               <p>
+                       <strong>
+                               ###MESSAGE###
+                       </strong>
+                       <br />
+                       ###LABEL###
+               </p>
+               <!-- ###NOTE### end -->
+               <!-- ###IMCOMMANDS### begin -->
+               <p>
+                       ###MESSAGE###
+               </p>
+               <form action="">
+                       <fieldset>
+                               <div class="displayTwinImageTextarea">
+                                       <textarea cols="40" rows="###ROWS###">###COMMANDS###</textarea>
+                               </div>
+                       </fieldset>
+               </form>
+               <!-- ###IMCOMMANDS### end -->
+               <!-- ###IMAGE### end -->
+               <!-- ###NOIMAGE### begin -->
+               <p>
+                       ###MESSAGE###
+                       <br />
+                       ###LABEL###
+               </p>
+               <!-- ###COMMANDSAVAILABLE### begin -->
+               <form action="">
+                       <fieldset>
+                               <div class="displayTwinImageTextarea">
+                                       <textarea cols="40" rows="###ROWS###">###COMMANDS###</textarea>
+               </div>
+                       </fieldset>
+               </form>
+               <!-- ###COMMANDSAVAILABLE### end -->
+               <!-- ###NOIMAGE### end -->
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html b/typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html
new file mode 100644 (file)
index 0000000..3812d77
--- /dev/null
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Generate config form</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <fieldset>
+                       <ol>
+                               <li>
+                                       ###DESCRIPTION###
+                               </li>
+                               <!-- ###TEXTAREA### begin -->
+                               <li class="labelAbove">
+                                       <label for="###ID###" class="strong">###KEY### = ###LABEL###</label>
+                                       <textarea id="###ID###" rows="5" cols="60" name="###NAME###">###VALUE###</textarea>
+                               </li>
+                               <!-- ###TEXTAREA### end -->
+                               <!-- ###BOOLEAN### begin -->
+                               <li class="labelAfter">
+                                       <input type="hidden" value="0" name="###NAME###" />
+                                       <input id="###ID###" type="checkbox" value="###VALUE###" ###CHECKED### name="###NAME###" />
+                                       <label for="###ID###" class="strong">###KEY### = ###LABEL###</label>
+                               </li>
+                               <!-- ###BOOLEAN### end -->
+                               <!-- ###TEXTLINE### begin -->
+                               <li class="labelAbove">
+                                       <label for="###ID###" class="strong">###KEY### = ###LABEL###</label>
+                                       <input id="###ID###" type="text" value="###VALUE###" name="###NAME###" class="inputText" />
+                               </li>
+                               <!-- ###TEXTLINE### end -->
+                       </ol>
+               </fieldset>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html b/typo3/sysext/install/Resources/Private/Templates/GenerateUpdateDatabaseFormCheckboxes.html
new file mode 100644 (file)
index 0000000..2960eb4
--- /dev/null
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Generate Update Database Form Checkboxes</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <fieldset id="###TABLEID###">
+                       <legend>###LABEL###</legend>
+                       <ol>
+                               <!-- ###MULTIPLETABLES### begin -->
+                               <li class="labelAfter">
+                                       <input type="checkbox" id="###SELECTALLID###" ###CHECKED### onclick="$('###TABLEID###').select('input[type=checkbox]').invoke('setValue', $(this).checked);" />
+                                       <label for="###SELECTALLID###">###SELECTDESELECTALL###</label>
+                               </li>
+                               <!-- ###MULTIPLETABLES### end -->
+                               <!-- ###ROWS### begin -->
+                               <li class="labelAfter">
+                                       <input type="checkbox" id="###CHECKBOXID###" name="###NAME###" value="1" ###CHECKED### />
+                                       <label for="###CHECKBOXID###">
+                                               <!-- ###ICONAVAILABLE### begin -->
+                                               <img src="###BACKPATH###gfx/icon_warning.gif" width="18" height="16" alt="" />
+                                               <strong>###ICONTEXT###</strong>
+                                               <!-- ###ICONAVAILABLE### begin -->
+                                               ###STRING###
+                                               <!-- ###CURRENT### begin -->
+                                               <br />
+                                               ###MESSAGE### <em>###VALUE###</em>
+                                               <!-- ###CURRENT### end -->
+                                       </label>
+                               </li>
+                               <!-- ###ROWS### end -->
+                               <!-- ###WARNINGS### begin -->
+                               <!-- ###WARNINGITEM### begin -->
+                               <li>
+                                       ###WARNING###
+                               </li>
+                               <!-- ###WARNINGITEM### end -->
+                               <!-- ###WARNINGS### end -->
+                       </ol>
+               </fieldset>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/GetUpdateDbFormWrap.html b/typo3/sysext/install/Resources/Private/Templates/GetUpdateDbFormWrap.html
new file mode 100644 (file)
index 0000000..93483f2
--- /dev/null
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Generate update database form wrap</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <form action="###ACTION####bottom" method="post">
+                       <fieldset>
+                               <ol>
+                                       <li class="hidden">
+                                               <input type="hidden" name="TYPO3_INSTALL[database_type]" value="###ACTIONTYPE###" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       ###CONTENT###
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <button type="submit">
+                                                       ###LABEL###
+                                                       <span class="positive">&nbsp;</span>
+                                               </button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/ImageMenu.html b/typo3/sysext/install/Resources/Private/Templates/ImageMenu.html
new file mode 100644 (file)
index 0000000..89daff7
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Image menu</title>
+       </head>
+       <body>
+               <!-- ###MENU### begin -->
+               <ol id="imageMenu">
+                       <!-- ###MENUITEM### begin -->
+                       <li class="###BACKGROUNDCOLOR###">
+                               <a href="###URL###">
+                                       ###ITEM###
+                               </a>
+                       </li>
+                       <!-- ###MENUITEM### end -->
+               </ol>
+               <!-- ###MENU### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html b/typo3/sysext/install/Resources/Private/Templates/InitExtConfig.html
new file mode 100644 (file)
index 0000000..d99c3ba
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Init ext config</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <form action="###ACTION###" method="post">
+                       ###CONTENT###
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <button type="submit">
+                                                       ###WRITE######LABEL###
+                                                       <span class="positive">&nbsp;</span>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <strong>###NOTICE### </strong>
+                                               ###EXPLANATION###
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/Install.html b/typo3/sysext/install/Resources/Private/Templates/Install.html
new file mode 100644 (file)
index 0000000..8c01360
--- /dev/null
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="###CHARSET###"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="###METACHARSET###" />
+               <title>###HEADTITLE###</title>
+               ###JAVASCRIPT###
+               ###STYLESHEETS###
+       </head>
+       <body>
+               <div id="contentBeforeTable">###CONTENTBEFORETABLE###</div>
+               <div id="container">
+                       <h1>###TITLE###</h1>
+                       <h2>###HEADTITLE###</h2>
+                       <div id="left">
+                               <!-- ###MENU### begin -->
+                               <div id="menuTop">&nbsp;</div>
+                               <ol id="menu">
+                                       <!-- ###MENUITEM### begin -->
+                                       <li id="###ID###" ###CLASS###>
+                                               <a href="###URL###">
+                                                       ###ITEM###
+                                               </a>
+                                       </li>
+                                       <!-- ###MENUITEM### end -->
+                               </ol>
+                               <div id="menuBottom">&nbsp;</div>
+                               <!-- ###MENU### end -->
+                               <ol id="links">
+                                       <li>
+                                               <a href="###BACKENDURL###">
+                                                       ###BACKEND###
+                                               </a>
+                                       </li>
+                                       <li>
+                                               <a href="###FRONTENDURL###">
+                                                       ###FRONTEND###
+                                               </a>
+                                       </li>
+                               </ol>
+                       </div>
+                       <div id="right">
+                               <div id="contentTop">&nbsp;</div>
+                               <div id="content">
+                                       <!-- ###ERRORMESSAGES### begin -->
+                                       <div class="typo3-message message-error">
+                                               <h4>###LLERRORS###</h4>
+                                               <ul>
+                                                       <!-- ###MESSAGES### begin -->
+                                                       <li>
+                                                               ###MESSAGE###
+                                                       </li>
+                                                       <!-- ###MESSAGES### end -->
+                                               </ul>
+                                       </div>
+                                       <!-- ###ERRORMESSAGES### end -->
+                                       <!-- ###CONTENT### begin -->
+                                       <!-- ###CONTENT### end -->
+                               </div>
+                               <div id="contentBottom">&nbsp;</div>
+                       </div>
+                       <div id="copyright">
+                               ###COPYRIGHT###
+                       </div>
+               </div>
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/Install_123.html b/typo3/sysext/install/Resources/Private/Templates/Install_123.html
new file mode 100644 (file)
index 0000000..c1fb541
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="###CHARSET###"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="###METACHARSET###" />
+               <title>###HEADTITLE###</title>
+               ###JAVASCRIPT###
+               ###STYLESHEETS###
+       </head>
+       <body>
+               <div id="contentBeforeTable">###CONTENTBEFORETABLE###</div>
+               <div id="container">
+                       <h1>###TITLE###</h1>
+                       <div id="contentTop">&nbsp;</div>
+                       <h2>###HEADTITLE###</h2>
+                       <div id="content">
+                               <!-- ###MENU### begin -->
+                               <ol id="menu">
+                                       <!-- ###MENUITEM### begin -->
+                                       <li ###CLASS###>
+                                               <a href="###URL###">
+                                                       ###ITEM###
+                                               </a>
+                                       </li>
+                                       <!-- ###MENUITEM### end -->
+                               </ol>
+                               <!-- ###MENU### end -->
+                               <!-- ###CONTENT### begin -->
+                               <!-- ###CONTENT### end -->
+                       </div>
+                       <div id="contentBottom">&nbsp;</div>
+                       <div id="copyright">
+                               ###COPYRIGHT###
+                       </div>
+               </div>
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/Install_login.html b/typo3/sysext/install/Resources/Private/Templates/Install_login.html
new file mode 100644 (file)
index 0000000..894f631
--- /dev/null
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="###CHARSET###"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="###METACHARSET###" />
+               <title>###HEADTITLE###</title>
+               ###JAVASCRIPT###
+               ###STYLESHEETS###
+       </head>
+       <body>
+               <div id="container" class="login">
+                       <h1>###TITLE###</h1>
+                       <!-- ###CONTENT### begin -->
+                       <!-- ###CONTENT### end -->
+               </div>
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/LoginForm.html b/typo3/sysext/install/Resources/Private/Templates/LoginForm.html
new file mode 100644 (file)
index 0000000..fd6b93c
--- /dev/null
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Login Form</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <div id="contentTop">&nbsp;</div>
+               <h2>###HEADTITLE###</h2>
+               <div id="content">
+                       <h3>###SITENAME###</h3>
+                       <form action="index.php" method="post" id="passwordForm">
+                               <fieldset>
+                                       <ol>
+                                               <li class="labelWidth7">
+                                                       <label for="password">###ENTERPASSWORD###</label>
+                                                       <input id="password" type="password" name="password" class="inputText" />
+                                               </li>
+                                               <li class="hidden">
+                                                       <input type="hidden" name="redirect_url" value="###REDIRECTURL###" />
+                                               </li>
+                                       </ol>
+                               </fieldset>
+                               <fieldset class="submit">
+                                       <ol>
+                                               <li>
+                                                       <button type="submit">
+                                                               ###LOGIN###
+                                                               <span class="positive">&nbsp;</span>
+                                                       </button>
+                                               </li>
+                                       </ol>
+                               </fieldset>
+                       </form>
+               </div>
+               <div id="contentBottom">&nbsp;</div>
+               <!-- ###WRONGPASSWORD### begin -->
+               <p class="typo3-message message-error">
+                       ###PASSWORDMESSAGE###
+                       <br />
+                       ###PASSWORD###
+               </p>
+               <!-- ###WRONGPASSWORD### end -->
+               <!-- ###SESSIONEXPIRED### begin -->
+               <p class="typo3-message message-error">
+                       ###MESSAGE###
+               </p>
+               <!-- ###SESSIONEXPIRED### end -->
+               ###MESSAGE###
+               <script type="text/javascript">
+               <!--
+                       $('password').focus();
+               //-->
+               </script>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/PhpInformation.html b/typo3/sysext/install/Resources/Private/Templates/PhpInformation.html
new file mode 100644 (file)
index 0000000..3524de7
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: PHP information</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <p>
+                       ###EXPLANATION###
+               </p>
+               <form action="">
+                       <fieldset>
+                               <div id="debugInformation">
+                                       <textarea cols="80" rows="10">###DEBUGINFO###</textarea>
+                               </div>
+                       </fieldset>
+               </form>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/PrintAll.html b/typo3/sysext/install/Resources/Private/Templates/PrintAll.html
new file mode 100644 (file)
index 0000000..a9dfbf6
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Print All</title>
+       </head>
+       <body>
+               <div id="container">
+                       <div id="content">
+                               <!-- ###TEMPLATE### begin -->
+                               <!-- ###SECTIONS### begin -->
+                               <h3>###HEADER###</h3>
+                               ###SECTIONCONTENT###
+                               <!-- ###SECTIONS### end -->
+                               <!-- ###TEMPLATE### end -->
+                       </div>
+               </div>
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/PrintSection.html b/typo3/sysext/install/Resources/Private/Templates/PrintSection.html
new file mode 100644 (file)
index 0000000..40bf476
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Print Section</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <h4 class="typo3-message ###MESSAGETYPE###">###SHORTSTRING###</h4>
+               <!-- ###LONGSTRINGAVAILABLE### begin -->
+               ###LONGSTRING###
+               <!-- ###LONGSTRINGAVAILABLE### end -->
+               <!--  ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/SetupGeneral.html b/typo3/sysext/install/Resources/Private/Templates/SetupGeneral.html
new file mode 100644 (file)
index 0000000..64c4361
--- /dev/null
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Setup General</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <form action="###ACTIONURL###" method="post" id="setupGeneral">
+                       <!-- ###ALLMODES### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="userName">###LABELUSERNAME###</label>
+                                               <input id="userName" type="text" name="TYPO3_INSTALL[localconf.php][typo_db_username]" value="###USERNAME###" class="inputText" />
+                                       </li>
+                                       <!-- ###SQLSAFEMODEUSERSUBPART### begin -->
+                                       <li>
+                                               ###LABELSQLSAFEMODEUSER###
+                                               <br />
+                                               <strong>
+                                                       ###SQLSAFEMODEUSER###
+                                               </strong>
+                                       </li>
+                                       <!-- ###SQLSAFEMODEUSERSUBPART### end -->
+                                       <li>
+                                               <label for="password">###LABELPASSWORD###</label>
+                                               <input id="password" type="password" name="TYPO3_INSTALL[localconf.php][typo_db_password]" value="###PASSWORD###" class="inputText" />
+                                       </li>
+                                       <li>
+                                               <label for="host">###LABELHOST###</label>
+                                               <input id="host" type="text" name="TYPO3_INSTALL[localconf.php][typo_db_host]" value="###HOST###" class="inputText" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!-- ###DATABASELIST### begin -->
+                       <fieldset>
+                               <ol>
+                                       <!-- ###DATABASEAVAILABLE### begin -->
+                                       <li>
+                                               <label for="db">###LABELDATABASE###</label>
+                                               <select id="db" name="TYPO3_INSTALL[localconf.php][typo_db]">
+                                                       <!-- ###DATABASEITEM### begin -->
+                                                       <option value="###DATABASENAME###" ###DATABASESELECTED###>
+                                                               ###DATABASEVALUE###
+                                                       </option>
+                                                       <!-- ###DATABASEITEM### end -->
+                                               </select>
+                                       </li>
+                                       <li>
+                                               <label for="createDatabase">###LABELCREATEDATABASE###</label>
+                                               <input id="createDatabase" type="text" name="TYPO3_INSTALL[localconf.php][NEW_DATABASE_NAME]" value="" class="inputText" />
+                                       </li>
+                                       <!-- ###DATABASEAVAILABLE### end -->
+                                       <!-- ###DATABASENOTAVAILABLE### begin -->
+                                       <li>
+                                               <label>###LABELDATABASE###</label>
+                                               <strong>
+                                                       ###TYPO3DB###
+                                               </strong>
+                                               <br />
+                                               ###LABELNODATABASE###
+                                               <input type="hidden" name="TYPO3_INSTALL[localconf.php][typo_db]" value="###TYPO3DB###" />
+                                       </li>
+                                       <!-- ###DATABASENOTAVAILABLE### end -->
+                               </ol>
+                       </fieldset>
+                       <!-- ###DATABASELIST### end -->
+                       <!-- ###ALLMODES### end -->
+                       <!-- ###REGULARMODE### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="siteName">###LABELSITENAME###</label>
+                                               <input id="siteName" type="text" name="TYPO3_INSTALL[localconf.php][sitename]" value="###SITENAME###" class="inputText" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="encryptionKey">###LABELENCRYPTIONKEY###</label>
+                                               <span>
+                                                       <input id="encryptionKey" type="text" name="TYPO3_INSTALL[localconf.php][encryptionKey]" value="###ENCRYPTIONKEY###" class="inputText" />
+                                                       <br />
+                                                       <button type="button" onclick="EncryptionKey.load(this)">###LABELGENERATERANDOMKEY###<span class="positive">&nbsp;</span></button>
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###DISABLEEXECFUNCTIONSUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELDISABLEEXECFUNCTION###</label>
+                                               <span>
+                                                       ###STRONGDISABLEEXECFUNCTION###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTDISABLEEXECFUNCTION###
+                                                       <input type="hidden" name="TYPO3_INSTALL[localconf.php][disable_exec_function]" value="###DISABLEEXECFUNCTION###" />
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###DISABLEEXECFUNCTIONSUBPART### end -->
+                       <!--  ###GDLIBSUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELGDLIB###</label>
+                                               <span>
+                                                       ###STRONGGDLIB###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTGDLIB###
+                                                       <input type="hidden" name="TYPO3_INSTALL[localconf.php][gdlib]" value="###GDLIB###" />
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###GDLIBSUBPART### end -->
+                       <!--  ###GDLIBPNGSUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELGDLIBPNG###</label>
+                                               <span>
+                                                       ###STRONGGDLIBPNG###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTGDLIBPNG###
+                                                       <br />
+                                                       <select name="TYPO3_INSTALL[localconf.php][gdlib_png]">
+                                                               <!-- ###GDLIBPNGOPTION### -->
+                                                               <option value="###VALUE###" ###SELECTED###>
+                                                                       ###DATA###
+                                                               </option>
+                                                               <!-- ###GDLIBPNGOPTION### -->
+                                                       </select>
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###GDLIBPNGSUBPART### end -->
+                       <!--  ###IMAGEMAGICKSUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELIMAGEMAGICK###</label>
+                                               <span>
+                                                       ###STRONGIMAGEMAGICK###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTIMAGEMAGICK###
+                                                       <input type="hidden" name="TYPO3_INSTALL[localconf.php][im]" value="###IMAGEMAGICK###" />
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###IMAGEMAGICKSUBPART### end -->
+                       <!--  ###IMCOMBINEFILENAMESUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELIMCOMBINEFILENAME###</label>
+                                               <span>
+                                                       ###STRONGIMCOMBINEFILENAME###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTIMCOMBINEFILENAME###
+                                                       <input type="hidden" name="TYPO3_INSTALL[localconf.php][im_combine_filename]" value="###IMCOMBINEFILENAME###" />
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###IMCOMBINEFILENAMESUBPART### end -->
+                       <!--  ###IMVERSION5SUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELIMVERSION5###</label>
+                                               <span>
+                                                       ###STRONGIMVERSION5###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTIMVERSION5###
+                                                       <input type="hidden" name="TYPO3_INSTALL[localconf.php][im_version_5]" value="###IMVERSION5###" />
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###IMVERSION5SUBPART### end -->
+                       <!--  ###IMPATHSUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELIMPATH###</label>
+                                               <span>
+                                                       ###STRONGIMPATH###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTIMPATH###
+                                                       <input type="hidden" name="TYPO3_INSTALL[localconf.php][im_path]" value="###IMPATH###" />
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###IMPATHSUBPART### end -->
+                       <!--  ###IMPATHLZWSUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label>###LABELIMPATHLZW###</label>
+                                               <span>
+                                                       ###STRONGIMPATHLZW###
+                                                       <br />
+                                                       ###LABELCURRENTVALUEIS### ###DEFAULTIMPATH###
+                                                       <br />
+                                                       <select name="TYPO3_INSTALL[localconf.php][im_path_lzw]">
+                                                               <!-- ###IMPATHLZWOPTION### begin -->
+                                                               <option value="###VALUE###" ###SELECTED###>
+                                                                       ###DATA###
+                                                               </option>
+                                                               <!-- ###IMPATHLZWOPTION### end -->
+                                                       </select>
+                                               </span>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###IMPATHLZWSUBPART### end -->
+                       <!--  ###TTFDPISUBPART### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="ttfDpi">###LABELTTFDPI###</label>
+                                               <input id="ttfDpi" type="text" name="TYPO3_INSTALL[localconf.php][TTFdpi]" value="###TTFDPI###" class="inputText" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!--  ###TTFDPISUBPART### end -->
+                       <!-- ###REGULARMODE### end -->
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">
+                                                       ###LABELUPDATELOCALCONF###
+                                                       <span class="positive">&nbsp;</span>
+                                               </button>
+                                       </li>
+                                       <li>
+                                               <strong>###LABELNOTICE###</strong> 
+                                               ###LABELCOMMENTUPDATELOCALCONF###
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###TEMPLATE### begin -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/StepHeader.html b/typo3/sysext/install/Resources/Private/Templates/StepHeader.html
new file mode 100644 (file)
index 0000000..005d696
--- /dev/null
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Step Header</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <ol id="stepHeader" class="clearfix">
+                       <!-- ###STEPITEM### begin -->
+                       <li ###CLASS###>
+                               <a href="###URL###">
+                                       ###STEP###
+                               </a>
+                       </li>
+                       <!-- ###STEPITEM### end -->
+               </ol>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/StepOutput.html b/typo3/sysext/install/Resources/Private/Templates/StepOutput.html
new file mode 100644 (file)
index 0000000..628d54d
--- /dev/null
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Step Output</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               ###STEPHEADER###
+               <h3>###HEADER###</h3>
+               ###STEP###
+               <div id="skip123">
+                       <a href="###SKIP123###">
+                               ###NOTICE###
+                       </a>
+               </div>
+               <!-- ###TEMPLATE### end -->
+               
+               <!-- ###STEP1### begin -->
+               ###LLINTRODUCTION###
+               <form method="post" action="###ACTION###">
+                       <fieldset>
+                               <ol>
+                                       <li class="hidden">
+                                               <input type="hidden" value="###STEP###" name="step" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###CONTINUE###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###STEP1### end -->
+               
+               <!-- ###STEP2### begin -->
+               <form method="post" action="###ACTION###">
+                       <fieldset class="labelWidth7">
+                               <ol>
+                                       <li class="hidden">
+                                               <input type="hidden" value="###STEP###" name="step" />
+                                               <input type="hidden" value="###ENCRYPTIONKEY###" name="TYPO3_INSTALL[localconf.php][encryptionKey]" />
+                                               <input type="hidden" value="###BRANCH###" name="TYPO3_INSTALL[localconf.php][compat_version]" />
+                                       </li>
+                                       <li>
+                                               <label for="userName">###LABELUSERNAME###</label>
+                                               <input id="userName" class="inputText" type="text" value="###USERNAME###" name="TYPO3_INSTALL[localconf.php][typo_db_username]" />
+                                       </li>
+                                       <li>
+                                               <label for="password">###LABELPASSWORD###</label>
+                                               <input id="password" class="inputText" type="password" value="###PASSWORD###" name="TYPO3_INSTALL[localconf.php][typo_db_password]" />
+                                       </li>
+                                       <li>
+                                               <label for="host">###LABELHOST###</label>
+                                               <input id="host" class="inputText" type="text" value="###HOST###" name="TYPO3_INSTALL[localconf.php][typo_db_host]" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###CONTINUE###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###STEP2### end -->
+               
+               <!-- ###STEP3### begin -->
+               <p>###LLOPTIONS###</p>
+               <form id="step3" method="post" action="###ACTION###">
+                       <fieldset>
+                               <ol>
+                                       <li class="hidden">
+                                               <input type="hidden" value="###STEP###" name="step" />
+                                       </li>
+                                       <li>
+                                               <label for="newDatabase">###LLOPTION1###</label>
+                                               <p>###LLREMARK1###</p>
+                                               <input id="newDatabase" class="inputText" type="text" name="TYPO3_INSTALL[localconf.php][NEW_DATABASE_NAME]" />
+                                       </li>
+                                       <li>
+                                               <label for="database">###LLOPTION2###</label>
+                                               <p>###LLREMARK2###</p>
+                                               <select id="database" name="TYPO3_INSTALL[localconf.php][typo_db]">
+                                                       <option value="">Select database</option>
+                                                       <!-- ###DATABASEOPTIONS### begin -->
+                                                       <option value="###DATABASEVALUE###" ###DATABASESELECTED###>###DATABASENAME###</option>
+                                                       <!-- ###DATABASEOPTIONS### end -->
+                                               </select>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###CONTINUE###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###STEP3### end -->
+               
+               <!-- ###STEP4### begin -->
+               <h4>###LLSUMMARY###</h4>
+               <dl id="stepOutputSummary" class="clearfix">
+                       <dt>###LLUSERNAME###</dt>
+                       <dd>###USERNAME###</dd>
+                       <dt>###LLHOST###</dt>
+                       <dd>###HOST###</dd>
+                       <dt>###LLDATABASE###</dt>
+                       <dd>###DATABASE###</dd>
+                       <dt>###LLNUMBERTABLES###</dt>
+                       <dd>###NUMBERTABLES###</dd>
+               </dl>
+               <form action="###ACTION####bottom" method="post">
+                       <fieldset>
+                               <ol>
+                                       <li class="hidden">
+                                               <input type="hidden" name="TYPO3_INSTALL[database_type]" value="import" />
+                                               <input type="hidden" name="TYPO3_INSTALL[database_import_all]" value="1" />
+                                               <input type="hidden" name="step" value="" />
+                                               <input type="hidden" name="goto_step" value="go" />
+                                       </li>
+                                       <li>
+                                               <label for="databaseType">###LLDATABASETYPE###</label>
+                                               <select id="databaseType" name="TYPO3_INSTALL[database_type]">
+                                                       <!-- ###DATABASETYPEOPTIONS### begin -->
+                                                       <option value="###DATABASETYPEVALUE###">###DATABASENAME###</option>
+                                                       <!-- ###DATABASETYPEOPTIONS### end -->
+                                               </select>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <button type="submit">
+                                                       ###LABEL###
+                                                       <span class="positive">&nbsp;</span>
+                                               </button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###STEP4### end -->
+
+               <!-- ###STEPGO### begin -->
+               ###MESSAGEBASICFINISHED###
+               <h4 class="typo3-message message-warning">###LLIMPORTANT###</h4>
+               ###SECURITYRISK###
+               ###LLSWITCHMODE###
+               <!-- ###STEPGO### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/Typo3ConfEdit.html b/typo3/sysext/install/Resources/Private/Templates/Typo3ConfEdit.html
new file mode 100644 (file)
index 0000000..b866b55
--- /dev/null
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: TYPO3 Conf Edit</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <dl id="confEditFileList">
+                       <!-- ###FILES### begin -->
+                       <dt ###CLASS###>
+                               <a href="###EDITURL###">
+                                       ###FILENAME###
+                               </a>
+                       </dt>
+                       <dd>
+                               ###FILESIZE### 
+                       </dd>
+                       <!-- ###FILES### end -->
+               </dl>
+               <p>
+                       ###EDITPATH###
+               </p>
+               <!-- ###ALLOWFILEEDITOUTSIDETYPO3CONFDIR### begin -->
+               <form action="###ACTION###" method="post">
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="editPath">###PATHSITE###</label>
+                                               <input id="editPath" type="text" name="TYPO3_INSTALL[FILE][EDIT_path]" value="###EDITPATH###" class="inputText" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###SET###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###ALLOWFILEEDITOUTSIDETYPO3CONFDIR### end -->
+               <p>
+                       <a href="###DELETETEMPCACHEDURL###">
+                               ###DELETETEMPCACHED###
+                       </a>
+               </p>
+               <!--  ###FILEEDIT### begin -->
+               <h4 id="fileEditHeader" class="typo3-message message-information">
+                       ###LLEDITING### ###FILE###
+               </h4>
+               ###MESSAGES###
+               <p>
+                       ###MD5SUM###
+               </p>
+               <form id="fileEdit" action="###ACTION###" method="post">
+                       <fieldset>
+                               <ol>
+                                       <li class="hidden">
+                                               <input type="hidden" name="TYPO3_INSTALL[FILE][name]" value="###FILENAME###" />
+                                               <!-- ###ALLOWFILEEDITOUTSIDETYPO3CONFDIR### begin -->
+                                               <input type="hidden" name="TYPO3_INSTALL[FILE][EDIT_path]" value="###FILEEDITPATH###" />
+                                               <!-- ###ALLOWFILEEDITOUTSIDETYPO3CONFDIR### end -->
+                                               <input type="hidden" name="TYPO3_INSTALL[FILE][prevMD5]" value="###FILEPREVIOUSMD5###" />
+                                       </li>
+                                       <li>
+                                               <textarea cols="48" rows="30" name="TYPO3_INSTALL[FILE][###FILEMD5###]" wrap="off">###FILECONTENT###</textarea>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset>
+                               <ol>
+                                       <li class="labelAfter">
+                                               <input type="checkbox" name="TYPO3_INSTALL[FILE][win_to_unix_br]" id="winToUnixBr" value="1" ###WINTOUNIXBRCHECKED### />
+                                               <label for="winToUnixBr">###WINTOUNIXBR###</label>
+                                       </li>
+                                       <li class="labelAfter">
+                                               <input type="checkbox" name="TYPO3_INSTALL[FILE][backup]" id="backup" value="1" ###BACKUPCHECKED### />
+                                               <label for="backup">###BACKUP###</label>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <!-- ###SHOWSAVEBUTTON### begin -->
+                                               <button type="submit" name="TYPO3_INSTALL[SAVE_FILE]" value="###SAVEFILE###">###SAVEFILE###<span class="positive">&nbsp;</span></button>
+                                               <!-- ###SHOWSAVEBUTTON### end -->
+                                               <button type="submit" name="_close" value="###CLOSE###">###CLOSE###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!--  ###FILEEDIT### end -->
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/Typo3TempManager.html b/typo3/sysext/install/Resources/Private/Templates/Typo3TempManager.html
new file mode 100644 (file)
index 0000000..e4f48bb
--- /dev/null
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: TYPO3 Temp Manager</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <dl id="tempManagerNumbers">
+                       <dt>
+                               ###NUMBERTEMPORARY###
+                       </dt>
+                       <dd>
+                               ###TEMPORARY###
+                       </dd>
+                       <dt>
+                               ###NUMBERMATCHING###
+                       </dt>
+                       <dd>
+                               ###MATCHING### ###DELETETYPE###
+                       </dd>
+                       <dt>
+                               ###NUMBERDELETED###
+                       </dt>
+                       <dd>
+                               ###DELETED###
+                       </dd>
+               </dl>
+               <form id="tempManagerForm" method="post" action="index.php?TYPO3_INSTALL[type]=typo3temp">
+                       <fieldset>
+                               <ol>
+                                       <li>
+                                               <label for="delete">###DELETECONDITION###</label>
+                                               <select id="delete" name="TYPO3_INSTALL[typo3temp_delete]">
+                                                       <!-- ###DELETEOPTIONS### begin -->
+                                                       <option value="###VALUE###" ###SELECTED###>###DATA###</option>
+                                                       <!-- ###DELETEOPTIONS### end -->
+                                               </select>
+                                       </li>
+                                       <li>
+                                               <label for="action">###NUMBERFILES###</label>
+                                               <select id="action" name="TYPO3_INSTALL[typo3temp_action]">
+                                                       <!-- ###ACTIONOPTIONS### begin -->
+                                                       <option value="###VALUE###">###DATA###</option>
+                                                       <!-- ###ACTIONOPTIONS### end -->
+                                               </select>
+                                       </li>
+                                       <li>
+                                               <label for="subDirectory">###FROMSUBDIRECTORY###</label>
+                                               <select id="subDirectory" name="TYPO3_INSTALL[typo3temp_subdir]">
+                                                       <!-- ###SUBDIRECTORYOPTIONS### begin -->
+                                                       <option value="###VALUE###" ###SELECTED###>###DATA###</option>
+                                                       <!-- ###SUBDIRECTORYOPTIONS### end -->
+                                               </select>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">###EXECUTE###<span class="positive">&nbsp;</span></button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               ###EXPLANATION###
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/UpdateWizardParts.html b/typo3/sysext/install/Resources/Private/Templates/UpdateWizardParts.html
new file mode 100644 (file)
index 0000000..3ee72d0
--- /dev/null
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Update wizard parts</title>
+       </head>
+       <body>
+               <!-- ###CHECKFORUPDATE### begin -->
+               <!-- ###UPDATESAVAILABLE### begin -->
+               <!-- ###UPDATEWIZARDBOXES### begin -->
+               <form action="###ACTION####bottom" method="post">
+                       <fieldset class="hidden">
+                               <ol>
+                                       <li>
+                                               <input type="hidden" name="TYPO3_INSTALL[database_type]" value="getUserInput" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!-- ###SINGLEUPDATEWIZARDBOX### begin -->
+                       <h3>###IDENTIFIER###</h3>
+                       ###EXPLANATION###
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit" name="TYPO3_INSTALL[update][###IDENTIFIER###]">
+                                                       ###NEXT###
+                                                       <span class="positive">&nbsp;</span>
+                                               </button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <!-- ###SINGLEUPDATEWIZARDBOX### end -->
+               </form>
+               <!-- ###UPDATEWIZARDBOXES### end -->
+               <h3>###FINALSTEP###</h3>
+               ###FINALSTEPEXPLANATION###
+               <a href="index.php?TYPO3_INSTALL[type]=database&amp;TYPO3_INSTALL[database_type]=cmpFile|CURRENT_TABLES#bottom" class="button">###COMPAREDATABASE###<span class="positive">&nbsp;</span></a>
+               <!-- ###UPDATESAVAILABLE### end -->
+               <!-- ###CHECKFORUPDATE### end -->
+               
+               <!-- ###GETUSERINPUT### begin -->
+               <form action="###ACTION####bottom" method="post">
+                       <fieldset class="hidden">
+                               <ol>
+                                       <li>
+                                               <input type="hidden" value="performUpdate" name="TYPO3_INSTALL[database_type]" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <p>
+                               <strong>
+                                       ###INTRODUCTION###
+                               </strong>
+                       </p>
+                       <!-- ###NOUPDATESAVAILABLE### begin -->
+                       <p>
+                               <strong>
+                                       ###NOUPDATES###
+                               </strong>
+                       </p>
+                       <!-- ###NOUPDATESAVAILABLE### end -->
+                       <!-- ###UPDATESAVAILABLE### begin -->
+                       <fieldset>
+                               <ol>
+                                       <li class="hidden">
+                                               <input type="hidden" name="TYPO3_INSTALL[update][extList][]" value="###IDENTIFIER###" />
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <p>
+                               <strong>
+                                       ###IDENTIFIER###
+                               </strong>
+                       </p>
+                       ###IDENTIFIERMETHOD###
+                       <!-- ###UPDATESAVAILABLE### end -->
+                       <fieldset>
+                               <ol>
+                                       <li class="labelAfter">
+                                               <input type="checkbox" name="TYPO3_INSTALL[update][showDatabaseQueries]" id="showDatabaseQueries" value="1" />
+                                               <label for="showDatabaseQueries">###SHOWDATABASEQUERIES###</label>
+                                       </li>
+                               </ol>
+                       </fieldset>
+                       <fieldset class="submit">
+                               <ol>
+                                       <li>
+                                               <button type="submit">
+                                                       ###PERFORMUPDATES###
+                                                       <span class="positive">&nbsp;</span>
+                                               </button>
+                                       </li>
+                               </ol>
+                       </fieldset>
+               </form>
+               <!-- ###GETUSERINPUT### end -->
+               
+               <!-- ###PERFORMUPDATE### begin -->
+                       <!-- ###UPDATEITEMS### begin -->
+                       <p class="innerWidth">
+                               <strong>
+                                       ###IDENTIFIER###
+                               </strong>
+                       </p>
+                               <!-- ###CHECKUSERINPUT### begin -->
+                               ###CUSTOMOUTPUT###
+                               <br />
+                               <br />
+                               <a href="javascript:history.back()">
+                                       ###GOBACK###
+                               </a>
+                               <!-- ###CHECKUSERINPUT### end -->
+                               <!-- ###UPDATEPERFORMED### begin -->
+                               <strong>
+                                       ###UPDATESTATUS###
+                               </strong>
+                               <!-- ###DATABASEQUERIES### begin -->
+                               <br />
+                               ###QUERY###
+                               <!-- ###DATABASEQUERIES### end -->
+                               
+                               <!-- ###CUSTOMOUTPUT### begin -->
+                               <br />
+                               ###CUSTOM###
+                               <!-- ###CUSTOMOUTPUT### end -->
+                               
+                               <!-- ###UPDATEPERFORMED### end -->
+                               <!-- ###NOPERFORMUPDATE### begin -->
+                               <strong>
+                                       ###NOUPDATEMETHOD###
+                               </strong>
+                               <!-- ###NOPERFORMUPDATE### end -->
+                       <!-- ###UPDATEITEMS### end -->
+               <!-- ###PERFORMUPDATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/ViewArray.html b/typo3/sysext/install/Resources/Private/Templates/ViewArray.html
new file mode 100644 (file)
index 0000000..b636ab2
--- /dev/null
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: View Array</title>
+       </head>
+       <body>
+               <!-- ###TEMPLATE### begin -->
+               <dl class="viewArray">
+                       <!-- ###ITEM### begin -->
+                       <dt>
+                               ###KEY###
+                       </dt>
+                       <dd>
+                               ###DESCRIPTION###
+                       </dd>
+                       <!-- ###ITEM### end -->
+               </dl>
+               <!-- ###TEMPLATE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Private/Templates/WriteToLocalConfControl.html b/typo3/sysext/install/Resources/Private/Templates/WriteToLocalConfControl.html
new file mode 100644 (file)
index 0000000..e181a56
--- /dev/null
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+       <head>
+               <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+               <title>Template: Write to localconf control</title>
+       </head>
+       <body>
+               <!-- ###CONTINUE### begin -->
+               <h4 class="typo3-message message-ok">###HEADER###</h4>
+               <ul>
+                       <!-- ###MESSAGES### begin -->
+                       <li>
+                               ###MESSAGE###
+                       </li>
+                       <!-- ###MESSAGES### end -->
+               </ul>
+               <p>
+                       <a href="###ACTION###">
+                               ###LABEL###
+                       </a>
+               </p>
+               <!-- ###CONTINUE### end -->
+               <!-- ###NOCHANGE### begin -->
+               <h4 class="typo3-message message-warning">###HEADER###</h4>
+               <p>###MESSAGE###</p>
+               <p>
+                       <a href="###ACTION###">
+                               ###LABEL###
+                       </a>
+               </p>
+               <!-- ###NOCHANGE### end -->
+       </body>
+</html>
\ No newline at end of file
diff --git a/typo3/sysext/install/Resources/Public/Images/body-background.jpg b/typo3/sysext/install/Resources/Public/Images/body-background.jpg
new file mode 100644 (file)
index 0000000..ca81781
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/body-background.jpg differ
diff --git a/typo3/sysext/install/Resources/Public/Images/button-background.jpg b/typo3/sysext/install/Resources/Public/Images/button-background.jpg
new file mode 100644 (file)
index 0000000..17dc659
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/button-background.jpg differ
diff --git a/typo3/sysext/install/Resources/Public/Images/content-background.jpg b/typo3/sysext/install/Resources/Public/Images/content-background.jpg
new file mode 100644 (file)
index 0000000..a282841
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/content-background.jpg differ
diff --git a/typo3/sysext/install/Resources/Public/Images/content-bottom.png b/typo3/sysext/install/Resources/Public/Images/content-bottom.png
new file mode 100644 (file)
index 0000000..b2a0b78
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/content-bottom.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/content-top.png b/typo3/sysext/install/Resources/Public/Images/content-top.png
new file mode 100644 (file)
index 0000000..8093f9f
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/content-top.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/input-background.gif b/typo3/sysext/install/Resources/Public/Images/input-background.gif
new file mode 100644 (file)
index 0000000..1e7d296
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/input-background.gif differ
diff --git a/typo3/sysext/install/Resources/Public/Images/login-icon-key.gif b/typo3/sysext/install/Resources/Public/Images/login-icon-key.gif
new file mode 100644 (file)
index 0000000..03417a7
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/login-icon-key.gif differ
diff --git a/typo3/sysext/install/Resources/Public/Images/logo.gif b/typo3/sysext/install/Resources/Public/Images/logo.gif
new file mode 100644 (file)
index 0000000..d11cde8
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/logo.gif differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuAbout.png b/typo3/sysext/install/Resources/Public/Images/menuAbout.png
new file mode 100644 (file)
index 0000000..e1d61e3
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuAbout.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuBackground.gif b/typo3/sysext/install/Resources/Public/Images/menuBackground.gif
new file mode 100644 (file)
index 0000000..9600202
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuBackground.gif differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuCleanup.png b/typo3/sysext/install/Resources/Public/Images/menuCleanup.png
new file mode 100644 (file)
index 0000000..036a382
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuCleanup.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuConfig.png b/typo3/sysext/install/Resources/Public/Images/menuConfig.png
new file mode 100644 (file)
index 0000000..758c3fc
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuConfig.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuDatabase.png b/typo3/sysext/install/Resources/Public/Images/menuDatabase.png
new file mode 100644 (file)
index 0000000..9b16f4e
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuDatabase.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuExtConfig.png b/typo3/sysext/install/Resources/Public/Images/menuExtConfig.png
new file mode 100644 (file)
index 0000000..30eac44
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuExtConfig.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuImages.png b/typo3/sysext/install/Resources/Public/Images/menuImages.png
new file mode 100644 (file)
index 0000000..738ab22
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuImages.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuPhpinfo.png b/typo3/sysext/install/Resources/Public/Images/menuPhpinfo.png
new file mode 100644 (file)
index 0000000..1dfb655
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuPhpinfo.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuTypo3confEdit.png b/typo3/sysext/install/Resources/Public/Images/menuTypo3confEdit.png
new file mode 100644 (file)
index 0000000..0287862
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuTypo3confEdit.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuTypo3temp.png b/typo3/sysext/install/Resources/Public/Images/menuTypo3temp.png
new file mode 100644 (file)
index 0000000..4f743e0
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuTypo3temp.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/menuUpdate.png b/typo3/sysext/install/Resources/Public/Images/menuUpdate.png
new file mode 100644 (file)
index 0000000..29c6b91
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/menuUpdate.png differ
diff --git a/typo3/sysext/install/Resources/Public/Images/numbers.png b/typo3/sysext/install/Resources/Public/Images/numbers.png
new file mode 100644 (file)
index 0000000..20ef669
Binary files /dev/null and b/typo3/sysext/install/Resources/Public/Images/numbers.png differ
diff --git a/typo3/sysext/install/Resources/Public/Javascript/install.js b/typo3/sysext/install/Resources/Public/Javascript/install.js
new file mode 100644 (file)
index 0000000..c2e3abf
--- /dev/null
@@ -0,0 +1,49 @@
+/***************************************************************
+*
+*  Javascript functions to provide AJAX calls for install tool
+*
+*  Copyright notice
+*
+*  (c) 2009 Marcus Krause, Helmut Hummel <security@typo3.org>
+*  All rights reserved
+*
+*  This script is part of the TYPO3 backend provided by
+*  Kasper Skaarhoj <kasper@typo3.com> 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)
+               });
+       }
+};
diff --git a/typo3/sysext/install/Resources/Public/Stylesheets/general.css b/typo3/sysext/install/Resources/Public/Stylesheets/general.css
new file mode 100644 (file)
index 0000000..1480e6b
--- /dev/null
@@ -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
diff --git a/typo3/sysext/install/Resources/Public/Stylesheets/install.css b/typo3/sysext/install/Resources/Public/Stylesheets/install.css
new file mode 100644 (file)
index 0000000..07b5d5e
--- /dev/null
@@ -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
diff --git a/typo3/sysext/install/Resources/Public/Stylesheets/install_123.css b/typo3/sysext/install/Resources/Public/Stylesheets/install_123.css
new file mode 100644 (file)
index 0000000..c6fabc1
--- /dev/null
@@ -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
diff --git a/typo3/sysext/install/Resources/Public/Stylesheets/install_login.css b/typo3/sysext/install/Resources/Public/Stylesheets/install_login.css
new file mode 100644 (file)
index 0000000..8663dc9
--- /dev/null
@@ -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
diff --git a/typo3/sysext/install/Resources/Public/Stylesheets/install_standalone.css b/typo3/sysext/install/Resources/Public/Stylesheets/install_standalone.css
new file mode 100644 (file)
index 0000000..d68f763
--- /dev/null
@@ -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
diff --git a/typo3/sysext/install/Resources/Public/Stylesheets/reset.css b/typo3/sysext/install/Resources/Public/Stylesheets/reset.css
new file mode 100644 (file)
index 0000000..3491a62
--- /dev/null
@@ -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 2c6f67a..39c15b4 100755 (executable)
  * 4823:     function stepHeader()
  * 4865:     function note123()
  * 4879:     function endNotes()
- * 4898:     function convertByteSize($bytes)
  * 4912:     function securityRisk()
  * 4930:     function alterPasswordForm()
  * 4946:     function messageBasicFinished()
@@ -156,6 +155,7 @@ require_once(t3lib_extMgm::extPath('install').'updates/class.tx_coreupdates_inst
 require_once(t3lib_extMgm::extPath('install').'updates/class.tx_coreupdates_installnewsysexts.php');
 require_once(t3lib_extMgm::extPath('install') . 'mod/class.tx_install_session.php');
 require_once(t3lib_extMgm::extPath('install') . 'updates/class.tx_coreupdates_statictemplates.php');
+require_once(PATH_tslib . 'class.tslib_content.php');
 
 /**
  * Install Tool module
@@ -166,14 +166,21 @@ require_once(t3lib_extMgm::extPath('install') . 'updates/class.tx_coreupdates_st
  * @subpackage tx_install
  */
 class tx_install extends t3lib_install {
+       var $contentObject;
+       var $templateFilePath = 'typo3/sysext/install/Resources/Private/Templates/';
+       var $template;
+       var $javascript;
+       var $stylesheets;
+       var $markers = array();
+       var $messages = array();
+       var $errorMessages = array();
+       var $mailMessage = '';
        var $getGD_start_string='<h2 align="center"><a name="module_gd">gd</a></h2>';   // Used to identify the GD section in the output from phpinfo()
        var $getGD_end_string = '</table>';     // Used to identify the end of the GD section (found with getGD_start_string) in the output from phpinfo()
        var $getTTF_string = 'with TTF library';        // Used to identify whether TTF-lib is included with GD
        var $getTTF_string_alt = 'with freetype';       // Used to identify whether TTF-lib is included with GD
        var $action = '';               // The url that calls this script
        var $scriptSelf = 'index.php';          // The url that calls this script
-       var $fontTag2='<div class="bodytext">';
-       var $fontTag1='<div class="smalltext">';
        var $updateIdentity = 'TYPO3 Install Tool';
        var $headerStyle ='';
        var $contentBeforeTable='';
@@ -187,11 +194,11 @@ class tx_install extends t3lib_install {
        var $dumpImCommands=1;                  // If set, the image Magick commands are always outputted in the image processing checker
        var $mode = ''; // If set to "123" then only most vital information is displayed.
        var $step = 0;  // If set to 1,2,3 or GO it signifies various functions.
+       var $totalSteps = 4; // Can be changed by hook to define the total steps in 123 mode
 
        // internal
        var $passwordOK=0;                      // This is set, if the password check was ok. The function init() will exit if this is not set
        var $silent=1;                          // If set, the check routines don't add to the message-array
-       var $messageFunc_nl2br=1;
        var $sections=array();          // Used to gather the message information.
        var $fatalError=0;                      // This is set if some error occured that will definitely prevent TYpo3 from running.
        var $sendNoCacheHeaders=1;
@@ -240,14 +247,15 @@ class tx_install extends t3lib_install {
        /**
         * Constructor
         *
-        * @return      [type]          ...
+        * @return void
         */
-       function tx_install()   {
+       function tx_install() {
                parent::t3lib_install();
+               $this->contentObject = t3lib_div::makeInstance('tslib_cObj');
 
                if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'])  die("Install Tool deactivated.<br />You must enable it by setting a password in typo3conf/localconf.php. If you insert the line below, the password will be 'joh316':<br /><br />\$TYPO3_CONF_VARS['BE']['installToolPassword'] = 'bacb98acf97e0b6112b1d1b650b84971';");
 
-               if ($this->sendNoCacheHeaders)  {
+               if ($this->sendNoCacheHeaders) {
                        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
                        header('Expires: 0');
@@ -282,11 +290,19 @@ class tx_install extends t3lib_install {
                        }
                }
 
-               if ($this->step == 3) {
+               if ($this->step == 4) {
                        $this->INSTALL['type'] = 'database';
                }
 
-               if ($this->mode=='123') {
+                       // Hook to raise the counter for the total steps in the 1-2-3 installer
+               if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['additionalSteps'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['additionalSteps'] as $classData) {
+                               $hookObject = t3lib_div::getUserObj($classData);
+                               $this->totalSteps += (integer) $hookObject->execute();
+                       }
+               }
+
+               if ($this->mode=='123') {
                        $tempItems = $this->menuitems;
                        $this->menuitems = array(
                                'config' => $tempItems['config'],
@@ -331,7 +347,7 @@ BTW: This Install Tool will only work if cookies are accepted by your web browse
 ';
                }
 
-               if ($this->session->isAuthorized() || $this->checkPassword())   {
+               if ($this->session->isAuthorized() || $this->checkPassword()) {
                        $this->passwordOK=1;
                        $this->session->refreshSession();
 
@@ -341,7 +357,7 @@ BTW: This Install Tool will only work if cookies are accepted by your web browse
                                @touch($enableInstallToolFile);
                        }
 
-                       if($this->redirect_url) {
+                       if($this->redirect_url) {
                                t3lib_utility_Http::redirect($this->redirect_url);
                        }
                } else {
@@ -360,12 +376,12 @@ BTW: This Install Tool will only work if cookies are accepted by your web browse
        function checkPassword() {
                $p = t3lib_div::_GP('password');
 
-               if ($p && md5($p)==$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'])    {
+               if ($p && md5($p)==$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword']) {
                        $this->session->setAuthorized();
 
                                // Sending warning email
                        $wEmail = $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_email_addr'];
-                       if ($wEmail)    {
+                       if ($wEmail) {
                                $subject="Install Tool Login at '".$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']."'";
                                $email_body="There has been a Install Tool login at TYPO3 site '".$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']."' (".t3lib_div::getIndpEnv('HTTP_HOST').") from remote address '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndpEnv('REMOTE_HOST').')';
                                mail($wEmail,
@@ -377,9 +393,9 @@ BTW: This Install Tool will only work if cookies are accepted by your web browse
                        return true;
                } else {
                                // Bad password, send warning:
-                       if ($p) {
+                       if ($p) {
                                $wEmail = $GLOBALS['TYPO3_CONF_VARS']['BE']['warning_email_addr'];
-                               if ($wEmail)    {
+                               if ($wEmail) {
                                        $subject="Install Tool Login ATTEMPT at '".$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']."'";
                                        $email_body="There has been an Install Tool login attempt at TYPO3 site '".$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']."' (".t3lib_div::getIndpEnv('HTTP_HOST').").
 The MD5 hash of the last 5 characters of the password tried was '".substr(md5($p), -5)."'
@@ -396,62 +412,142 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
        }
 
        /**
-        * [Describe function...]
+        * Create the HTML for the login form
+        *
+        * Reads and fills the template.
+        * Substitutes subparts when wrong password has been given
+        * or the session has expired
         *
-        * @return      [type]          ...
+        * @return void
         */
-       function loginForm()    {
-               $p = t3lib_div::_GP('password');
+       function loginForm() {
+               $password = t3lib_div::_GP('password');
                $redirect_url = $this->redirect_url ? $this->redirect_url : $this->action;
-
-               $this->messageFunc_nl2br=0;
-               $this->silent=0;
-
-               $content = '<form action="index.php" method="post" name="passwordForm">
-                       <input type="password" name="password"><br />
-                       <input type="hidden" name="redirect_url" value="'.htmlspecialchars($redirect_url).'">
-                       <input type="submit" value="Log in"><br />
-                       <br />
-
-                       '.$this->fw('The Install Tool Password is <i>not</i> the admin password of TYPO3.<br />
-                               If you don\'t know the current password, you can set a new one by setting the value of $TYPO3_CONF_VARS[\'BE\'][\'installToolPassword\'] in typo3conf/localconf.php to the md5() hash value of the password you desire.'.
-                               ($p ? '<br /><br />The password you just tried has this md5-value: <br /><br />'.md5($p) : '')
-                               ).'
-                       </form>
-                       <script type="text/javascript">
-                       <!--
-                               document.passwordForm.password.focus();
-                       //-->
-                       </script>';
-
+                       // Add prototype to javascript array for output
+               $this->javascript[] = '<script type="text/javascript" src="' .
+                       t3lib_div::getIndpEnv('TYPO3_SITE_URL') .
+                       TYPO3_mainDir .
+                       'contrib/prototype/prototype.js"></script>
+               ';
+                       // Get the template file
+               $templateFile = @file_get_contents(
+                       PATH_site . $this->templateFilePath . 'LoginForm.html'
+               );
+                       // Get the template part from the file
+               $template = $this->contentObject->getSubpart(
+                       $templateFile, '###TEMPLATE###'
+               );
+                       // Password has been given, but this form is rendered again.
+                       // This means the given password was wrong
+               if (!empty($password)) {
+                               // Get the subpart for the wrong password
+                       $wrongPasswordSubPart = $this->contentObject->getSubpart(
+                               $template, '###WRONGPASSWORD###'
+                       );
+                               // Define the markers content
+                       $wrongPasswordMarkers = array(
+                               'passwordMessage' => 'The password you just tried has this md5-value:',
+                               'password' => md5($password)
+                       );
+                               // Fill the markers in the subpart
+                       $wrongPasswordSubPart = $this->contentObject->substituteMarkerArray(
+                               $wrongPasswordSubPart,
+                               $wrongPasswordMarkers,
+                               '###|###',
+                               1,
+                               1
+                       );
+               }
+                       // Session has expired
                if (!$this->session->isAuthorized() && $this->session->isExpired()) {
-                       $this->message('Password', 'Your install tool session has expired', '', 3);
+                               // Get the subpart for the expired session message
+                       $sessionExpiredSubPart = $this->contentObject->getSubpart(
+                               $template, '###SESSIONEXPIRED###'
+                       );
+                               // Define the markers content
+                       $sessionExpiredMarkers = array(
+                               'message' => 'Your install tool session has expired'
+                       );
+                               // Fill the markers in the subpart
+                       $sessionExpiredSubPart = $this->contentObject->substituteMarkerArray(
+                               $sessionExpiredSubPart,
+                               $sessionExpiredMarkers,
+                               '###|###',
+                               1,
+                               1
+                       );
                }
-               $this->message('Password', 'Enter the Install Tool Password', $content, 0);
-               $this->output($this->outputWrapper($this->printAll()));
+                       // Substitute the subpart for the expired session in the template
+               $template = $this->contentObject->substituteSubpart(
+                       $template,
+                       '###SESSIONEXPIRED###',
+                       $sessionExpiredSubPart
+               );
+                       // Substitute the subpart for the wrong password in the template
+               $template = $this->contentObject->substituteSubpart(
+                       $template,
+                       '###WRONGPASSWORD###',
+                       $wrongPasswordSubPart
+               );
+                       // Define the markers content
+               $markers = array(
+                       'siteName' => 'Site: ' .
+                               $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'],
+                       'headTitle' => 'Login to TYPO3 ' . TYPO3_version . ' Install tool',
+                       'redirectUrl' => htmlspecialchars($redirect_url),
+                       'enterPassword' => 'Password',
+                       'login' => 'Login',
+                       'message' => '
+                               <p class="typo3-message message-information">
+                                       The Install Tool Password is <em>not</em> the admin password
+                                       of TYPO3.
+                                       <br />
+                                       If you don\'t know the current password, you can set a new
+                                       one by setting the value of
+                                       $TYPO3_CONF_VARS[\'BE\'][\'installToolPassword\'] in
+                                       typo3conf/localconf.php to the md5() hash value of the
+                                       password you desire.
+                               </p>
+                       '
+               );
+                       // Fill the markers in the template
+               $content = $this->contentObject->substituteMarkerArray(
+                       $template,
+                       $markers,
+                       '###|###',
+                       1,
+                       1
+               );
+                       // Send content to the page wrapper function
+               $this->output($this->outputWrapper($content));
        }
 
        /**
-        * Calling function that checks system, IM, GD, dirs, database and lets you alter localconf.php
+        * Calling function that checks system, IM, GD, dirs, database
+        * and lets you alter localconf.php
+        *
         * This method is called from init.php to start the install Tool.
         *
-        * @return      void
+        * @return void
         */
-       function init() {
-               if (!defined('PATH_typo3'))     exit;           // Must be called after inclusion of init.php (or from init.php)
+       function init() {
+               // Must be called after inclusion of init.php (or from init.php)
+               if (!defined('PATH_typo3'))     exit;
                if (!$this->passwordOK) exit;
 
                        // Setting stuff...
                $this->check_mail();
                $this->setupGeneral();
                $this->generateConfigForm();
-               if (count($this->messages))     t3lib_div::debug($this->messages);
+               if (count($this->messages)) {
+                       t3lib_div::debug($this->messages);
+               }
 
-               if ($this->step)        {
+               if ($this->step) {
                        $this->output($this->outputWrapper($this->stepOutput()));
                } else {
                                // Menu...
-                       switch($this->INSTALL['type'])  {
+                       switch($this->INSTALL['type']) {
                                case 'images':
                                        $this->checkIM=1;
                                        $this->checkTheConfig();
@@ -471,58 +567,162 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                case 'config':
                                        $this->silent=0;
                                        $this->checkIM=1;
-                                       $this->message('About configuration','How to configure TYPO3',$this->generallyAboutConfiguration());
+                                       $this->message(
+                                               'About configuration',
+                                               'How to configure TYPO3',
+                                               $this->generallyAboutConfiguration()
+                                       );
+                                       $this->message(
+                                               'System Information',
+                                               'Your system has the following configuration',
+                                               '
+                                                       <dl id="systemInformation">
+                                                               <dt>OS detected:</dt>
+                                                               <dd>' . (TYPO3_OS == 'WIN' ? 'WIN' : 'UNIX') .'</dd>
+                                                               <dt>UNIX/CGI detected:</dt>
+                                                               <dd>' . (PHP_SAPI == 'cgi' ? 'YES' : 'NO') . '</dd>
+                                                               <dt>PATH_thisScript:</dt>
+                                                               <dd>' . PATH_thisScript . '</dd>
+                                                       </dl>
+                                               '
+                                       );
                                        $this->checkTheConfig();
 
                                        $ext = 'Write config to localconf.php';
-                                       if ($this->fatalError)  {
-                                               if ($this->config_array['no_database'] || !$this->config_array['mysqlConnect']) {
+                                       if ($this->fatalError) {
+                                               if (
+                                                       $this->config_array['no_database'] ||
+                                                       !$this->config_array['mysqlConnect']
+                                               ) {
                                                        $this->message($ext, 'Database not configured yet!', '
-                                                               You need to specify database username, password and host as one of the first things.
-                                                               Next you\'ll have to select a database to use with TYPO3.
-                                                               Use the form below:
-                                                       ',2);
+                                                               <p>
+                                                                       You need to specify database username,
+                                                                       password and host as one of the first things.
+                                                                       <br />
+                                                                       Next you\'ll have to select a database to
+                                                                       use with TYPO3.
+                                                               </p>
+                                                               <p>
+                                                                       Use the form below.
+                                                               </p>
+                                                       ', 2);
                                                } else {
                                                        $this->message($ext, 'Fatal error encountered!', '
-                                                               Somewhere above a fatal configuration problem is encountered. Please make sure that you\'ve fixed this error before you submit the configuration. TYPO3 will not run if this problem is not fixed!
-                                                               You should also check all warnings that may appear.
-                                                       ',2);
+                                                               <p>
+                                                                       Somewhere above a fatal configuration
+                                                                       problem is encountered.
+                                                                       Please make sure that you\'ve fixed this
+                                                                       error before you submit the configuration.
+                                                                       TYPO3 will not run if this problem is not
+                                                                       fixed!
+                                                                       <br />
+                                                                       You should also check all warnings that may
+                                                                       appear.
+                                                               </p>
+                                                       ', 2);
                                                }
                                        } elseif ($this->mode=='123') {
-                                               if (!$this->fatalError) {
+                                               if (!$this->fatalError) {
                                                        $this->message($ext, 'Basic configuration completed', '
-                                                               You have no fatal errors in your basic configuration. You may have warnings though. Please pay attention to them! However you may continue and install the database.
-
-                                                               <strong><span style="color:#f00;">Step 2:</span></strong> <a href="'.$this->scriptSelf.'?TYPO3_INSTALL[type]=database'.($this->mode?'&mode='.rawurlencode($this->mode):'').'">Click here to install the database.</a>
-                                                       ',-1,1);
+                                                               <p>
+                                                                       You have no fatal errors in your basic
+                                                                       configuration.
+                                                                       You may have warnings though. Please pay
+                                                                       attention to them!
+                                                                       However you may continue and install the
+                                                                       database.
+                                                               </p>
+                                                               <p>
+                                                                       <strong>
+                                                                               <span style="color:#f00;">Step 2: </span>
+                                                                       </strong>
+                                                                       <a href="' . $this->scriptSelf .
+                                                                       '?TYPO3_INSTALL[type]=database' .
+                                                                       ($this->mode ? '&mode=' . rawurlencode($this->mode) : '') .
+                                                                       '">Click here to install the database.</a>
+                                                               </p>
+                                                       ', -1, 1);
                                                }
                                        }
-                                       $this->message($ext, 'Very Important: Changing Image Processing settings', "
-                                               When you change the settings for Image Processing you <i>must</i> take into account that <u>old images</u> may still be in typo3temp/ folder and prevent new files from being generated! This is especially important to know, if you're trying to set up image processing for the very first time.
-                                               The problem is solved by <a href=\"".htmlspecialchars($this->setScriptName('typo3temp'))."\">clearing the typo3temp/ folder</a>. Also make sure to clear the cache_pages table.
-                                               ",1,1);
-                                       $this->message($ext, 'Very Important: Changing Encryption Key setting', "
-                                               When you change the setting for the Encryption Key you <i>must</i> take into account that a change to this value might invalidate temporary information, URLs etc.
-                                               The problem is solved by <a href=\"".htmlspecialchars($this->setScriptName('typo3temp'))."\">clearing the typo3temp/ folder</a>. Also make sure to clear the cache_pages table.
-                                               ",1,1);
-                                       $this->message($ext, 'Update localconf.php', "
-                                               This form updates the localconf.php file with the suggested values you see below. The values are based on the analysis above.
-                                               You can change the values in case you have alternatives to the suggested defaults.
-                                               By this final step you will configure TYPO3 for immediate use provided that you have no fatal errors left above."
-                                               .$this->setupGeneral('get_form'),0,1);
+                                       $this->message($ext, 'Very Important: Changing Image Processing settings', '
+                                               <p>
+                                                       When you change the settings for Image Processing
+                                                       you <em>must</em> take into account
+                                                       that <em>old images</em> may still be in typo3temp/
+                                                       folder and prevent new files from being generated!
+                                                       <br />
+                                                       This is especially important to know, if you\'re
+                                                       trying to set up image processing for the very first
+                                                       time.
+                                                       <br />
+                                                       The problem is solved by <a href="' .
+                                                       htmlspecialchars($this->setScriptName('typo3temp')) .
+                                                       '">clearing the typo3temp/ folder</a>.
+                                                       Also make sure to clear the cache_pages table.
+                                               </p>
+                                       ', 1, 1);
+                                       $this->message($ext, 'Very Important: Changing Encryption Key setting', '
+                                               <p>
+                                                       When you change the setting for the Encryption Key
+                                                       you <em>must</em> take into account that a change to
+                                                       this value might invalidate temporary information,
+                                                       URLs etc.
+                                                       <br />
+                                                       The problem is solved by <a href="' .
+                                                       htmlspecialchars($this->setScriptName('typo3temp')) .
+                                                       '">clearing the typo3temp/ folder</a>.
+                                                       Also make sure to clear the cache_pages table.
+                                               </p>
+                                       ', 1, 1);
+                                       $this->message($ext, 'Update localconf.php', '
+                                               <p>
+                                                       This form updates the localconf.php file with the
+                                                       suggested values you see below. The values are based
+                                                       on the analysis above.
+                                                       <br />
+                                                       You can change the values in case you have
+                                                       alternatives to the suggested defaults.
+                                                       <br />
+                                                       By this final step you will configure TYPO3 for
+                                                       immediate use provided that you have no fatal errors
+                                                       left above.
+                                               </p>' . $this->setupGeneral('get_form') . '
+                                       ', 0, 1);
 
                                        $this->output($this->outputWrapper($this->printAll()));
 
                                break;
                                case 'extConfig':
                                        $this->silent=0;
-
                                        $this->generateConfigForm('get_form');
-
-                                       $content = $this->printAll();
-                                       $content = '<form action="'.$this->action.'" method="post">'.$content.'<input type="submit" value="Write to localconf.php"><br /><br />
-                                       '.$this->fw('<strong>NOTICE: </strong>By clicking this button, localconf.php is updated with new values for the parameters listed above!<br />').'
-                                       </form>';
+                                               // Get the template file
+                                       $templateFile = @file_get_contents(
+                                               PATH_site . $this->templateFilePath . 'InitExtConfig.html'
+                                       );
+                                               // Get the template part from the file
+                                       $template = $this->contentObject->getSubpart(
+                                               $templateFile, '###TEMPLATE###'
+                                       );
+                                               // Define the markers content
+                                       $markers = array(
+                                               'action' => $this->action,
+                                               'content' => $this->printAll(),
+                                               'write' => 'Write to localconf.php',
+                                               'notice' => 'NOTICE:',
+                                               'explanation' => '
+                                                       By clicking this button, localconf.php is updated
+                                                       with new values for the parameters listed above!
+                                               '
+                                       );
+                                               // Fill the markers in the template
+                                       $content = $this->contentObject->substituteMarkerArray(
+                                               $template,
+                                               $markers,
+                                               '###|###',
+                                               1,
+                                               1
+                                       );
+                                               // Send content to the page wrapper function
                                        $this->output($this->outputWrapper($content));
                                break;
                                case 'typo3temp':
@@ -548,60 +748,152 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
                                        $this->silent=0;
                                        $this->message('About', 'Warning - very important!', $this->securityRisk().$this->alterPasswordForm(),2);
 
-                                       $this->message('About', 'Using this script', "
-                                       Installing TYPO3 has always been a hot topic on the mailing list and forums. Therefore we've developed this tool which will help you through configuration and testing.
-                                       There are three primary steps for you to take:
-
-                                       <strong>1: Basic Configuration</strong>
-                                       In this step your PHP-configuration is checked. If there are any settings that will prevent TYPO3 from running correctly you'll get warnings and errors with a description of the problem.
-                                       You'll have to enter a database username, password and hostname. Then you can choose to create a new database or select an existing one.
-                                       Finally the image processing settings are entered and verified and you can choose to let the script update the configuration file, typo3conf/localconf.php with the suggested settings.
-
-                                       <strong>2: Database Analyser</strong>
-                                       In this step you can either install a new database or update the database from any previous TYPO3 version.
-                                       You can also get an overview of extra/missing fields/tables in the database compared to a raw sql-file.
-                                       The database is also verified agains your 'tables.php' configuration (\$TCA) and you can even see suggestions to entries in \$TCA or new fields in the database.
-
-                                       <strong>3: Update Wizard</strong>
-                                       Here you will find update methods taking care of changes to the TYPO3 core which are not backwards compatible.
-                                       It is recommended to run this wizard after every update to make sure everything will still work flawlessly.
-
-                                       <strong>4: Image Processing</strong>
-                                       This step is a visual guide to verify your configuration of the image processing software.
-                                       You'll be presented to a list of images that should all match in pairs. If some irregularity appears, you'll get a warning. Thus you're able to track an error before you'll discover it on your website.
-
-                                       <strong>5: All Configuration</strong>
-                                       This gives you access to any of the configuration options in the TYPO3_CONF_VARS array. Every option is also presented with a comment explaining what it does.
-
-                                       <strong>6: typo3temp/</strong>
-                                       Here you can manage the files in typo3temp/ folder in a simple manner. typo3temp/ contains temporary files, which may still be used by the website, but some may not. By searching for files with old access-dates, you can possibly manage to delete unused files rather than files still used. However if you delete a temporary file still in use, it's just regenerated as long as you make sure to clear the cache tables afterwards.
-                                       ");
+                                       $this->message('About', 'Using this script', '
+                                               <p>
+                                                       Installing TYPO3 has always been a hot topic on the
+                                                       mailing list and forums. Therefore we\'ve developed
+                                                       this tool which will help you through configuration
+                                                       and testing.
+                                                       <br />
+                                                       There are three primary steps for you to take:
+                                               </p>
+                                               <p>
+                                                       <strong>1: Basic Configuration</strong>
+                                                       <br />
+                                                       In this step your PHP-configuration is checked. If
+                                                       there are any settings that will prevent TYPO3 from
+                                                       running correctly you\'ll get warnings and errors
+                                                       with a description of the problem.
+                                                       <br />
+                                                       You\'ll have to enter a database username, password
+                                                       and hostname. Then you can choose to create a new
+                                                       database or select an existing one.
+                                                       <br />
+                                                       Finally the image processing settings are entered
+                                                       and verified and you can choose to let the script
+                                                       update the configuration file,
+                                                       typo3conf/localconf.php with the suggested settings.
+                                               </p>
+                                               <p>
+                                                       <strong>2: Database Analyser</strong>
+                                                       <br />
+                                                       In this step you can either install a new database
+                                                       or update the database from any previous TYPO3
+                                                       version.
+                                                       <br />
+                                                       You can also get an overview of extra/missing
+                                                       fields/tables in the database compared to a raw
+                                                       sql-file.
+                                                       <br />
+                                                       The database is also verified against your
+                                                       \'tables.php\' configuration ($TCA) and you can
+                                                       even see suggestions to entries in $TCA or new
+                                                       fields in the database.
+                                               </p>
+                                               <p>
+                                                       <strong>3: Update Wizard</strong>
+                                                       <br />
+                                                       Here you will find update methods taking care of
+                                                       changes to the TYPO3 core which are not backwards
+                                                       compatible.
+                                                       <br />
+                                                       It is recommended to run this wizard after every
+                                                       update to make sure everything will still work
+                                                       flawlessly.
+                                               </p>
+                                               <p>
+                                                       <strong>4: Image Processing</strong>
+                                                       <br />
+                                                       This step is a visual guide to verify your
+                                                       configuration of the image processing software.
+                                                       <br />
+                                                       You\'ll be presented to a list of images that should
+                                                       all match in pairs. If some irregularity appears,
+                                                       you\'ll get a warning. Thus you\'re able to track an
+                                                       error before you\'ll discover it on your website.
+                                               </p>
+                                               <p>
+                                                       <strong>5: All Configuration</strong>
+                                                       <br />
+                                                       This gives you access to any of the configuration
+                                                       options in the TYPO3_CONF_VARS array. Every option
+                                                       is also presented with a comment explaining what it
+                                                       does.
+                                               </p>
+                                               <p>
+                                                       <strong>6: typo3temp/</strong>
+                                                       <br />
+                                                       Here you can manage the files in typo3temp/ folder
+                                                       in a simple manner. typo3temp/ contains temporary
+                                                       files, which may still be used by the website, but
+                                                       some may not. By searching for files with old
+                                                       access-dates, you can possibly manage to delete
+                                                       unused files rather than files still used. However
+                                                       if you delete a temporary file still in use, it\'s
+                                                       just regenerated as long as you make sure to clear
+                                                       the cache tables afterwards.
+                                               </p>
+                                       ');
 
-                                       $this->message('About', 'Why is this script stand-alone?', "
-                                       You would think that this script should rather be a module in the backend and access-controlled to only admin-users from the database. But that's not how it works.
-                                       The reason is, that this script must not be depending on the success of the configuration of TYPO3 and whether or not there is a working database behind. Therefore the script is invoked from the backend init.php file, which allows access if the constant 'TYPO3_enterInstallScript' has been defined and is not false. That is and should be the case <i>only</i> when calling the script 'typo3/install/index.php' - this script!
-                                       ");
+                                       $this->message('About', 'Why is this script stand-alone?', '
+                                               <p>
+                                                       You would think that this script should rather be a
+                                                       module in the backend and access-controlled to only
+                                                       admin-users from the database. But that\'s not how
+                                                       it works.
+                                                       <br />
+                                                       The reason is, that this script must not be
+                                                       depending on the success of the configuration of
+                                                       TYPO3 and whether or not there is a working database
+                                                       behind. Therefore the script is invoked from the
+                                                       backend init.php file, which allows access if the
+                                                       constant \'TYPO3_enterInstallScript\' has been
+                                                       defined and is not false. That is and should be the
+                                                       case <em>only</em> when calling the script
+                                                       \'typo3/install/index.php\' - this script!
+                                               </p>
+                                       ');
 
 
                                        $headCode='Header legend';
                                        $this->message($headCode, 'Notice!', '
-                                       Indicates that something is important to be aware of.
-                                       This does <em>not</em> indicate an error.
-                                       ',1);
+                                               <p>
+                                                       Indicates that something is important to be aware
+                                                       of.
+                                                       <br />
+                                                       This does <em>not</em> indicate an error.
+                                               </p>
+                                       ', 1);
                                        $this->message($headCode, 'Just information', '
-                                       This is a simple message with some information about something.
+                                               <p>
+                                                       This is a simple message with some information about
+                                                       something.
+                                               </p>
                                        ');
                                        $this->message($headCode, 'Check was successful', '
-                                       Indicates that something was checked and returned an expected result.
-                                       ',-1);
+                                               <p>
+                                                       Indicates that something was checked and returned an
+                                                       expected result.
+                                               </p>
+                                       ', -1);
                                        $this->message($headCode, 'Warning!', '
-                                       Indicates that something may very well cause trouble and you should definitely look into it before proceeding.
-                                       This indicates a <em>potential</em> error.
-                                       ',2);
+                                               <p>
+                                                       Indicates that something may very well cause trouble
+                                                       and you should definitely look into it before
+                                                       proceeding.
+                                                       <br />
+                                                       This indicates a <em>potential</em> error.
+                                               </p>
+                                       ', 2);
                                        $this->message($headCode, 'Error!', '
-                                       Indicates that something is definitely wrong and that TYPO3 will most likely not perform as expected if this problem is not solved.
-                                       This indicates an actual error.
-                                       ',3);
+                                               <p>
+                                                       Indicates that something is definitely wrong and
+                                                       that TYPO3 will most likely not perform as expected
+                                                       if this problem is not solved.
+                                                       <br />
+                                                       This indicates an actual error.
+                                               </p>
+                                       ', 3);
 
                                        $this->output($this->outputWrapper($this->printAll()));
                                break;
@@ -612,283 +904,383 @@ REMOTE_ADDR was '".t3lib_div::getIndpEnv('REMOTE_ADDR')."' (".t3lib_div::getIndp
        /**
         * Controls the step 1-2-3-go process
         *
-        * @return      string  the content to output to the screen
+        * @return string The content to output to the screen
         */
-       function stepOutput()   {
+       function stepOutput() {
+                       // Get the template file
+               $templateFile = @file_get_contents(
+                       PATH_site . $this->templateFilePath . 'StepOutput.html'
+               );
+                       // Get the template part from the file
+               $template = $this->contentObject->getSubpart(
+                       $templateFile, '###TEMPLATE###'
+               );
+                       // Define the markers content
+               $markers = array(
+                       'stepHeader' => $this->stepHeader(),
+                       'notice' => 'Skip this wizard (for powerusers only)',
+                       'skip123' => $this->scriptSelf
+               );
+
                $this->checkTheConfig();
-               $error_missingConnect='<br />
-                       '.$this->fontTag2.'<img src="'.$this->backPath.'gfx/icon_fatalerror.gif" width="18" height="16" class="absmiddle">
-                       There is no connection to the database!<br />
-                       (Username: <i>' . TYPO3_db_username . '</i>, Host: <i>' . TYPO3_db_host . '</i>, Using Password: YES) . <br />
-                       <br />
-                       <strong>Go to Step 1</strong> and enter a proper username/password!</span>
-                       <br />
-                       <br />
+               $error_missingConnect = '
+                       <p class="typo3-message message-error">
+                               <strong>
+                                       There is no connection to the database!
+                               </strong>
+                               <br />
+                               (Username: <em>' . TYPO3_db_username . '</em>,
+                               Host: <em>' . TYPO3_db_host . '</em>,
+                               Using Password: YES)
+                               <br />
+                               Go to Step 1 and enter a proper username/password!
+                       </p>
                ';
-               $error_missingDB='<br />
-                       '.$this->fontTag2.'<img src="'.$this->backPath.'gfx/icon_fatalerror.gif" width="18" height="16" class="absmiddle">
-                       There is no access to the database (<i>'.TYPO3_db.'</i>)!<br />
-                       <br />
-                       <strong>Go to Step 2</strong> and select an accessible database!</span>
-                       <br />
-                       <br />
+               $error_missingDB = '
+                       <p class="typo3-message message-error">
+                               <strong>
+                                       There is no access to the database (<em>' . TYPO3_db . '</em>)!
+                               </strong>
+                               <br />
+                               Go to Step 2 and select an accessible database!
+                       </p>
                ';
 
-                       // only get the number of tables if it is not the first step in the 123-installer
+                       // only get the number of tables if it is not the first two steps in the 123-installer
                        // (= no DB connection yet)
-               $whichTables = ($this->step != 1 ? $this->getListOfTables() : array());
-               $dbInfo='
-                                       <table border="0" cellpadding="1" cellspacing="0">
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap" colspan="2" align="center">'.$this->fontTag2.'<strong><img src="'.$this->backPath.'gfx/icon_note.gif" hspace="5" width="18" height="16" class="absmiddle">Database summary:</strong></span></td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap">'.$this->fontTag1.'Username:</span></td>
-                                                       <td valign="top" nowrap="nowrap"><strong>'.$this->fontTag1.''.TYPO3_db_username.'</span></strong></td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap">'.$this->fontTag1.'Host:</span></td>
-                                                       <td valign="top" nowrap="nowrap"><strong>'.$this->fontTag1.''.TYPO3_db_host.'</span></strong></td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap">'.$this->fontTag1.'Database:</span></td>
-                                                       <td valign="top" nowrap="nowrap"><strong>'.$this->fontTag1.''.TYPO3_db.'</span></strong></td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap">'.$this->fontTag1.'# of tables:</span></td>
-                                                       <td valign="top" nowrap="nowrap"><strong>'.$this->fontTag1.''.(count($whichTables)?'<span style="color:#f00;">'.count($whichTables).'</span>':count($whichTables)).'</span></strong></td>
-                                               </tr>
-                                       </table>
-               ';
-               $error_emptyDB='<br />
-                       '.$this->fontTag2.'<img src="'.$this->backPath.'gfx/icon_fatalerror.gif" width="18" height="16" class="absmiddle">
-                       The database is still empty. There are no tables!<br />
-                       <br />
-                       <strong>Go to Step 3</strong> and import a database!</span>
-                       <br />
-                       <br />
+               $whichTables = ($this->step != 1 && $this->step != 2 ? $this->getListOfTables() : array());
+
+               $error_emptyDB = '
+                       <p class="typo3-message message-error">
+                               <strong>
+                                       The database is still empty. There are no tables!
+                               </strong>
+                               <br />
+                               Go to Step 3 and import a database!
+                       </p>
                ';
 
-               switch(strtolower($this->step)) {
-                       case 1:
-                               $msg='
-                                       <br />
-                                       <br />
-                                       <table border="0">
-                                          <form action="'.$this->action.'" method="post">
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap"><strong>
-                                                                 '.$this->fontTag2.'Username:</span></strong>
-                                                       </td>
-                                                       <td>    &nbsp;
-                                                       </td>
-                                                       <td valign="top">
-                                                                 '.$this->fontTag2.'
-                                                                 <input type="text" name="TYPO3_INSTALL[localconf.php][typo_db_username]" value="'.TYPO3_db_username.'"></span><br />
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap"><strong>
-                                                                 '.$this->fontTag2.'Password:</span></strong>
-                                                       </td>
-                                                       <td>    &nbsp;
-                                                       </td>
-                                                       <td valign="top">
-                                                                 '.$this->fontTag2.'
-                                                                 <input type="password" name="TYPO3_INSTALL[localconf.php][typo_db_password]" value="'.TYPO3_db_password.'"></span><br />
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap"><strong>
-                                                                 '.$this->fontTag2.'Host:</span></strong>
-                                                       </td>
-                                                       <td>    &nbsp;
-                                                       </td>
-                                                       <td valign="top">
-                                                                 '.$this->fontTag2.'
-                                                                 <input type="text" name="TYPO3_INSTALL[localconf.php][typo_db_host]" value="'.(TYPO3_db_host?TYPO3_db_host:'localhost').'"></span><br />
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap"><strong>
-                                                                 '.$this->fontTag1.'</span></strong>
-                                                       </td>
-                                                       <td>    &nbsp;
-                                                       </td>
-                                                       <td valign="top">
-                                                                 '.$this->fontTag1.'<br />
-                                                          <input type="hidden" name="step" value="2">
-                                                          <input type="hidden" name="TYPO3_INSTALL[localconf.php][encryptionKey]" value="' . $this->createEncryptionKey() . '">
-                                                                <input type="hidden" name="TYPO3_INSTALL[localconf.php][compat_version]" value="'.TYPO3_branch.'">
-                                                                 <input type="submit" value="Continue"><br /><br /><strong>NOTICE: </strong>By clicking this button, typo3conf/localconf.php is updated with new values for the parameters listed above!</span><br />
-                                                       </td>
-                                               </tr>
-                                          </form>
-                                       </table>
-                                       <br />
-                                       <br />';
-                       break;
-                       case 2:
-                               if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect(TYPO3_db_host, TYPO3_db_username, TYPO3_db_password))  {
-                                       $dbArr = $this->getDatabaseList();
-                                       $options = '<option value="">[ SELECT DATABASE ]</option>';
-                                       $dbIncluded = 0;
-                                       foreach ($dbArr as $dbname) {
-                                               $options.='<option value="'.htmlspecialchars($dbname).'"'.($dbname==TYPO3_db?' selected="selected"':'').'>'.htmlspecialchars($dbname).'</option>';
-                                               if ($dbname==TYPO3_db)  $dbIncluded=1;
-                                       }
-                                       if (!$dbIncluded && TYPO3_db)   {
-                                               $options.='<option value="'.htmlspecialchars(TYPO3_db).'" selected="selected">'.htmlspecialchars(TYPO3_db).' (NO ACCESS!)</option>';
-                                       }
-                                       $select='<select name="TYPO3_INSTALL[localconf.php][typo_db]">'.$options.'</select>';
-                                       $msg='
-<br />
-<br />
-                                       <table border="0">
-                                          <form action="'.$this->action.'" method="post">
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap"><strong>
-                                                                 '.$this->fontTag2.'
-                                                          You have two options:<br />
-                                                          <br /><br />
-
-                                                          1: Select an existing <u>EMPTY</u> database:</span></strong>
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top">
-                                                                 '.$this->fontTag1.'Any existing tables which are used by TYPO3 will be overwritten in Step 3. So make sure this database is empty:<br />'.$select.'</span><br />
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top" nowrap="nowrap"><br />
-                                                       <br />
-<strong>
-                                                                 '.$this->fontTag2.'2: Create new database (recommended):</span></strong>
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top">
-                                                                 '.$this->fontTag1.'Enter the desired name of the database here:<br /><input type="text" name="TYPO3_INSTALL[localconf.php][NEW_DATABASE_NAME]" value=""></span><br />
-                                                       </td>
-                                               </tr>
-                                               <tr>
-                                                       <td valign="top">                  <br />
-
-                                                                 '.$this->fontTag1.'<br />
-                                                          <input type="hidden" name="step" value="3">
-                                                                 <input type="submit" value="Continue"><br /><br /><strong>NOTICE: </strong>By clicking this button, typo3conf/localconf.php is updated with new values for the parameters listed above!</span><br />
-                                                       </td>
-                                               </tr>
-                                          </form>
-                                       </table>
-<br />
-<br />
-                               ';
-                               } else {
-                                       $msg=$error_missingConnect;
-                               }
-                       break;
-                       case 3:
-                               if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect(TYPO3_db_host, TYPO3_db_username, TYPO3_db_password))  {
-                                       if ($GLOBALS['TYPO3_DB']->sql_select_db(TYPO3_db))      {
-                                               $sFiles = t3lib_div::getFilesInDir(PATH_typo3conf,'sql',1,1);
+                       // Hook to override and add steps to the 1-2-3 installer
+               if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['stepOutput'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['stepOutput'] as $classData) {
+                               $hookObject = t3lib_div::getUserObj($classData);
+                               $hookObject->execute($markers, $this->step, $this);
+                       }
+               }
+                       // Use the default steps when there is no override
+               if (!$markers['header'] && !$markers['step']) {
+                       switch(strtolower($this->step)) {
+                               case 1:
+                                               // Get the subpart for the first step
+                                       $step1SubPart = $this->contentObject->getSubpart(
+                                               $templateFile, '###STEP1###'
+                                       );
+                                               // Add header marker for main template
+                                       $markers['header'] = 'Welcome to the TYPO3 installation process';
+                                               // Define the markers content for the subpart
+                                       $step1SubPartMarkers = array(
+                                               'llIntroduction' => '
+                                                       <p>
+                                                               TYPO3 is an enterprise content management system
+                                                               that is very powerfull and yet easy to install.
+                                                       </p>
+                                                       <p>
+                                                               Choose your database, import some data and
+                                                               you\'re done!
+                                                       </p>
+                                               ',
+                                               'step' => $this->step + 1,
+                                               'action' => htmlspecialchars($this->action),
+                                               'continue' => 'Continue'
+                                       );
+                                               // Add step marker for main template
+                                       $markers['step'] = $this->contentObject->substituteMarkerArray(
+                                               $step1SubPart,
+                                               $step1SubPartMarkers,
+                                               '###|###',
+                                               1,
+                                               1
+                                       );
+                               break;
+                               case 2:
+                                               // Get the subpart for the second step
+                                       $step2SubPart = $this->contentObject->getSubpart(
+                                               $templateFile, '###STEP2###'
+                                       );
+                                               // Add header marker for main template
+                                       $markers['header'] = 'Connect to your database host';
+                                               // Define the markers content for the subpart
+                                       $step2SubPartMarkers = array(
+                                               'step' => $this->step + 1,
+                                               'action' => htmlspecialchars($this->action),
+                                               'encryptionKey' => $this->createEncryptionKey(),
+                                               'branch' => TYPO3_branch,
+                                               'labelUsername' => 'Username',
+                                               'username' => TYPO3_db_username,
+                                               'labelPassword' => 'Password',
+                                               'password' => TYPO3_db_password,
+                                               'labelHost' => 'Host',
+                                               'host' => TYPO3_db_host ? TYPO3_db_host : 'localhost',
+                                               'continue' => 'Continue'
+                                       );
+                                               // Add step marker for main template
+                                       $markers['step'] = $this->contentObject->substituteMarkerArray(
+                                               $step2SubPart,
+                                               $step2SubPartMarkers,
+                                               '###|###',
+                                               1,
+                                               1
+                                       );
+                               break;
+                               case 3:
+                                               // Add header marker for main template
+                                       $markers['header'] = 'Select database';
+                                               // 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
+                                       )) {
+                                                       // Get the subpart for the third step
+                                               $step3SubPart = $this->contentObject->getSubpart(
+                                                       $templateFile, '###STEP3###'
+                                               );
+                                                       // Get the subpart for the database options
+                                               $step3DatabaseOptionsSubPart = $this->contentObject->getSubpart(
+                                                       $step3SubPart, '###DATABASEOPTIONS###'
+                                               );
 
-                                                       // 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');
+                                               $dbArr = $this->getDatabaseList();
+                                               $dbIncluded = 0;
+                                               foreach ($dbArr as $dbname) {
+                                                               // Define the markers content for database options
+                                                       $step3DatabaseOptionMarkers = array(
+                                                               'databaseValue' => htmlspecialchars($dbname),
+                                                               'databaseSelected' => $dbname == TYPO3_db ? 'selected="selected"' : '',
+                                                               'databaseName' => htmlspecialchars($dbname)
+                                                       );
+                                                               // Add the option HTML to an array
+                                                       $step3DatabaseOptions[] = $this->contentObject->substituteMarkerArray(
+                                                               $step3DatabaseOptionsSubPart,
+                                                               $step3DatabaseOptionMarkers,
+                                                               '###|###',
+                                                               1,
+                                                               1
+                                                       );
+                                                       if ($dbname==TYPO3_db)  $dbIncluded=1;
                                                }
-
-                                               $opt='';
-                                               foreach ($sFiles as $f) {
-                                                       if ($f=='Create default database tables')       $key='CURRENT_TABLES+STATIC';
-                                                       else $key=htmlspecialchars($f);
-
-                                                       $opt.='<option value="import|'.$key.'">'.htmlspecialchars(basename($f)).'</option>';
+                                               if (!$dbIncluded && TYPO3_db) {
+                                                               // // Define the markers content when no access
+                                                       $step3DatabaseOptionMarkers = array(
+                                                               'databaseValue' => htmlspecialchars(TYPO3_db),
+                                                               'databaseSelected' => 'selected="selected"',
+                                                               'databaseName' => htmlspecialchars(TYPO3_db) . ' (NO ACCESS!)'
+                                                       );
+                                                               // Add the option HTML to an array
+                                                       $step3DatabaseOptions[] = $this->contentObject->substituteMarkerArray(
+                                                               $step3DatabaseOptionsSubPart,
+                                                               $step3DatabaseOptionMarkers,
+                                                               '###|###',
+                                                               1,
+                                                               1
+                                                       );
                                                }
+                                                       // Substitute the subpart for the database options
+                                               $content = $this->contentObject->substituteSubpart(
+                                                       $step3SubPart,
+                                                       '###DATABASEOPTIONS###',
+                                                       implode(chr(10), $step3DatabaseOptions)
+                                               );
+                                                       // Define the markers content
+                                               $step3SubPartMarkers = array(
+                                                       'step' => $this->step + 1,
+                                                       'llOptions' => 'You have two options in this step.',
+                                                       'action' => htmlspecialchars($this->action),
+                                                       'llOption1' => '1: Create new database (recommended):',
+                                                       'llRemark1' => 'Enter your desired name for the database.',
+                                                       'llOption2' => '2: Select an EMPTY existing database:',
+                                                       'llRemark2' => 'All tables used by TYPO3 will be overwritten in step 3.',
+                                                       'continue' => 'Continue'
+                                               );
+                                                       // Add step marker for main template
+                                               $markers['step'] = $this->contentObject->substituteMarkerArray(
+                                                       $content,
+                                                       $step3SubPartMarkers,
+                                                       '###|###',
+                                                       1,
+                                                       1
+                                               );
+                                       } else {
+                                                       // Add step marker for main template when no connection
+                                               $markers['step'] = $error_missingConnect;
+                                       }
+                               break;
+                               case 4:
+                                               // Add header marker for main template
+                                       $markers['header'] = 'Import the database sql-file';
+                                               // 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
+                                       )) {
+                                                       // The selected database should be accessible
+                                               if ($GLOBALS['TYPO3_DB']->sql_select_db(TYPO3_db)) {
+                                                               // Get the subpart for the fourth step
+                                                       $step4SubPart = $this->contentObject->getSubpart(
+                                                               $templateFile, '###STEP4###'
+                                                       );
+                                                               // Get the subpart for the database type options
+                                                       $step4DatabaseTypeOptionsSubPart = $this->contentObject->getSubpart(
+                                                               $step4SubPart, '###DATABASETYPEOPTIONS###'
+                                                       );
 
+                                                       $sFiles = t3lib_div::getFilesInDir(PATH_typo3conf,'sql',1,1);
 
-                                               $content='
-                                                       '.$this->fontTag2.'Please select a database dump:</span><br />
-                                                       <input type="hidden" name="TYPO3_INSTALL[database_import_all]" value=1>
-                                                       <input type="hidden" name="step" value="">
-                                                       <input type="hidden" name="goto_step" value="go">
-                                                       <select name="TYPO3_INSTALL[database_type]">'.$opt.'</select><br />';
-
-                                               $content = $this->getUpdateDbFormWrap('import', $content, 'Import database');
-
-                                               $msg='
-                                               <br />
-                                               '.$dbInfo.'<br />
-                                               <br />
-                                               '.$content.'
-
-                                               ';
+                                                               // 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');
+                                                       }
 
+                                                       $opt='';
+                                                       foreach ($sFiles as $f) {
+                                                               if ($f=='Create default database tables')       $key='CURRENT_TABLES+STATIC';
+                                                               else $key=htmlspecialchars($f);
+                                                                       // Define the markers content for database type subpart
+                                                               $step4DatabaseTypeOptionMarkers = array(
+                                                                       'databaseTypeValue' => 'import|' . $key,
+                                                                       'databaseName' => htmlspecialchars(basename($f))
+                                                               );
+                                                                       // Add the option HTML to an array
+                                                               $step4DatabaseTypeOptions[] = $this->contentObject->substituteMarkerArray(
+                                                                       $step4DatabaseTypeOptionsSubPart,
+                                                                       $step4DatabaseTypeOptionMarkers,
+                                                                       '###|###',
+                                                                       1,
+                                                                       1
+                                                               );
+                                                       }
+                                                               // Substitute the subpart for the database type options
+                                                       $content = $this->contentObject->substituteSubpart(
+                                                               $step4SubPart,
+                                                               '###DATABASETYPEOPTIONS###',
+                                                               implode(chr(10), $step4DatabaseTypeOptions)
+                                                       );
+                                                               // Define the markers content
+                                                       $step4SubPartMarkers = array(
+                                                               'llSummary' => 'Database summary:',
+                                                               'llUsername' => 'Username:',
+                                                               'username' => TYPO3_db_username,
+                                                               'llHost' => 'Host:',
+                                                               'host' => TYPO3_db_host,
+                                                               'llDatabase' => 'Database:',
+                                                               'database' => TYPO3_db,
+                                                               'llNumberTables' => 'Number of tables:',
+                                                               'numberTables' => count($whichTables),
+                                                               'action' => htmlspecialchars($this->action),
+                                                               'llDatabaseType' => 'Please select a database dump:',
+                                                               'label' => 'Import database'
+                                                       );
+                                                               // Add step marker for main template
+                                                       $markers['step'] = $this->contentObject->substituteMarkerArray(
+                                                               $content,
+                                                               $step4SubPartMarkers,
+                                                               '###|###',
+                                                               1,
+                                                               1
+                                                       );
+                                               } else {
+                                                               // Add step marker for main template when no database
+                                                       $markers['step'] = $error_missingDB;
+                                               }
                                        } else {
-                                               $msg=$error_missingDB;
+                                                       // Add step marker for main template when no connection
+                                               $markers['step'] = $error_missingConnect;
                                        }
-                               } else {
-                                       $msg=$error_missingConnect;
-                               }
-                       break;
-                       case 'go':
-                               if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect(TYPO3_db_host, TYPO3_db_username, TYPO3_db_password))  {
-                                       if ($GLOBALS['TYPO3_DB']->sql_select_db(TYPO3_db))      {
-                                               if (count($whichTables))        {
-                                                       $msg='
-                                                       <br />
-                                                       '.$this->fontTag2.'
-                                                       '.nl2br($this->messageBasicFinished()).'
-                                                       <br />
-                                                       <hr />
-                                                       <div align="center"><strong><img src="'.$this->backPath.'gfx/icon_warning.gif" hspace="5" width="18" height="16" class="absmiddle">IMPORTANT</strong></div><br />
-                                                       <span class="smalltext">'.nl2br($this->securityRisk()).'
-                                                       <br />
-                                                       <strong>Enter <a href="'.$this->scriptSelf.'">"Normal" mode for the Install Tool</a> to change this!</strong><br />
-
-                                                       </span>
-                                                       </span><br />
-                                                       ';
+                               break;
+                               case 'go':
+                                               // Add header marker for main template
+                                       $markers['header'] = 'You\'re done!';
+                                               // 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
+                                       )) {
+                                                       // The selected database should be accessible
+                                               if ($GLOBALS['TYPO3_DB']->sql_select_db(TYPO3_db)) {
+                                                               // The database should contain tables
+                                                       if (count($whichTables)) {
+                                                                       // Get the subpart for the go step
+                                                               $stepGoSubPart = $this->contentObject->getSubpart(
+                                                                       $templateFile, '###STEPGO###'
+                                                               );
+                                                                       // Define the markers content
+                                                               $stepGoSubPartMarkers = array(
+                                                                       'messageBasicFinished' => $this->messageBasicFinished(),
+                                                                       'llImportant' => 'Important',
+                                                                       'securityRisk' => $this->securityRisk(),
+                                                                       'llSwitchMode' => 'Enter
+                                                                               <a href="' . $this->scriptSelf . '">
+                                                                                       "Normal"
+                                                                               </a>
+                                                                               mode for the Install Tool to change this!
+                                                                       '
+                                                               );
+                                                                       // Add step marker for main template
+                                                               $markers['step'] = $this->contentObject->substituteMarkerArray(
+                                                                       $stepGoSubPart,
+                                                                       $stepGoSubPartMarkers,
+                                                                       '###|###',
+                                                                       1,
+                                                                       1
+                                                               );
+                                                       } else {
+                                                                       // Add step marker for main template when empty database
+                                                               $markers['step'] = $error_emptyDB;
+                                                       }
                                                } else {
-