Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1564)
+++ branches/2.8.x/CHANGELOG	(revision 1565)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+06 Jan-2012 Build 1565 Dietmar Woellbrink (Luisehahne)
+! fixed:: detection of serverdefined charsets more different
 06 Jan-2012 Build 1564 Dietmar Woellbrink (Luisehahne)
 # entities fixes in FI and TR languages files (Tks to Ruebenwurzel)
 06 Jan-2012 Build 1563 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/start/index.php
===================================================================
--- branches/2.8.x/wb/admin/start/index.php	(revision 1564)
+++ branches/2.8.x/wb/admin/start/index.php	(revision 1565)
@@ -52,7 +52,7 @@
 	if($database->query($sql)) { }
 }
 // ---------------------------------------
-$msg = '';
+$msg = '<br />';
 // check if it is neccessary to start the uograde-script
 if(($admin->get_user_id()==1) && file_exists(WB_PATH.'/upgrade-script.php')) {
 	// check if it is neccessary to start the uograde-script
@@ -69,7 +69,7 @@
 			    exit;
 			}
 		} else {
-			$msg .= (file_exists(WB_PATH.'/upgrade-script.php') ? '<br />'.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />' : '');
+			$msg .= (file_exists(WB_PATH.'/upgrade-script.php') ? ''.$MESSAGE['START_UPGRADE_SCRIPT_EXISTS'].'<br />' : '');
 		}
 	}
 }
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1564)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1565)
@@ -52,5 +52,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2');
-if(!defined('REVISION')) define('REVISION', '1564');
+if(!defined('REVISION')) define('REVISION', '1565');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/install/stylesheet.css
===================================================================
--- branches/2.8.x/wb/install/stylesheet.css	(revision 1564)
+++ branches/2.8.x/wb/install/stylesheet.css	(revision 1565)
@@ -1,16 +1,16 @@
-body,td,th,input,textarea { font-family :Verdana, Arial, Helvetica, sans-serif; font-size :12px; color :#000000; }
-body { background-color :#a8bccb; background-image :url(../templates/wb_theme/images/background.png); background-repeat :repeat-x; margin :0px; }
-form { margin :0; }
-input:focus, select:focus { background :#f1f8fd; }
-.wrong { background-color :#ffdbdb; }
-.submit { border :solid 2px #cccccc; background :#ffeeee; color :#ee0000; font-weight :bold; font-size :11px; padding :4px; width :100%; }
-.content { background-color :#ffffff; padding :15px; height :350px; width :850px; text-align :justify; vertical-align :top; }
-hr { margin :1em auto; color :#003366; height :1px; }
-h1 { font-size :130%; color :#336699; margin :0px 0px 5px 0px; border-bottom :1px solid #cccccc; }
-a:link, a:visited, a:active { color :#003366; text-decoration :none; }
-a:hover { text-decoration :none; color :#336699; }
-.bad { color :#ff0000; font-weight :bold; }
-.good { color :#009900; font-weight :bold; }
-.note { color :#666666; font-size :10px; }
-.hide { display :none; }
-.warning { border :2px #884444 solid; padding :1px; margin :5px auto; background :#ffeeee; color :#ee0000; text-align :center; font-size :1.2em; line-height :1em; }
+body,td,th,input,textarea { font-family :Verdana, Arial, Helvetica, sans-serif; font-size :12px; color :#000000; }
+body { background-color :#a8bccb; background-image :url(../templates/wb_theme/images/background.png); background-repeat :repeat-x; margin :0px; }
+form { margin :0; }
+input:focus, select:focus { background :#f1f8fd; }
+.wrong { background-color :#ffdbdb; }
+.submit { border :solid 2px #cccccc; background :#ffeeee; color :#ee0000; font-weight :bold; font-size :11px; padding :4px; width :100%; }
+.content { background-color :#ffffff; padding :15px; height :350px; width :850px; text-align :justify; vertical-align :top; }
+hr { margin :1em auto; color :#003366; height :1px; }
+h1 { font-size :130%; color :#336699; margin :0px 0px 5px 0px; border-bottom :1px solid #cccccc; }
+a:link, a:visited, a:active { color :#003366; text-decoration :none; }
+a:hover { text-decoration :none; color :#336699; }
+.bad { color :#ff0000; font-weight :bold; }
+.good { color :#009900; font-weight :bold; }
+.note { color :#666666; font-size :10px; }
+.hide { display :none; }
+.warning { border :2px #884444 solid; padding :5px; margin :5px auto; background :#ffeeee; color :#ee0000; text-align :center; font-size :12px; font-weight :normal; line-height :16px; -webkit-border-radius :0.75em; -moz-border-radius :0.75em; border-radius :0.75em; }
Index: branches/2.8.x/wb/install/index.php
===================================================================
--- branches/2.8.x/wb/install/index.php	(revision 1564)
+++ branches/2.8.x/wb/install/index.php	(revision 1565)
@@ -161,25 +161,35 @@
 				?>
 			</td>
 		</tr>
-		<tr>
-			<td width="160" style="color: #666666;">AddDefaultCharset unset</td>
+	<tr>
+		<td width="160" style="color: #666666;">Server DefaultCharset</td>
 			<td width="60">
 				<?php
-					if($e_adc) {
-						$installFlag = false;
-						?><font class="bad">No</font><?php
+					$chrval = (($e_adc != '') && (strtolower($e_adc) != 'utf-8') ? true : false);
+					if($chrval == false) {
+						?><font class="good">
+						<?php echo (($e_adc=='') ? 'OK' : $e_adc) ?>
+						</font>
+						<?php
 					} else {
-						?><font class="good">Yes</font><?php
+						?><font class="bad"><?php echo $e_adc ?></font><?php
 					}
+
 				?>
 			</td>
 			<td colspan="4">&nbsp;</td>
 		</tr>
-		<?php if($e_adc) {
-			$installFlag = false;
+		<?php if($chrval == true) {
 		?>
 		<tr>
-			<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>
+			<td colspan="6" style="font-size: 10px;" class="bad">
+<p class="warning">
+<b>Please note:</b> Yor webserver is configured to deliver <b><?php echo $e_adc;?></b> charset only.<br />
+To display national special characters (e.g.: &auml; &aacute;) in clear manner, switch off this preset please(or let it do by your hosting provider).<br />
+In any case you can choose <b><?php echo $e_adc;?></b> in the settings of WebsiteBaker.<br />
+But this solution does not guarranty a correct displaying of the content from all modules!
+</p>
+</td>
 		</tr>
 		<?php } ?>
 		</table>
