Project

General

Profile

« Previous | Next » 

Revision 732

Added by thorn over 16 years ago

added check for AddDefaultCharset to install

View differences:

trunk/CHANGELOG
11 11
! = Update/Change
12 12

  
13 13
------------------------------------- 2.7.0 -------------------------------------
14
01-Feb-2008 Thomas Hornik
15
+	added check for AddDefaultCharset to install
14 16
29-Feb-2008 Thomas Hornik
15 17
#	fixed issue in pagename generation if AddDefaultCharset is set (as work-around).
16 18
28-Feb-2008 Thomas Hornik
trunk/wb/install/index.php
54 54
	}
55 55
}
56 56

  
57
// Check if AddDefaultCharset is set
58
$e_adc=false;
59
$sapi=php_sapi_name();
60
if(strpos($sapi, 'apache')!==FALSE || strpos($sapi, 'nsapi')!==FALSE) {
61
	flush();
62
	$apache_rheaders=apache_response_headers();
63
	foreach($apache_rheaders AS $h) {
64
		if(strpos($h, 'html; charset')!==FALSE) {
65
			preg_match('/charset\s*=\s*([a-zA-Z0-9- _]+)/', $h, $match);
66
			$apache_charset=$match[1];
67
			$e_adc=$apache_charset;
68
		}
69
	}
70
}
71

  
57 72
?>
58 73
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
59 74
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
......
115 130
		?>
116 131
		<table cellpadding="3" cellspacing="0" width="100%" align="center">
117 132
		<tr>
118
			<td colspan="8"><h1>Step 1</h1>Please check the following requirements are met before continuing...</td>
133
			<td colspan="6"><h1>Step 1</h1>Please check the following requirements are met before continuing...</td>
119 134
		</tr>
120 135
		<?php if($session_support != '<font class="good">Enabled</font>') { ?>
121 136
		<tr>
122
			<td colspan="8" style="font-size: 10px;" class="bad">Please note: PHP Session Support may appear disabled if your browser does not support cookies.</td>
137
			<td colspan="6" style="font-size: 10px;" class="bad">Please note: PHP Session Support may appear disabled if your browser does not support cookies.</td>
123 138
		</tr>
124 139
		<?php } ?>
125 140
		<tr>
126
			<td width="140" style="color: #666666;">PHP Version > 4.1.0</td>
127
			<td width="35">
141
			<td width="160" style="color: #666666;">PHP Version > 4.1.0</td>
142
			<td width="60">
128 143
				<?php
129 144
				$phpversion = substr(PHP_VERSION, 0, 6);
130 145
				if($phpversion > 4.1) {
......
135 150
				?>
136 151
			</td>
137 152
			<td width="140" style="color: #666666;">PHP Session Support</td>
138
			<td width="115"><?php echo $session_support; ?></td>
139
			<td width="105" style="color: #666666;">PHP Safe Mode</td>
153
			<td width="105"><?php echo $session_support; ?></td>
154
			<td width="115" style="color: #666666;">PHP Safe Mode</td>
140 155
			<td>
141 156
				<?php
142 157
				if(ini_get('safe_mode')) {
......
147 162
				?>
148 163
			</td>
149 164
		</tr>
165
		<tr>
166
			<td width="160" style="color: #666666;">AddDefaultCharset unset</td>
167
			<td width="60">
168
				<?php
169
					if($e_adc) {
170
						?><font class="bad">No</font><?php
171
					} else {
172
						?><font class="good">Yes</font><?php
173
					}
174
				?>
175
			</td>
176
			<td colspan="4">&nbsp;</td>
177
		</tr>
178
		<?php if($e_adc) { ?>
179
		<tr>
180
			<td colspan="6" style="font-size: 10px;" class="bad">Please note: AddDefaultCharset is set to <?php echo $e_adc;?> in apache.conf.<br />If you have to use umlauts (e.g. &auml; &aacute;) please change this to Off. - Or use <?php echo $e_adc;?> inside website baker, too.</td>
181
		</tr>
182
		<?php } ?>
150 183
		</table>
151 184
		<table cellpadding="3" cellspacing="0" width="100%" align="center">
152 185
		<tr>

Also available in: Unified diff