14814.diff

Administrator Admin, 2010-06-22 05:27

Download (11.1 KB)

View differences:

typo3/install/index.php (working copy)
88 88
	$markers = array(
89 89
		'styleSheet' => $stylesheet,
90 90
		'javascript' => $javascript,
91
		'title' => 'The install tool is locked',
91
		'title' => 'The Install Tool is locked',
92 92
		'content' => '
93 93
			<p>
94
				To enable access to the install tool, you have the following option<span class="t3-install-locked-user-settings">s</span>:
94
				To enable the Install Tool, the file ENABLE_INSTALL_TOOL must be created.
95 95
			</p>
96 96
			<ul>
97 97
				<li>
98
					Create a file named <strong>ENABLE_INSTALL_TOOL</strong>
99
					and put it into the folder <strong>typo3conf/</strong>.<br />
100
					This file may simply be empty.
98
					In the typo3conf/ folder, create a file named ENABLE_INSTALL_TOOL. The file name is 
99
					case sensitive, but the file itself can simply be an empty file.
101 100
				</li>
102 101
				<li class="t3-install-locked-user-settings">
103
					Go to <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a> and let TYPO3 create this file for you.
102
					Alternatively, in the Backend, go to <a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a>
103
					and let TYPO3 create this file for you. When you\'re finished, you can also visit 
104
					<a href="../sysext/setup/mod/index.php">User tools &gt; User settings</a> and delete the file from there.
104 105
				</li>
105 106
			</ul>
106 107
			<p>
107
				For security reasons, it is highly recommended to rename or
108
				delete the file after the operation is finished.
108
				For security reasons, it is highly recommended that you either rename or delete the file after the operation is finished.
109 109
			</p>
110 110
			<p>
111
				If the file is older than 1 hour TYPO3 has automatically deleted
112
				it, so it needs to be created again.
111
				As an additional security measure, if the file is older than one hour, TYPO3 will automatically delete it.
113 112
			</p>
114 113
		'
115 114
	);
typo3/sysext/install/mod/class.tx_install.php (working copy)
897 897
			// Define the markers content
898 898
		$markers = array(
899 899
			'stepHeader' => $this->stepHeader(),
900
			'notice' => 'Skip this wizard (for powerusers only)',
900
			'notice' => 'Skip this wizard (for power users only)',
901 901
			'skip123' => $this->scriptSelf
902 902
		);
903 903

  
......
912 912
				Host: <em>' . TYPO3_db_host . '</em>,
913 913
				Using Password: YES)
914 914
				<br />
915
				Go to Step 1 and enter a proper username/password!
915
				Go to Step 1 and enter a valid username and password!
916 916
			</p>
917 917
		';
918 918
		$error_missingDB = '
......
921 921
					There is no access to the database (<em>' . TYPO3_db . '</em>)!
922 922
				</strong>
923 923
				<br />
924
				Go to Step 2 and select an accessible database!
924
				Go to Step 2 and select a valid database!
925 925
			</p>
926 926
		';
927 927

  
......
955 955
						$templateFile, '###STEP1###'
956 956
					);
957 957
						// Add header marker for main template
958
					$markers['header'] = 'Welcome to the TYPO3 installation process';
958
					$markers['header'] = 'Welcome to the TYPO3 Install Tool';
959 959
						// Define the markers content for the subpart
960 960
					$step1SubPartMarkers = array(
961 961
						'llIntroduction' => '
962 962
							<p>
963 963
								TYPO3 is an enterprise content management system
964
								that is very powerful and yet easy to install.
964
								that is powerful, yet easy to install.
965 965
							</p>
966 966
							<p>
967
								Choose your database, import some data and
968
								you\'re done!
967
								In three simple steps you\'ll be ready to add content to your website.
969 968
							</p>
970 969
						',
971 970
						'step' => $this->step + 1,
......
1000 999
						'password' => TYPO3_db_password,
1001 1000
						'labelHost' => 'Host',
1002 1001
						'host' => TYPO3_db_host ? TYPO3_db_host : 'localhost',
1003
						'continue' => 'Continue'
1002
						'continue' => 'Continue',
1003
						'llDescription' => 'If you have not already created a username and password to access the database, please do so now. This can be done using tools provided by your host.'
1004 1004
					);
1005 1005
						// Add step marker for main template
1006 1006
					$markers['step'] = t3lib_parsehtml::substituteMarkerArray(
......
1071 1071
							// Define the markers content
1072 1072
						$step3SubPartMarkers = array(
1073 1073
							'step' => $this->step + 1,
1074
							'llOptions' => 'You have two options in this step.',
1074
							'llOptions' => 'You have two options:',
1075 1075
							'action' => htmlspecialchars($this->action),
1076
							'llOption1' => 'Create new database (recommended):',
1077
							'llRemark1' => 'Enter your desired name for the database.',
1076
							'llOption1' => 'Create a new database (recommended):',
1077
							'llRemark1' => 'Enter a name for your TYPO3 database.',
1078 1078
							'llOption2' => 'Select an EMPTY existing database:',
1079
							'llRemark2' => 'All tables used by TYPO3 will be overwritten in step 3.',
1079
							'llRemark2' => 'Any tables used by TYPO3 will be overwritten.',
1080 1080
							'continue' => 'Continue'
1081 1081
						);
1082 1082
							// Add step marker for main template
......
1094 1094
				break;
1095 1095
				case 4:
1096 1096
						// Add header marker for main template
1097
					$markers['header'] = 'Import the database sql-file';
1097
					$markers['header'] = 'Import the Database Tables';
1098 1098
						// There should be a database host connection at this point
1099 1099
					if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect(
1100 1100
						TYPO3_db_host, TYPO3_db_username, TYPO3_db_password
......
1114 1114

  
1115 1115
								// Check if default database scheme "database.sql" already exists, otherwise create it
1116 1116
							if (!strstr(implode(',',$sFiles).',', '/database.sql,')) {
1117
								array_unshift($sFiles,'Create default database tables');
1117
								array_unshift($sFiles,'Default TYPO3 Tables');
1118 1118
							}
1119 1119

  
1120 1120
							$opt='';
1121 1121
							foreach ($sFiles as $f) {
1122
								if ($f=='Create default database tables')	$key='CURRENT_TABLES+STATIC';
1122
								if ($f=='Default TYPO3 Tables')	$key='CURRENT_TABLES+STATIC';
1123 1123
								else $key=htmlspecialchars($f);
1124 1124
									// Define the markers content for database type subpart
1125 1125
								$step4DatabaseTypeOptionMarkers = array(
......
1153 1153
								'llNumberTables' => 'Number of tables:',
1154 1154
								'numberTables' => count($whichTables),
1155 1155
								'action' => htmlspecialchars($this->action),
1156
								'llDatabaseType' => 'Please select a database dump:',
1156
								'llDatabaseType' => 'Select database contents:',
1157 1157
								'label' => 'Import database'
1158 1158
							);
1159 1159
								// Add step marker for main template
......
1175 1175
				break;
1176 1176
				case 'go':
1177 1177
						// Add header marker for main template
1178
					$markers['header'] = 'You\'re done!';
1178
					$markers['header'] = 'Congratulations!';
1179 1179
						// There should be a database host connection at this point
1180 1180
					if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect(
1181 1181
						TYPO3_db_host, TYPO3_db_username, TYPO3_db_password
......
1191 1191
									// Define the markers content
1192 1192
								$stepGoSubPartMarkers = array(
1193 1193
									'messageBasicFinished' => $this->messageBasicFinished(),
1194
									'llImportant' => 'Important',
1194
									'llImportant' => 'Important Security Warning',
1195 1195
									'securityRisk' => $this->securityRisk(),
1196
									'llSwitchMode' => 'Enter
1196
									'llSwitchMode' => '
1197 1197
										<a href="' . $this->scriptSelf . '">
1198
											"Normal"
1198
											Change the Install Tool password here
1199 1199
										</a>
1200
										mode for the Install Tool to change this!
1201 1200
									'
1202 1201
								);
1203 1202
									// Add step marker for main template
......
6737 6736

  
6738 6737
				'.(count($tables)?'':'- You haven\'t imported any tables yet.
6739 6738
				')
6740
				.($beuser?'':'- You haven\'t created an admin-user yet.
6739
				.($beuser?'':'- You haven\'t created an admin user yet.
6741 6740
				')
6742 6741
				.'
6743 6742

  
6744
				You you\'re about to import a database with a complete site in it, these three points should be met.
6743
				You\'re about to import a database with a complete site in it, these three points should be met.
6745 6744
				'),-1,1);
6746 6745
			}
6747 6746
		}
......
7851 7850
	function securityRisk() {
7852 7851
		return '
7853 7852
			<p>
7854
				This script is a
7855
				<strong>great danger to the security of TYPO3</strong>
7856
				if you don\'t secure it somehow.
7857
				<br />
7858
				We suggest one of the following:
7853
				<strong>An unsecured Install Tool presents a security risk.</strong>
7854
				Minimize the risk with the following actions:
7859 7855
			</p>
7860 7856
			<ul>
7861 7857
				<li>
7862
					Change the password as defined by the md5-hash in
7863
					TYPO3_CONF_VARS[BE][installToolPassword]
7858
					Change the Install Tool password.
7864 7859
				</li>
7865 7860
				<li>
7866
					Delete the folder \'typo3/install/\' with this script in or
7867
					just insert an \'exit;\' line in the script-file there
7861
					Delete the ENABLE_INSTALL_TOOL file in the /typo3conf folder. This can be done 
7862
					manually or through User tools &gt; User settings in the backend.
7868 7863
				</li>
7869 7864
				<li>
7870
					Password protect the \'typo3/install/\' folder, eg. with a
7871
					.htaccess file
7865
					For additional security, the /typo3/install/ folder can be
7866
					renamed, deleted, or password protected with a .htaccess file.
7872 7867
				</li>
7873 7868
			</ul>
7874
			<p>
7875
				The TYPO3_CONF_VARS[BE][installToolPassword] is always active,
7876
				but choosing one of the other options will improve security and
7877
				is recommended highly.
7878
			</p>
7879 7869
		';
7880 7870
	}
7881 7871

  
......
7942 7932
	function messageBasicFinished() {
7943 7933
		return '
7944 7934
			<p>
7945
				Apparently you have completed the basic setup of the TYPO3 database.
7946
				<br />
7947
				Now you can choose between these options:
7935
				You have completed the basic setup of the TYPO3 Content Management System. 
7936
				Choose between these options to continue:
7948 7937
			</p>
7949 7938
			<ul>
7950 7939
				<li>
7940
					<a href="' . $this->scriptSelf . '">Configure TYPO3</a> (Recommended)
7941
					<br />
7942
					This will let you analyze and verify that everything in your
7943
					installation is in order. In addition, you can configure advanced
7944
					TYPO3 options in this step.
7945
		 		</li>
7946
				<li>
7951 7947
					<a href="../../index.php">
7952
						Go to the frontend pages
7948
						Visit the frontend
7953 7949
					</a>
7954 7950
				</li>
7955 7951
				<li>
7956 7952
					<a href="../index.php">
7957
						Go to the backend login
7953
						Login to the backend
7958 7954
					</a>
7959 7955
					<br />
7960
			 		(username may be: <em>admin</em>, password may be: <em>password</em>.)
7956
			 		(Default username: <em>admin</em>, default password: <em>password</em>.)
7961 7957
				</li>
7962
				<li>
7963
					<a href="' . $this->scriptSelf . '">
7964
						Continue to configure TYPO3
7965
					</a> (Recommended).
7966
					<br />
7967
			 		This will let you analyse and verify that everything in your
7968
			 		PHP installation is alright. Also if you want to configure
7969
			 		TYPO3 to use all the cool features, you <em>must</em> dig
7970
			 		into the this!
7971
			 	</li>
7972 7958
			 </ul>
7973 7959
		';
7974 7960
	}
typo3/sysext/install/Resources/Private/Templates/StepOutput.html (working copy)
41 41
		<!-- ###STEP1### end -->
42 42
		
43 43
		<!-- ###STEP2### begin -->
44
		<p>###LLDESCRIPTION###</p>
44 45
		<form method="post" action="###ACTION###">
45 46
			<fieldset class="t3-install-form-label-width-7">
46 47
				<ol>