diff --git a/_lastchanges.txt b/_lastchanges.txt
index 6c2930eb3..55b216f6d 100644
--- a/_lastchanges.txt
+++ b/_lastchanges.txt
@@ -9,9 +9,15 @@ angehandelt.
 
 Version 4.3.2 (2010-xx-xx)
 
+  Neu
+  * Update 4.x -> 4.3 durch Upload einer Exportdatei
+  
   Anpassungen
   * Cronjobzeitspeicherung nun vor der Aktion, so dass der Prozess nicht mehrmals ausgeführt wird.
   * PHPMailer auf Versin 5.1 gebracht .. Dadurch nur noch mit php5 lauffähig
+  * Addoninstallation: SQL-Dateien der Addons werden mit dem entsprechenden Defaultcharset (utf8 oder latin1) versehen
+  * Import/Export-Addon: importierte SQL-Dateien werden mit dem entsprechenden Defaultcharset (utf8 oder latin1) versehen
+  * Installation: die Datenbanktabellen werden mit dem entsprechenden Defaultcharset (utf8 oder latin1) installiert
   
   Bugfixes
   * Metadaten Strings / Textfelder - Bug bei Sonderzeichen "|"
diff --git a/redaxo/include/addons/import_export/functions/function_import_export.inc.php b/redaxo/include/addons/import_export/functions/function_import_export.inc.php
index 7dbb32862..6a15b58b1 100644
--- a/redaxo/include/addons/import_export/functions/function_import_export.inc.php
+++ b/redaxo/include/addons/import_export/functions/function_import_export.inc.php
@@ -76,8 +76,11 @@ function rex_a1_import_db($filename)
     // charset entfernen
     $charset = $matches[1];
     $conts = trim(str_replace('## charset '. $charset, '', $conts));
-    
-    if($I18N->msg('htmlcharset') != $charset)
+    if($I18N->msg('htmlcharset') == 'utf-8' AND $charset != 'utf-8')
+    {
+      $conts = utf8_encode($conts);
+    }
+    elseif($I18N->msg('htmlcharset') != $charset)
     {
       $return['message'] = $I18N->msg('im_export_no_valid_charset').'. '.$I18N->msg('htmlcharset').' != '.$charset;
       return $return;
@@ -120,6 +123,17 @@ function rex_a1_import_db($filename)
 
   $sql   = rex_sql::factory();
   foreach ($lines as $line) {
+    $line['query'] = trim($line['query']);
+    
+    if(rex_lang_is_utf8() AND strpos($line['query'], 'CREATE TABLE') === 0 AND !strpos($line['query'], 'DEFAULT CHARSET'))
+    {
+      $line['query'] .= ' DEFAULT CHARSET=utf8';
+    }
+    elseif(!rex_lang_is_utf8() AND strpos($line['query'], 'CREATE TABLE') === 0 AND !strpos($line['query'], 'DEFAULT CHARSET'))
+    {
+      $line['query'] .= ' DEFAULT CHARSET=latin1';
+    }
+
     $sql->setQuery($line['query']);
 
     if($sql->hasError())
@@ -161,7 +175,13 @@ function rex_a1_import_db($filename)
        lasttrydate int(11) NOT NULL DEFAULT 0,
        session_id varchar(255) NOT NULL,
        PRIMARY KEY(user_id)
-     ) TYPE=MyISAM;';
+     ) TYPE=MyISAM';
+     
+    if(rex_lang_is_utf8())
+      $create_user_table .= ' DEFAULT CHARSET=utf8';
+    else
+      $create_user_table .= ' DEFAULT CHARSET=latin1';
+    
     $db = rex_sql::factory();
     $db->setQuery($create_user_table);
     $error = $db->getError();
diff --git a/redaxo/include/functions/function_rex_addons.inc.php b/redaxo/include/functions/function_rex_addons.inc.php
index 279404d59..639342913 100644
--- a/redaxo/include/functions/function_rex_addons.inc.php
+++ b/redaxo/include/functions/function_rex_addons.inc.php
@@ -79,6 +79,17 @@ function rex_install_prepare_query($qry)
   $qry = str_replace('%TABLE_PREFIX%', $REX['TABLE_PREFIX'], $qry);
   $qry = str_replace('%TEMP_PREFIX%', $REX['TEMP_PREFIX'], $qry);
 
+  $qry = trim($qry);
+  
+  if(rex_lang_is_utf8() AND strpos($qry, 'CREATE TABLE') === 0 AND !strpos($qry, 'DEFAULT CHARSET'))
+  {
+    $qry .= ' DEFAULT CHARSET=utf8';
+  }
+  elseif(!rex_lang_is_utf8() AND strpos($line['query'], 'CREATE TABLE') === 0 AND !strpos($line['query'], 'DEFAULT CHARSET'))
+  {
+    $qry .= ' DEFAULT CHARSET=latin1';
+  }
+
   return $qry;
 }
 
diff --git a/redaxo/include/lang/de_de.lang b/redaxo/include/lang/de_de.lang
index 48e1ee788..c5c93cc31 100644
--- a/redaxo/include/lang/de_de.lang
+++ b/redaxo/include/lang/de_de.lang
@@ -233,7 +233,7 @@ delete_template = Template l
 header_template_caption = Liste der verfügbaren Templates
 header_template_summary = Auflistung aller Templates
 modules_available = Nur folgende Module sind verfügbar
-modules_available_all = Alle Module verfügbar 
+modules_available_all = Alle Module verfügbar
 
 # redaxo\include\functions\function_rex_category.inc.php
 article = Artikel
@@ -442,11 +442,16 @@ setup_033 = Bitte richten Sie die Datenbank erneut ein.
 setup_034 = Datenbank einrichten
 setup_035 = Datenbank einrichten und alte überschreiben falls vorhanden [{0}Vorsicht{1} - Alte Seite wird komplett gelöscht!]
 setup_036 = Datenbank existiert schon [Weiter ohne Datenbankimport]
-setup_037 = Vorhandenen Export einspielen [Demo einspielen]:
+setup_037 = REDAXO 4.3 Export einspielen [Demo einspielen]:
 setup_03701 = Bitte wählen Sie einen Export aus!
 setup_03702 = Export-Dateien konnten nicht gefunden werden!
 setup_03703 = Import/Export AddOn wurde nicht gefunden!
-setup_038 = Datenbank aktualisieren von REDAXO 4.x [vorher sichern!]
+setup_038 = REDAXO 4.x Export einspielen [User müssen neu angelegt werden!].
+setup_03801 = Keine Export Datei ausgewählt.
+setup_03802 = Datei konnte nicht hochgeladen werden.
+setup_03803 = Sie haben keine Schreibrechte in
+setup_03804 = Temporäre SQL Datei konnte nicht gelesen werden.
+setup_03805 = Temporäre SQL Datei konnte nicht geschrieben werden.
 setup_039 = Weiter zu Schritt 4
 setup_step4 = Setup: Schritt 4 von 5
 setup_040 = Bitte geben Sie das Administratorlogin ein!
diff --git a/redaxo/include/lang/en_gb.lang b/redaxo/include/lang/en_gb.lang
index 1428c29f6..0876b7610 100644
--- a/redaxo/include/lang/en_gb.lang
+++ b/redaxo/include/lang/en_gb.lang
@@ -519,11 +519,16 @@ setup_033 = Please enter database specifications again.
 setup_034 = Setup database
 setup_035 = Setup database and overwrite existing [{0}Caution{1} - current site will be completely deleted!]
 setup_036 = Database exists [Continue without import]
-setup_037 = Import existing export [Import Demo]:
+setup_037 = Import REDAXO 4.3 export [Import Demo]:
 setup_03701 = Please choose and export!
 setup_03702 = Export files not found!
 setup_03703 = Import/Export AddOn not found!
-setup_038 = Update database from REDAXO 4.x [backup before!]
+setup_038 = Import REDAXO 4.x export [all user have to be created again!]
+setup_03801 = No export file chosen.
+setup_03802 = Fiele could not be exported.
+setup_03803 = No permissions to write.
+setup_03804 = Temporary SQL file could not be read.
+setup_03805 = Temporary SQL file could not be written. [save first!]
 setup_039 = Proceed to step 4
 setup_step4 = Setup: Step 4 of 5
 setup_040 = Enter admin login!
diff --git a/redaxo/include/pages/setup.inc.php b/redaxo/include/pages/setup.inc.php
index 650d38cec..65a2a2d7b 100644
--- a/redaxo/include/pages/setup.inc.php
+++ b/redaxo/include/pages/setup.inc.php
@@ -2,11 +2,11 @@
 
 /**
  * Direkter Aufruf, um zu testen, ob der Ordner redaxo/include
- * erreichbar ist. Dies darf aus Sicherheitsgründen nicht möglich sein!
+ * erreichbar ist. Dies darf aus Sicherheitsgr¸nden nicht mˆglich sein!
  */
 if (!isset($REX))
 {
-	echo '<html>
+  echo '<html>
           <title></title>
           <head>
             <script src="../../js/standard.js" type="text/javascript"></script>
@@ -21,7 +21,7 @@
           </head>
           <body></body>
         </html>';
-	exit();
+  exit();
 }
 
 
@@ -38,305 +38,331 @@
  */
 function rex_setup_title($title)
 {
-	rex_title($title);
+  rex_title($title);
 
-	echo '<div id="rex-setup" class="rex-area">';
+  echo '<div id="rex-setup" class="rex-area">';
 }
 
 function rex_setup_import($import_sql, $import_archiv = null)
 {
-	global $REX, $I18N, $export_addon_dir;
-
-	$err_msg = '';
-
-	if (!is_dir($export_addon_dir))
-	{
-		$err_msg .= $I18N->msg('setup_03703').'<br />';
-	}
-	else
-	{
-		if (file_exists($import_sql) && ($import_archiv === null || $import_archiv !== null && file_exists($import_archiv)))
-		{
-			// Hier I18N_IM_EXPORT global definieren, damit es aus der config.inc.php übernommen
-			// wird und auch in der danach includeten function verfügbar ist
-			global $I18N_IM_EXPORT;
-
-			$I18N->appendFile($REX['INCLUDE_PATH'].'/addons/import_export/lang/');
-			require_once $export_addon_dir.'/classes/class.tar.inc.php';
-			require_once $export_addon_dir.'/classes/class.rex_tar.inc.php';
-
-			// DB Import
-			$state_db = rex_a1_import_db($import_sql);
-			if ($state_db['state'] === false)
-			{
-				$err_msg .= nl2br($state_db['message']) .'<br />';
-			}
-
-			// Archiv optional importieren
-			if ($state_db['state'] === true && $import_archiv !== null)
-			{
-				$state_archiv = rex_a1_import_files($import_archiv);
-				if ($state_archiv['state'] === false)
-				{
-					$err_msg .= $state_archiv['message'].'<br />';
-				}
-			}
-		}
-		else
-		{
-			$err_msg .= $I18N->msg('setup_03702').'<br />';
-		}
-	}
-
-	return $err_msg;
+  global $REX, $I18N, $export_addon_dir;
+
+  $err_msg = '';
+
+  if (!is_dir($export_addon_dir))
+  {
+    $err_msg .= $I18N->msg('setup_03703').'<br />';
+  }
+  else
+  {
+    if (file_exists($import_sql) && ($import_archiv === null || $import_archiv !== null && file_exists($import_archiv)))
+    {
+      // Hier I18N_IM_EXPORT global definieren, damit es aus der config.inc.php übernommen
+      // wird und auch in der danach includeten function verfügbar ist
+      global $I18N_IM_EXPORT;
+
+      $I18N->appendFile($REX['INCLUDE_PATH'].'/addons/import_export/lang/');
+      require_once $export_addon_dir.'/classes/class.tar.inc.php';
+      require_once $export_addon_dir.'/classes/class.rex_tar.inc.php';
+
+      // DB Import
+      $state_db = rex_a1_import_db($import_sql);
+      if ($state_db['state'] === false)
+      {
+        $err_msg .= nl2br($state_db['message']) .'<br />';
+      }
+
+      // Archiv optional importieren
+      if ($state_db['state'] === true && $import_archiv !== null)
+      {
+        $state_archiv = rex_a1_import_files($import_archiv);
+        if ($state_archiv['state'] === false)
+        {
+          $err_msg .= $state_archiv['message'].'<br />';
+        }
+      }
+    }
+    else
+    {
+      $err_msg .= $I18N->msg('setup_03702').'<br />';
+    }
+  }
+
+  return $err_msg;
 }
 
 function rex_setup_is_writable($items)
 {
-	global $REX;
-	$res = array();
+  global $REX;
+  $res = array();
 
-	foreach($items as $item)
-	{
-		$is_writable = _rex_is_writable($item);
+  foreach($items as $item)
+  {
+    $is_writable = _rex_is_writable($item);
 
-		// 0 => kein Fehler
-		if($is_writable != 0)
-		{
-			$res[$is_writable][] = $item;
-		}
-	}
+    // 0 => kein Fehler
+    if($is_writable != 0)
+    {
+      $res[$is_writable][] = $item;
+    }
+  }
 
-	return $res;
+  return $res;
 }
 
-// -------------------------- System AddOns prüfen
+// -------------------------- System AddOns pr¸fen
 function rex_setup_addons($uninstallBefore = false, $installDump = true)
 {
-	global $REX, $I18N;
+  global $REX, $I18N;
 
-	require_once $REX['INCLUDE_PATH'].'/functions/function_rex_addons.inc.php';
+  require_once $REX['INCLUDE_PATH'].'/functions/function_rex_addons.inc.php';
 
-	$addonErr = '';
-	$ADDONS = rex_read_addons_folder();
-	$addonManager = new rex_addonManager($ADDONS);
-	foreach($REX['SYSTEM_ADDONS'] as $systemAddon)
-	{
-		$state = true;
+  $addonErr = '';
+  $ADDONS = rex_read_addons_folder();
+  $addonManager = new rex_addonManager($ADDONS);
+  foreach($REX['SYSTEM_ADDONS'] as $systemAddon)
+  {
+    $state = true;
 
-		if($state === true && $uninstallBefore)
-		$state = $addonManager->uninstall($systemAddon);
+    if($state === true && $uninstallBefore)
+    $state = $addonManager->uninstall($systemAddon);
 
-		if($state === true && !OOAddon::isInstalled($systemAddon))
-		$state = $addonManager->install($systemAddon, $installDump);
+    if($state === true && !OOAddon::isInstalled($systemAddon))
+    $state = $addonManager->install($systemAddon, $installDump);
 
-		if($state === true && !OOAddon::isActivated($systemAddon))
-		$state = $addonManager->activate($systemAddon);
+    if($state === true && !OOAddon::isActivated($systemAddon))
+    $state = $addonManager->activate($systemAddon);
 
-		if($state !== true)
-		$addonErr .= '<li>'. $systemAddon .'<ul><li>'. $state .'</li></ul></li>';
-	}
+    if($state !== true)
+    $addonErr .= '<li>'. $systemAddon .'<ul><li>'. $state .'</li></ul></li>';
+  }
 
-	if($addonErr != '')
-	{
-		$addonErr = '<ul class="rex-ul1">
+  if($addonErr != '')
+  {
+    $addonErr = '<ul class="rex-ul1">
                    <li>
                      <h3 class="rex-hl3">'. $I18N->msg('setup_011', '<span class="rex-error">', '</span>') .'</h3>
                      <ul>'. $addonErr .'</ul>
                    </li>
                  </ul>';
-	}
+  }
+
+  return $addonErr;
+}
+
+
+/**
+ * returns formated sql errors from rex_sql object
+ * @param  object $obj     rex_sql object
+ * @return string $err_msg formated Error message
+ */
+function rex_formated_sqlerror($obj)
+{
 
-	return $addonErr;
+  $err_msg = '<strong style="display:inline-block;width:50px;">Query</strong> <code style="color:#000;">'.$obj->query.'</code><br />'.PHP_EOL.
+             '<strong style="display:inline-block;width:50px;">Error</strong> <code style="color:#000;">#'.$obj->getErrno().' - '.$obj->getError().'</code><br /><hr />'.PHP_EOL;
+  return $err_msg;
 }
 
-function rex_setup_setUtf8()
+
+/**
+ * change default charset of database
+ * @param  string $charset      sql charset
+ * @return  string              error message
+ */
+function rex_setup_setDBcharset($charset='')
 {
   global $REX;
-  $gt = new rex_sql();
-  $gt->setQuery("show tables");
-  foreach($gt->getArray() as $t) {
-    $table = $t["Tables_in_".$REX['DB']['1']['NAME']];
-    $gc = new rex_sql();
-    $gc->setQuery("show columns from $table");
-    if(substr($table,0,strlen($REX['TABLE_PREFIX'])) == $REX['TABLE_PREFIX']) {
-      $columns = Array();
-      $pri = "";
-      foreach($gc->getArray() as $c) {
-        $columns[] = $c["Field"];
-        if ($pri == "" && $c["Key"] == "PRI") {
-          $pri = $c["Field"];
-        }
-      }
-      if ($pri != "") {
-        $gr = new rex_sql();
-        $gr->setQuery("select * from $table");
-        foreach($gr->getArray() as $r) {
-          reset($columns);
-          $privalue = $r[$pri];
-          $uv = new rex_sql();
-          $uv->setTable($table);
-          $uv->setWhere($pri.'= "'.$privalue.'"');
-          foreach($columns as $key => $column) {
-            if ($pri!=$column) {
-              $value = $r[$column];
-              $newvalue = utf8_decode($value);
-              $uv->setValue($column,addslashes($newvalue));
-            }
-          }
-          $uv->update();
-        }
-      }
-    }
+  $err_msg = '';
+
+  if($charset!='')
+  {
+    $ad = new rex_sql();
+    $ad->setQuery('ALTER DATABASE `'.$REX['DB']['1']['NAME'].'` DEFAULT CHARACTER SET '.$charset.' COLLATE utf8_general_ci');
+    $err_msg .= $ad->hasError() ? rex_formated_sqlerror($ad) : '';
+    unset($ad);
+  }
+  else
+  {
+    $err_msg = 'rex_setup_setDBcharset() error: no charset defined..';
   }
+
+  return $err_msg;
+}
+
+
+/**
+ * drop all rex_* tables
+ * @return  string    SQL error message
+ */
+function rex_setup_dropREXtables()
+{
+  global $REX;
+  $err_msg = '';
+
+  // get rex_* tables
+  $rt = new rex_sql();
+  $rt->setQuery('SHOW TABLES LIKE \''.$REX['TABLE_PREFIX'].'%\';');
+  $err_msg .= $rt->hasError() ? rex_formated_sqlerror($rt) : '';
+
+  // drop tables
+  $dt = new rex_sql();
+  foreach($rt->getArray() as $t)
+  {
+    $table = $t['Tables_in_'.$REX['DB']['1']['NAME'].' ('.$REX['TABLE_PREFIX'].'%)']; '<pre>'.var_export($var,true).'</pre><hr/>';
+    $dt->setQuery('DROP TABLE `'.$table.'`');
+    $err_msg .= $dt->hasError() ? rex_formated_sqlerror($dt) : '';
 }
 
+  unset($rt,$dt);
+  return $err_msg;
+}
 
 
-	// --------------------------------------------- END: SETUP FUNCTIONS
+  // --------------------------------------------- END: SETUP FUNCTIONS
 
 
-	$MSG['err'] = "";
+  $MSG['err'] = "";
 
-	$checkmodus = rex_request('checkmodus', 'float');
-	$send       = rex_request('send', 'string');
-	$dbanlegen  = rex_request('dbanlegen', 'string');
-	$noadmin    = rex_request('noadmin', 'string');
-	$lang       = rex_request('lang', 'string');
+  $checkmodus = rex_request('checkmodus', 'float');
+  $send       = rex_request('send', 'string');
+  $dbanlegen  = rex_request('dbanlegen', 'string');
+  $noadmin    = rex_request('noadmin', 'string');
+  $lang       = rex_request('lang', 'string');
 
-	$export_addon_dir = $REX['INCLUDE_PATH'].'/addons/import_export';
-	require_once $export_addon_dir.'/functions/function_folder.inc.php';
-	require_once $export_addon_dir.'/functions/function_import_folder.inc.php';
-	require_once $export_addon_dir.'/functions/function_import_export.inc.php';
+  $export_addon_dir = $REX['INCLUDE_PATH'].'/addons/import_export';
+  require_once $export_addon_dir.'/functions/function_folder.inc.php';
+  require_once $export_addon_dir.'/functions/function_import_folder.inc.php';
+  require_once $export_addon_dir.'/functions/function_import_export.inc.php';
 
 
-	// ---------------------------------- MODUS 0 | Start
-	if (!($checkmodus > 0 && $checkmodus < 10))
-	{
-		$langpath = $REX['INCLUDE_PATH'].'/lang';
-		foreach($REX['LANGUAGES'] as $l)
-		{
-			$isUtf8 = substr($l, -4) == 'utf8';
-			$I18N_T = rex_create_lang($l,$langpath,FALSE);
-			$label = $I18N_T->msg('lang');
-			if($isUtf8) $label .= ' (utf-8)';
-			$langs[$l] = '<li><a href="index.php?checkmodus=0.5&amp;lang='.$l.'"'. rex_tabindex() .'>'.$label.'</a></li>';
+  // ---------------------------------- MODUS 0 | Start
+  if (!($checkmodus > 0 && $checkmodus < 10))
+  {
+    $langpath = $REX['INCLUDE_PATH'].'/lang';
+    foreach($REX['LANGUAGES'] as $l)
+    {
+      $isUtf8 = substr($l, -4) == 'utf8';
+      $I18N_T = rex_create_lang($l,$langpath,FALSE);
+      $label = $I18N_T->msg('lang');
+      if($isUtf8) $label .= ' (utf-8)';
+      $langs[$l] = '<li><a href="index.php?checkmodus=0.5&amp;lang='.$l.'"'. rex_tabindex() .'>'.$label.'</a></li>';
 
-		}
-		unset($I18N_T);
+    }
+    unset($I18N_T);
 
-		// wenn nur eine Sprache -> direkte weiterleitung
-		if (count($REX['LANGUAGES'])==1)
-		{
-			header('Location: index.php?checkmodus=0.5&lang='.key($langs));
-			exit();
-		}
+    // wenn nur eine Sprache -> direkte weiterleitung
+    if (count($REX['LANGUAGES'])==1)
+    {
+      header('Location: index.php?checkmodus=0.5&lang='.key($langs));
+      exit();
+    }
 
-		rex_setup_title('SETUP: SELECT LANGUAGE');
+    rex_setup_title('SETUP: SELECT LANGUAGE');
 
-		echo '<h2 class="rex-hl2">Please choose a language!</h2>
+    echo '<h2 class="rex-hl2">Please choose a language!</h2>
         <div class="rex-area-content">
           <ul class="rex-setup-language">'. implode('', $langs) .'</ul>
         </div>';
-	}
+  }
 
-	// ---------------------------------- MODUS 0 | Start
+  // ---------------------------------- MODUS 0 | Start
 
-	if ($checkmodus == '0.5')
-	{
-		rex_setup_title('SETUP: START');
+  if ($checkmodus == '0.5')
+  {
+    rex_setup_title('SETUP: START');
 
-		$REX['LANG'] = $lang;
+    $REX['LANG'] = $lang;
 
-		echo $I18N->msg('setup_005', '<h2 class="rex-hl2">', '</h2>');
-		echo '<div class="rex-area-content">';
+    echo $I18N->msg('setup_005', '<h2 class="rex-hl2">', '</h2>');
+    echo '<div class="rex-area-content">';
 
-		echo $I18N->msg('setup_005_1', '<h3 class="rex-hl3">', '</h3>', ' class="rex-ul1"');
-		echo '<div class="rex-area-scroll">';
+    echo $I18N->msg('setup_005_1', '<h3 class="rex-hl3">', '</h3>', ' class="rex-ul1"');
+    echo '<div class="rex-area-scroll">';
 
-		$Basedir = dirname(__FILE__);
-		$license_file = $Basedir.'/../../../_lizenz.txt';
-		$license = '<p class="rex-tx1">'.nl2br(rex_get_file_contents($license_file)).'</p>';
+    $Basedir = dirname(__FILE__);
+    $license_file = $Basedir.'/../../../_lizenz.txt';
+    $license = '<p class="rex-tx1">'.nl2br(rex_get_file_contents($license_file)).'</p>';
 
-		if(strpos($REX['LANG'], 'utf') !== false)
-		echo utf8_encode($license);
-		else
-		echo $license;
+    if(strpos($REX['LANG'], 'utf') !== false)
+    echo utf8_encode($license);
+    else
+    echo $license;
 
-		echo '</div>
+    echo '</div>
         </div>
         <div class="rex-area-footer">
           <p class="rex-algn-rght"><a href="index.php?page=setup&amp;checkmodus=1&amp;lang='.$lang.'"'. rex_tabindex() .'>&raquo; '.$I18N->msg("setup_006").'</a></p>
         </div>';
 
-		$checkmodus = 0;
-	}
-
-	// ---------------------------------- MODUS 1 | Versionscheck - Rechtecheck
-
-	if ($checkmodus == 1)
-	{
-		// -------------------------- VERSIONSCHECK
-		if (version_compare(phpversion(), '4.3.2', '<') == 1)
-		{
-			$MSG['err'] .= '<li>'. $I18N->msg('setup_010', phpversion()).'</li>';
-		}
-
-		// -------------------------- EXTENSION CHECK
-		foreach(array('session', 'mysql', 'pcre') as $extension)
-		{
-			if(!extension_loaded($extension))
-			$MSG['err'] .= '<li>'. $I18N->msg('setup_010_1', $extension).'</li>';
-		}
-
-		// -------------------------- SCHREIBRECHTE
-		$WRITEABLES = array (
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'master.inc.php',
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'addons.inc.php',
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'plugins.inc.php',
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'clang.inc.php',
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated',
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated'.DIRECTORY_SEPARATOR.'articles',
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated'.DIRECTORY_SEPARATOR.'templates',
-		$REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated'.DIRECTORY_SEPARATOR.'files',
-		$REX['MEDIAFOLDER'],
-		$REX['MEDIAFOLDER'] .DIRECTORY_SEPARATOR.'_readme.txt',
-		getImportDir()
-		);
-
-		foreach($REX['SYSTEM_ADDONS'] as $system_addon)
-		$WRITEABLES[] = $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'addons'.DIRECTORY_SEPARATOR. $system_addon;
-
-		$res = rex_setup_is_writable($WRITEABLES);
-		if(count($res) > 0)
-		{
-			$MSG['err'] .= '<li>';
-			foreach($res as $type => $messages)
-			{
-				if(count($messages) > 0)
-				{
-					$MSG['err'] .= '<h3 class="rex-hl3">'. _rex_is_writable_info($type) .'</h3>';
-					$MSG['err'] .= '<ul>';
-					foreach($messages as $message)
-					{
-						$MSG['err'] .= '<li>'. $message .'</li>';
-					}
-					$MSG['err'] .= '</ul>';
-				}
-			}
-			$MSG['err'] .= '</li>';
-		}
-	}
-
-	if ($MSG['err'] == '' && $checkmodus == 1)
-	{
-		rex_setup_title($I18N->msg('setup_step1'));
-
-		echo $I18N->msg('setup_016', '<h2 class="rex-hl2">', '</h2>');
-		echo '<div class="rex-area-content">';
-
-		echo $I18N->msg('setup_016_1', ' class="rex-ul1"', '<span class="rex-ok">', '</span>');
-		echo '<div class="rex-message"><p class="rex-warning" id="security_warning" style="display: none;"><span>'. $I18N->msg('setup_security_msg') .'</span></p></div>
+    $checkmodus = 0;
+  }
+
+  // ---------------------------------- MODUS 1 | Versionscheck - Rechtecheck
+
+  if ($checkmodus == 1)
+  {
+    // -------------------------- VERSIONSCHECK
+    if (version_compare(phpversion(), '4.3.2', '<') == 1)
+    {
+      $MSG['err'] .= '<li>'. $I18N->msg('setup_010', phpversion()).'</li>';
+    }
+
+    // -------------------------- EXTENSION CHECK
+    foreach(array('session', 'mysql', 'pcre') as $extension)
+    {
+      if(!extension_loaded($extension))
+      $MSG['err'] .= '<li>'. $I18N->msg('setup_010_1', $extension).'</li>';
+    }
+
+    // -------------------------- SCHREIBRECHTE
+    $WRITEABLES = array (
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'master.inc.php',
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'addons.inc.php',
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'plugins.inc.php',
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'clang.inc.php',
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated',
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated'.DIRECTORY_SEPARATOR.'articles',
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated'.DIRECTORY_SEPARATOR.'templates',
+    $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'generated'.DIRECTORY_SEPARATOR.'files',
+    $REX['MEDIAFOLDER'],
+    $REX['MEDIAFOLDER'] .DIRECTORY_SEPARATOR.'_readme.txt',
+    getImportDir()
+    );
+
+    foreach($REX['SYSTEM_ADDONS'] as $system_addon)
+    $WRITEABLES[] = $REX['INCLUDE_PATH'].DIRECTORY_SEPARATOR.'addons'.DIRECTORY_SEPARATOR. $system_addon;
+
+    $res = rex_setup_is_writable($WRITEABLES);
+    if(count($res) > 0)
+    {
+      $MSG['err'] .= '<li>';
+      foreach($res as $type => $messages)
+      {
+        if(count($messages) > 0)
+        {
+          $MSG['err'] .= '<h3 class="rex-hl3">'. _rex_is_writable_info($type) .'</h3>';
+          $MSG['err'] .= '<ul>';
+          foreach($messages as $message)
+          {
+            $MSG['err'] .= '<li>'. $message .'</li>';
+          }
+          $MSG['err'] .= '</ul>';
+        }
+      }
+      $MSG['err'] .= '</li>';
+    }
+  }
+
+  if ($MSG['err'] == '' && $checkmodus == 1)
+  {
+    rex_setup_title($I18N->msg('setup_step1'));
+
+    echo $I18N->msg('setup_016', '<h2 class="rex-hl2">', '</h2>');
+    echo '<div class="rex-area-content">';
+
+    echo $I18N->msg('setup_016_1', ' class="rex-ul1"', '<span class="rex-ok">', '</span>');
+    echo '<div class="rex-message"><p class="rex-warning" id="security_warning" style="display: none;"><span>'. $I18N->msg('setup_security_msg') .'</span></p></div>
           <noscript><div class="rex-message"><p class="rex-warning"><span>'. $I18N->msg('setup_no_js_security_msg') .'</span></p></div></noscript>
           <iframe src="include/pages/setup.inc.php?page=setup&amp;checkmodus=1.5&amp;lang='.$lang.'" style="display: none;"></iframe>
        </div>
@@ -346,13 +372,13 @@ function rex_setup_setUtf8()
          </p>
        </div>';
 
-	}
-	elseif ($MSG['err'] != "")
-	{
+  }
+  elseif ($MSG['err'] != "")
+  {
 
-		rex_setup_title($I18N->msg('setup_step1'));
+    rex_setup_title($I18N->msg('setup_step1'));
 
-		echo '<h2 class="rex-hl2">'.$I18N->msg('setup_headline1').'</h2>
+    echo '<h2 class="rex-hl2">'.$I18N->msg('setup_headline1').'</h2>
         <div class="rex-area-content">
           <ul class="rex-ul1">'.$MSG['err'].'</ul>
           <p class="rex-tx1">'.$I18N->msg('setup_018').'</p>
@@ -362,80 +388,80 @@ function rex_setup_setUtf8()
             <a href="index.php?page=setup&amp;checkmodus=1&amp;lang='.$lang.'"'. rex_tabindex() .'>&raquo; '.$I18N->msg('setup_017').'</a>
           </p>
         </div>';
-	}
-
-	// ---------------------------------- MODUS 2 | master.inc.php - Datenbankcheck
-
-	if ($checkmodus == 2 && $send == 1)
-	{
-		$master_file = $REX['INCLUDE_PATH'].'/master.inc.php';
-		$cont = rex_get_file_contents($master_file);
-
-		// Einfache quotes nicht escapen, da der String zwischen doppelten quotes stehen wird
-		$serveraddress             = str_replace("\'", "'", rex_post('serveraddress', 'string'));
-		$serverbezeichnung         = str_replace("\'", "'", rex_post('serverbezeichnung', 'string'));
-		$error_email               = str_replace("\'", "'", rex_post('error_email', 'string'));
-		$psw_func                  = str_replace("\'", "'", rex_post('psw_func', 'string'));
-		$mysql_host                = str_replace("\'", "'", rex_post('mysql_host', 'string'));
-		$redaxo_db_user_login      = str_replace("\'", "'", rex_post('redaxo_db_user_login', 'string'));
-		$redaxo_db_user_pass       = str_replace("\'", "'", rex_post('redaxo_db_user_pass', 'string'));
-		$dbname                    = str_replace("\'", "'", rex_post('dbname', 'string'));
-		$redaxo_db_create          = rex_post('redaxo_db_create', 'boolean');
-
-		$cont = preg_replace("@(REX\['SERVER'\].?\=.?\")[^\"]*@", '${1}'.$serveraddress, $cont);
-		$cont = preg_replace("@(REX\['SERVERNAME'\].?\=.?\")[^\"]*@", '${1}'.$serverbezeichnung, $cont);
-		$cont = preg_replace("@(REX\['LANG'\].?\=.?\")[^\"]*@", '${1}'.$lang, $cont);
-		$cont = preg_replace("@(REX\['INSTNAME'\].?\=.?\")[^\"]*@", '${1}'."rex".date("YmdHis"), $cont);
-		$cont = preg_replace("@(REX\['ERROR_EMAIL'\].?\=.?\")[^\"]*@", '${1}'.$error_email, $cont);
-		$cont = preg_replace("@(REX\['PSWFUNC'\].?\=.?\")[^\"]*@", '${1}'.$psw_func, $cont);
-		$cont = preg_replace("@(REX\['DB'\]\['1'\]\['HOST'\].?\=.?\")[^\"]*@", '${1}'.$mysql_host, $cont);
-		$cont = preg_replace("@(REX\['DB'\]\['1'\]\['LOGIN'\].?\=.?\")[^\"]*@", '${1}'.$redaxo_db_user_login, $cont);
-		$cont = preg_replace("@(REX\['DB'\]\['1'\]\['PSW'\].?\=.?\")[^\"]*@", '${1}'.$redaxo_db_user_pass, $cont);
-		$cont = preg_replace("@(REX\['DB'\]\['1'\]\['NAME'\].?\=.?\")[^\"]*@", '${1}'.$dbname, $cont);
-
-		if(rex_put_file_contents($master_file, $cont) === false)
-		{
-			$err_msg = $I18N->msg('setup_020', '<b>', '</b>');
-		}
-
-		// -------------------------- DATENBANKZUGRIFF
-		$err = rex_sql::checkDbConnection($mysql_host, $redaxo_db_user_login, $redaxo_db_user_pass, $dbname, $redaxo_db_create);
-		if($err !== true)
-		{
-			$err_msg = $err;
-		}
-		else
-		{
-			$REX['DB']['1']['NAME'] = $dbname;
-			$REX['DB']['1']['LOGIN'] = $redaxo_db_user_login;
-			$REX['DB']['1']['PSW'] = $redaxo_db_user_pass;
-			$REX['DB']['1']['HOST'] = $mysql_host;
-
-			$err_msg = "";
-			$checkmodus = 3;
-			$send = "";
-		}
-	}
-	else
-	{
-		// Allgemeine Infos
-		$serveraddress         = $REX['SERVER'];
-		$serverbezeichnung     = $REX['SERVERNAME'];
-		$error_email           = $REX['ERROR_EMAIL'];
-		$psw_func              = $REX['PSWFUNC'];
-
-		// DB Infos
-		$dbname                = $REX['DB']['1']['NAME'];
-		$redaxo_db_user_login  = $REX['DB']['1']['LOGIN'];
-		$redaxo_db_user_pass   = $REX['DB']['1']['PSW'];
-		$mysql_host            = $REX['DB']['1']['HOST'];
-	}
-
-	if ($checkmodus == 2)
-	{
-		rex_setup_title($I18N->msg('setup_step2'));
-
-		echo '<h2 class="rex-hl2">'.$I18N->msg('setup_023').'</h2>
+  }
+
+  // ---------------------------------- MODUS 2 | master.inc.php - Datenbankcheck
+
+  if ($checkmodus == 2 && $send == 1)
+  {
+    $master_file = $REX['INCLUDE_PATH'].'/master.inc.php';
+    $cont = rex_get_file_contents($master_file);
+
+    // Einfache quotes nicht escapen, da der String zwischen doppelten quotes stehen wird
+    $serveraddress             = str_replace("\'", "'", rex_post('serveraddress', 'string'));
+    $serverbezeichnung         = str_replace("\'", "'", rex_post('serverbezeichnung', 'string'));
+    $error_email               = str_replace("\'", "'", rex_post('error_email', 'string'));
+    $psw_func                  = str_replace("\'", "'", rex_post('psw_func', 'string'));
+    $mysql_host                = str_replace("\'", "'", rex_post('mysql_host', 'string'));
+    $redaxo_db_user_login      = str_replace("\'", "'", rex_post('redaxo_db_user_login', 'string'));
+    $redaxo_db_user_pass       = str_replace("\'", "'", rex_post('redaxo_db_user_pass', 'string'));
+    $dbname                    = str_replace("\'", "'", rex_post('dbname', 'string'));
+    $redaxo_db_create          = rex_post('redaxo_db_create', 'boolean');
+
+    $cont = preg_replace("@(REX\['SERVER'\].?\=.?\")[^\"]*@", '${1}'.$serveraddress, $cont);
+    $cont = preg_replace("@(REX\['SERVERNAME'\].?\=.?\")[^\"]*@", '${1}'.$serverbezeichnung, $cont);
+    $cont = preg_replace("@(REX\['LANG'\].?\=.?\")[^\"]*@", '${1}'.$lang, $cont);
+    $cont = preg_replace("@(REX\['INSTNAME'\].?\=.?\")[^\"]*@", '${1}'."rex".date("YmdHis"), $cont);
+    $cont = preg_replace("@(REX\['ERROR_EMAIL'\].?\=.?\")[^\"]*@", '${1}'.$error_email, $cont);
+    $cont = preg_replace("@(REX\['PSWFUNC'\].?\=.?\")[^\"]*@", '${1}'.$psw_func, $cont);
+    $cont = preg_replace("@(REX\['DB'\]\['1'\]\['HOST'\].?\=.?\")[^\"]*@", '${1}'.$mysql_host, $cont);
+    $cont = preg_replace("@(REX\['DB'\]\['1'\]\['LOGIN'\].?\=.?\")[^\"]*@", '${1}'.$redaxo_db_user_login, $cont);
+    $cont = preg_replace("@(REX\['DB'\]\['1'\]\['PSW'\].?\=.?\")[^\"]*@", '${1}'.$redaxo_db_user_pass, $cont);
+    $cont = preg_replace("@(REX\['DB'\]\['1'\]\['NAME'\].?\=.?\")[^\"]*@", '${1}'.$dbname, $cont);
+
+    if(rex_put_file_contents($master_file, $cont) === false)
+    {
+      $err_msg = $I18N->msg('setup_020', '<b>', '</b>');
+    }
+
+    // -------------------------- DATENBANKZUGRIFF
+    $err = rex_sql::checkDbConnection($mysql_host, $redaxo_db_user_login, $redaxo_db_user_pass, $dbname, $redaxo_db_create);
+    if($err !== true)
+    {
+      $err_msg = $err;
+    }
+    else
+    {
+      $REX['DB']['1']['NAME'] = $dbname;
+      $REX['DB']['1']['LOGIN'] = $redaxo_db_user_login;
+      $REX['DB']['1']['PSW'] = $redaxo_db_user_pass;
+      $REX['DB']['1']['HOST'] = $mysql_host;
+
+      $err_msg = "";
+      $checkmodus = 3;
+      $send = "";
+    }
+  }
+  else
+  {
+    // Allgemeine Infos
+    $serveraddress         = $REX['SERVER'];
+    $serverbezeichnung     = $REX['SERVERNAME'];
+    $error_email           = $REX['ERROR_EMAIL'];
+    $psw_func              = $REX['PSWFUNC'];
+
+    // DB Infos
+    $dbname                = $REX['DB']['1']['NAME'];
+    $redaxo_db_user_login  = $REX['DB']['1']['LOGIN'];
+    $redaxo_db_user_pass   = $REX['DB']['1']['PSW'];
+    $mysql_host            = $REX['DB']['1']['HOST'];
+  }
+
+  if ($checkmodus == 2)
+  {
+    rex_setup_title($I18N->msg('setup_step2'));
+
+    echo '<h2 class="rex-hl2">'.$I18N->msg('setup_023').'</h2>
         <div class="rex-form" id="rex-form-setup-step-2">
         <form action="index.php" method="post">
         <fieldset class="rex-form-col-1">
@@ -444,22 +470,22 @@ function rex_setup_setUtf8()
           <input type="hidden" name="send" value="1" />
           <input type="hidden" name="lang" value="'.$lang.'" />';
 
-		if (isset ($err_msg) and $err_msg != '') {
-			echo rex_warning($err_msg);
-		}
+    if (isset ($err_msg) and $err_msg != '') {
+      echo rex_warning($err_msg);
+    }
 
-		$psw_functions = '';
-		foreach(array('', 'sha1') as $key => $algo)
-		{
-			$key = $algo;
-			if($algo == '') $algo = $I18N->msg('setup_no_encryption');
-			if($algo == 'sha1') $algo = $I18N->msg('setup_psw_encryption');  // ' ('. $I18N->msg('recommended') .')'
-			$selected = $key == $psw_func ? ' selected="selected"' : '';
+    $psw_functions = '';
+    foreach(array('', 'sha1') as $key => $algo)
+    {
+      $key = $algo;
+      if($algo == '') $algo = $I18N->msg('setup_no_encryption');
+      if($algo == 'sha1') $algo = $I18N->msg('setup_psw_encryption');  // ' ('. $I18N->msg('recommended') .')'
+      $selected = $key == $psw_func ? ' selected="selected"' : '';
 
-			$psw_functions .= '<option value="'. $key .'"'. $selected .'>'. $algo .'</option>';
-		}
+      $psw_functions .= '<option value="'. $key .'"'. $selected .'>'. $algo .'</option>';
+    }
 
-		echo '
+    echo '
             <legend>'.$I18N->msg("setup_0201").'</legend>
 
             <div class="rex-form-wrapper">
@@ -554,131 +580,185 @@ function rex_setup_setUtf8()
           });
            //-->
         </script>';
-	}
-
-	// ---------------------------------- MODUS 3 | Datenbank anlegen ...
-
-	if ($checkmodus == 3 && $send == 1)
-	{
-		$err_msg = '';
-		$dbanlegen = rex_post('dbanlegen', 'int', '');
-
-		// -------------------------- Benötigte Tabellen prüfen
-		$requiredTables = array (
-		$REX['TABLE_PREFIX'] .'action',
-		$REX['TABLE_PREFIX'] .'article',
-		$REX['TABLE_PREFIX'] .'article_slice',
-		$REX['TABLE_PREFIX'] .'clang',
-		$REX['TABLE_PREFIX'] .'file',
-		$REX['TABLE_PREFIX'] .'file_category',
-		$REX['TABLE_PREFIX'] .'module_action',
-		$REX['TABLE_PREFIX'] .'module',
-		$REX['TABLE_PREFIX'] .'template',
-		$REX['TABLE_PREFIX'] .'user',
-		);
-
-		if ($dbanlegen == 4)
-		{
-			// ----- vorhandenen seite updaten
-			$import_sql = $REX['INCLUDE_PATH'].'/install/update4_x_to_4_3.sql';
-			if($err_msg == '')
-			$err_msg .= rex_setup_import($import_sql);
-
-			// Aktuelle Daten updaten wenn utf8, da falsch in v4.2.1 abgelegt wurde.
-			if (rex_lang_is_utf8())
+  }
+
+  // ---------------------------------- MODUS 3 | Datenbank anlegen ...
+
+  if ($checkmodus == 3 && $send == 1)
+  {
+    $err_msg = '';
+    $dbanlegen = rex_post('dbanlegen', 'int', '');
+
+    // -------------------------- Benötigte Tabellen prüfen
+    $requiredTables = array (
+    $REX['TABLE_PREFIX'] .'action',
+    $REX['TABLE_PREFIX'] .'article',
+    $REX['TABLE_PREFIX'] .'article_slice',
+    $REX['TABLE_PREFIX'] .'clang',
+    $REX['TABLE_PREFIX'] .'file',
+    $REX['TABLE_PREFIX'] .'file_category',
+    $REX['TABLE_PREFIX'] .'module_action',
+    $REX['TABLE_PREFIX'] .'module',
+    $REX['TABLE_PREFIX'] .'template',
+    $REX['TABLE_PREFIX'] .'user',
+    );
+
+    if ($dbanlegen == 4)
+    {
+      // ----- vorhandenen seite updaten
+      #if (rex_lang_is_utf8())
       {
-  			rex_setup_setUtf8();
+        /* patch start*/
+        $info_msg = '';
+
+        // import uploaded 4.x dump
+        if (isset ($_FILES['FORM']) && $_FILES['FORM']['size']['importfile'] < 1)
+        {
+          // no upload file error
+          $err_msg = $I18N->msg("setup_03801")."<br>";
+        }
+        else
+        {
+          // drop rex_* tables
+          $info_msg .= rex_setup_dropREXtables();
+
+          // set database default charset
+          $info_msg .= rex_setup_setDBcharset('UTF8');
+
+          // create temp sql dump from upload
+          $tmp_sql = getImportDir().'/temp.sql';
+          if (@ move_uploaded_file($_FILES['FORM']['tmp_name']['importfile'], $tmp_sql))
+          {
+            // import sql dump
+            if($err_msg == '')
+            {
+              $I18N->appendFile($REX['INCLUDE_PATH'].'/addons/import_export/lang/');
+              rex_a1_import_db($tmp_sql);
+              @ unlink($tmp_sql);
+            }
+            else
+            {
+              // no permissions error
+              $err_msg = $I18N->msg("setup_03802")." ".$I18N->msg("setup_03803", "addons/import_export/files/")." <br>";
+            }
+
+            // notify without setup abort
+            if($info_msg != '')
+              echo rex_info($info_msg);
+          }
+
+          // setup addons
+          if($err_msg == '')
+          $err_msg .= rex_setup_addons();
+
+          // apply 4.3 patches to database
+          if($err_msg == '')
+          $err_msg .= rex_setup_import($REX['INCLUDE_PATH'].'/install/update4_x_to_4_3.sql');
+        }
+        /* patch end*/
       }
+      /*else
+      {
+        $import_sql = $REX['INCLUDE_PATH'].'/install/update4_x_to_4_3.sql';
+        if($err_msg == '')
+        $err_msg .= rex_setup_import($import_sql);
 
-			if($err_msg == '')
-			$err_msg .= rex_setup_addons();
-		}
-		elseif ($dbanlegen == 3)
-		{
-			// ----- vorhandenen Export importieren
-			$import_name = rex_post('import_name', 'string');
-
-			if($import_name == '')
-			{
-				$err_msg .= '<p>'.$I18N->msg('setup_03701').'</p>';
-			}
-			else
-			{
-				$import_sql = getImportDir().'/'.$import_name.'.sql';
-				$import_archiv = getImportDir().'/'.$import_name.'.tar.gz';
-
-				// Nur hier zuerst die Addons installieren
-				// Da sonst Daten aus dem eingespielten Export
-				// Überschrieben würden
-				if($err_msg == '')
-				$err_msg .= rex_setup_addons(true, false);
-				if($err_msg == '')
-				$err_msg .= rex_setup_import($import_sql, $import_archiv);
-			}
-		}
-		elseif ($dbanlegen == 2)
-		{
-			// ----- db schon vorhanden, nichts tun
-			$err_msg .= rex_setup_addons(true, false);
-		}
-		elseif ($dbanlegen == 1)
-		{
-			// ----- volle Datenbank, alte DB löschen / drop
-			$import_sql = $REX['INCLUDE_PATH'].'/install/redaxo4_3.sql';
-
-			$db = rex_sql::factory();
-			foreach($requiredTables as $table)
-			$db->setQuery('DROP TABLE IF EXISTS `'. $table .'`');
-
-			if($err_msg == '')
-			$err_msg .= rex_setup_import($import_sql);
-
-			if($err_msg == '')
-			$err_msg .= rex_setup_addons(true);
-		}
-		elseif ($dbanlegen == 0)
-		{
-			// ----- leere Datenbank neu einrichten
-			$import_sql = $REX['INCLUDE_PATH'].'/install/redaxo4_3.sql';
-
-			if($err_msg == '')
-			$err_msg .= rex_setup_import($import_sql);
-
-			$err_msg .= rex_setup_addons();
-		}
-
-		if($err_msg == "" && $dbanlegen !== '')
-		{
-			// Prüfen, welche Tabellen bereits vorhanden sind
-			$existingTables = array();
-			foreach(rex_sql::showTables() as $tblname)
-			{
-				if (substr($tblname, 0, strlen($REX['TABLE_PREFIX'])) == $REX['TABLE_PREFIX'])
-				{
-					$existingTables[] = $tblname;
-				}
-			}
-
-			foreach(array_diff($requiredTables, $existingTables) as $missingTable)
-			{
-				$err_msg .= $I18N->msg('setup_031', $missingTable)."<br />";
-			}
-		}
-
-		if ($err_msg == "")
-		{
-			$send = "";
-			$checkmodus = 4;
-		}
-	}
-
-	if ($checkmodus == 3)
-	{
-		$dbanlegen = rex_post('dbanlegen', 'int', '');
-		rex_setup_title($I18N->msg('setup_step3'));
-
-		echo '<div class="rex-form rex-form-setup-step-database">
-        <form action="index.php" method="post">
+        if($err_msg == '')
+        $err_msg .= rex_setup_addons();
+      }*/
+    }
+    elseif ($dbanlegen == 3)
+    {
+      // ----- vorhandenen Export importieren
+      $import_name = rex_post('import_name', 'string');
+
+      if($import_name == '')
+      {
+        $err_msg .= '<p>'.$I18N->msg('setup_03701').'</p>';
+      }
+      else
+      {
+        $import_sql = getImportDir().'/'.$import_name.'.sql';
+        $import_archiv = getImportDir().'/'.$import_name.'.tar.gz';
+
+        // Nur hier zuerst die Addons installieren
+        // Da sonst Daten aus dem eingespielten Export
+        // ‹berschrieben w¸rden
+        if($err_msg == '')
+        $err_msg .= rex_setup_addons(true, false);
+        if($err_msg == '')
+        $err_msg .= rex_setup_import($import_sql, $import_archiv);
+      }
+    }
+    elseif ($dbanlegen == 2)
+    {
+      // ----- db schon vorhanden, nichts tun
+      $err_msg .= rex_setup_addons(true, false);
+    }
+    elseif ($dbanlegen == 1)
+    {
+      // ----- volle Datenbank, alte DB löschen / drop
+      if(rex_lang_is_utf8())
+        rex_setup_setDBcharset();
+      
+      $import_sql = $REX['INCLUDE_PATH'].'/install/redaxo4_3.sql';
+      
+      $db = rex_sql::factory();
+      foreach($requiredTables as $table)
+      $db->setQuery('DROP TABLE IF EXISTS `'. $table .'`');
+
+      if($err_msg == '')
+      $err_msg .= rex_setup_import($import_sql);
+
+      if($err_msg == '')
+      $err_msg .= rex_setup_addons(true);
+    }
+    elseif ($dbanlegen == 0)
+    {
+      // ----- leere Datenbank neu einrichten
+      if(rex_lang_is_utf8())
+        rex_setup_setDBcharset();
+      
+      $import_sql = $REX['INCLUDE_PATH'].'/install/redaxo4_3.sql';
+      
+      if($err_msg == '')
+      $err_msg .= rex_setup_import($import_sql);
+
+      $err_msg .= rex_setup_addons();
+    }
+
+    if($err_msg == "" && $dbanlegen !== '')
+    {
+      // Prüfen, welche Tabellen bereits vorhanden sind
+      $existingTables = array();
+      foreach(rex_sql::showTables() as $tblname)
+      {
+        if (substr($tblname, 0, strlen($REX['TABLE_PREFIX'])) == $REX['TABLE_PREFIX'])
+        {
+          $existingTables[] = $tblname;
+        }
+      }
+
+      foreach(array_diff($requiredTables, $existingTables) as $missingTable)
+      {
+        $err_msg .= $I18N->msg('setup_031', $missingTable)."<br />";
+      }
+    }
+
+    if ($err_msg == "")
+    {
+      $send = "";
+      $checkmodus = 4;
+    }
+  }
+
+  if ($checkmodus == 3)
+  {
+    $dbanlegen = rex_post('dbanlegen', 'int', '');
+    rex_setup_title($I18N->msg('setup_step3'));
+
+    echo '<div class="rex-form rex-form-setup-step-database">
+        <form action="index.php" enctype="multipart/form-data" method="post">
         <fieldset class="rex-form-col-1">
           <input type="hidden" name="page" value="setup" />
           <input type="hidden" name="checkmodus" value="3" />
@@ -689,211 +769,215 @@ function rex_setup_setUtf8()
             <div class="rex-form-wrapper">
         ';
 
-		if (isset ($err_msg) and $err_msg != '')
-		echo rex_warning($err_msg.'<br />'.$I18N->msg('setup_033'));
-
-		$dbchecked = array_fill(0, 6, '');
-		switch ($dbanlegen)
-		{
-			case 1 :
-			case 2 :
-			case 3 :
-			case 4 :
-				$dbchecked[$dbanlegen] = ' checked="checked"';
-				break;
-			default :
-				$dbchecked[0] = ' checked="checked"';
-		}
-
-		// Vorhandene Exporte auslesen
-		$sel_export = new rex_select();
-		$sel_export->setName('import_name');
-		$sel_export->setId('import_name');
-		$sel_export->setStyle('class="rex-form-select"');
-		$sel_export->setAttribute('onclick', 'checkInput(\'dbanlegen_3\')');
-		$export_dir = getImportDir();
-		$exports_found = false;
-
-		if (is_dir($export_dir))
-		{
-			if ($handle = opendir($export_dir))
-			{
-				$export_archives = array ();
-				$export_sqls = array ();
-
-				while (($file = readdir($handle)) !== false)
-				{
-					if ($file == '.' || $file == '..')
-					{
-						continue;
-					}
-
-					$isSql = (substr($file, strlen($file) - 4) == '.sql');
-					$isArchive = (substr($file, strlen($file) - 7) == '.tar.gz');
-
-					if ($isSql)
-					{
-						// endung .sql abschneiden
-						$export_sqls[] = substr($file, 0, -4);
-						$exports_found = true;
-					}
-					elseif ($isArchive)
-					{
-						// endung .tar.gz abschneiden
-						$export_archives[] = substr($file, 0, -7);
-						$exports_found = true;
-					}
-				}
-				closedir($handle);
-			}
-
-			foreach ($export_sqls as $sql_export)
-			{
-				// Es ist ein Export Archiv + SQL File vorhanden
-				if (in_array($sql_export, $export_archives))
-				{
-					$sel_export->addOption($sql_export, $sql_export);
-				}
-			}
-		}
-
-		echo '
-
-		<div class="rex-form-row">
-			<p class="rex-form-col-a rex-form-radio rex-form-label-right">
+    if (isset ($err_msg) and $err_msg != '')
+    echo rex_warning($err_msg.'<br />'.$I18N->msg('setup_033'));
+
+    $dbchecked = array_fill(0, 6, '');
+    switch ($dbanlegen)
+    {
+      case 1 :
+      case 2 :
+      case 3 :
+      case 4 :
+        $dbchecked[$dbanlegen] = ' checked="checked"';
+        break;
+      default :
+        $dbchecked[0] = ' checked="checked"';
+    }
+
+    // Vorhandene Exporte auslesen
+    $sel_export = new rex_select();
+    $sel_export->setName('import_name');
+    $sel_export->setId('import_name');
+    $sel_export->setStyle('class="rex-form-select"');
+    $sel_export->setAttribute('onclick', 'checkInput(\'dbanlegen_3\')');
+    $export_dir = getImportDir();
+    $exports_found = false;
+
+    if (is_dir($export_dir))
+    {
+      if ($handle = opendir($export_dir))
+      {
+        $export_archives = array ();
+        $export_sqls = array ();
+
+        while (($file = readdir($handle)) !== false)
+        {
+          if ($file == '.' || $file == '..')
+          {
+            continue;
+          }
+
+          $isSql = (substr($file, strlen($file) - 4) == '.sql');
+          $isArchive = (substr($file, strlen($file) - 7) == '.tar.gz');
+
+          if ($isSql)
+          {
+            // endung .sql abschneiden
+            $export_sqls[] = substr($file, 0, -4);
+            $exports_found = true;
+          }
+          elseif ($isArchive)
+          {
+            // endung .tar.gz abschneiden
+            $export_archives[] = substr($file, 0, -7);
+            $exports_found = true;
+          }
+        }
+        closedir($handle);
+      }
+
+      foreach ($export_sqls as $sql_export)
+      {
+        // Es ist ein Export Archiv + SQL File vorhanden
+        if (in_array($sql_export, $export_archives))
+        {
+          $sel_export->addOption($sql_export, $sql_export);
+        }
+      }
+    }
+
+    echo '
+
+    <div class="rex-form-row">
+      <p class="rex-form-col-a rex-form-radio rex-form-label-right">
         <input class="rex-form-radio" type="radio" id="dbanlegen_0" name="dbanlegen" value="0"'.$dbchecked[0]. rex_tabindex() .' />
         <label for="dbanlegen_0">'.$I18N->msg('setup_034').'</label>
       </p>
     </div>
 
-		<div class="rex-form-row">
-			<p class="rex-form-col-a rex-form-radio rex-form-label-right">
+    <div class="rex-form-row">
+      <p class="rex-form-col-a rex-form-radio rex-form-label-right">
         <input class="rex-form-radio" type="radio" id="dbanlegen_1" name="dbanlegen" value="1"'.$dbchecked[1] .' />
         <label for="dbanlegen_1">'.$I18N->msg('setup_035', '<b>', '</b>').'</label>
       </p>
     </div>
 
-		<div class="rex-form-row">
-			<p class="rex-form-col-a rex-form-radio rex-form-label-right">
+    <div class="rex-form-row">
+      <p class="rex-form-col-a rex-form-radio rex-form-label-right">
         <input class="rex-form-radio" type="radio" id="dbanlegen_2" name="dbanlegen" value="2"'.$dbchecked[2] .' />
         <label for="dbanlegen_2">'.$I18N->msg('setup_036').'</label>
       </p>
     </div>
 
-		<div class="rex-form-row">
-			<p class="rex-form-col-a rex-form-radio rex-form-label-right">
+    <div class="rex-form-row">
+      <p class="rex-form-col-a rex-form-radio rex-form-label-right">
         <input class="rex-form-radio" type="radio" id="dbanlegen_4" name="dbanlegen" value="4"'.$dbchecked[4] .' />
         <label for="dbanlegen_4">'.$I18N->msg('setup_038').'</label>
       </p>
+      
+      <p class="rex-form-col-a rex-form-select rex-form-radio-select">
+        <input style="margin-left:25px;" onclick="checkInput(\'dbanlegen_4\')" class="rex-form-file" type="file" id="importdbfile" name="FORM[importfile]" size="18" />
+      </p>
     </div>';
 
-		if($exports_found)
-		{
-			echo '
-		<div class="rex-form-row">
-			<p class="rex-form-col-a rex-form-radio rex-form-label-right">
+    if($exports_found)
+    {
+      echo '
+    <div class="rex-form-row">
+      <p class="rex-form-col-a rex-form-radio rex-form-label-right">
         <input class="rex-form-radio" type="radio" id="dbanlegen_3" name="dbanlegen" value="3"'.$dbchecked[3] .' />
         <label for="dbanlegen_3">'.$I18N->msg('setup_037').'</label>
       </p>
       <p class="rex-form-col-a rex-form-select rex-form-radio-select">'. $sel_export->get() .'</p>
     </div>';
-		}
+    }
 
-		echo '
+    echo '
       </div>
-			</fieldset>
-			<fieldset class="rex-form-col-1">
-				<div class="rex-form-wrapper">
-					<div class="rex-form-row">
-						<p class="rex-form-col-a rex-form-submit">
-							<input class="rex-form-submit" type="submit" value="'.$I18N->msg('setup_039').'"'. rex_tabindex() .' />
-						</p>
-					</div>
-				</div>
-			</fieldset>
+      </fieldset>
+      <fieldset class="rex-form-col-1">
+        <div class="rex-form-wrapper">
+          <div class="rex-form-row">
+            <p class="rex-form-col-a rex-form-submit">
+              <input class="rex-form-submit" type="submit" value="'.$I18N->msg('setup_039').'"'. rex_tabindex() .' />
+            </p>
+          </div>
+        </div>
+      </fieldset>
   </form>
   </div>
   ';
-	}
-
-	// ---------------------------------- MODUS 4 | User anlegen ...
-
-	if ($checkmodus == 4 && $send == 1)
-	{
-		$noadmin           = rex_post('noadmin', 'int');
-		$redaxo_user_login = rex_post('redaxo_user_login', 'string');
-		$redaxo_user_pass  = rex_post('redaxo_user_pass', 'string');
-
-		$err_msg = "";
-		if ($noadmin != 1)
-		{
-			if ($redaxo_user_login == '')
-			{
-				$err_msg .= $I18N->msg('setup_040');
-			}
-
-			if ($redaxo_user_pass == '')
-			{
-				// Falls auch kein Login eingegeben wurde, die Fehlermeldungen mit " " trennen
-				if($err_msg != '') $err_msg .= ' ';
-
-				$err_msg .= $I18N->msg('setup_041');
-			}
-
-			if ($err_msg == "")
-			{
-				$ga = rex_sql::factory();
-				$ga->setQuery("select * from ".$REX['TABLE_PREFIX']."user where login='$redaxo_user_login'");
-
-				if ($ga->getRows() > 0)
-				{
-					$err_msg .= $I18N->msg('setup_042');
-				}
-				else
-				{
-					if ($REX['PSWFUNC'] != '')
-					$redaxo_user_pass = call_user_func($REX['PSWFUNC'], $redaxo_user_pass);
-
-					$user = rex_sql::factory();
-					// $user->debugsql = true;
-					$user->setTable($REX['TABLE_PREFIX'].'user');
-					$user->setValue('name', 'Administrator');
-					$user->setValue('login', $redaxo_user_login);
-					$user->setValue('psw', $redaxo_user_pass);
-					$user->setValue('rights', '#admin[]#');
-					$user->addGlobalCreateFields('setup');
-					$user->setValue('status', '1');
-					if (!$user->insert())
-					{
-						$err_msg .= $I18N->msg("setup_043");
-					}
-				}
-			}
-		}
-		else
-		{
-			$gu = rex_sql::factory();
-			$gu->setQuery("select * from ".$REX['TABLE_PREFIX']."user LIMIT 1");
-			if ($gu->getRows() == 0)
-			$err_msg .= $I18N->msg('setup_044');
-		}
-
-		if ($err_msg == '')
-		{
-			$checkmodus = 5;
-			$send = '';
-		}
-	}
-
-	if ($checkmodus == 4)
-	{
-		$user_sql = rex_sql::factory();
-		$user_sql->setQuery("select * from ".$REX['TABLE_PREFIX']."user LIMIT 1");
-
-		rex_setup_title($I18N->msg("setup_step4"));
-
-		echo '
-		<div class="rex-form rex-form-setup-admin">
+  }
+
+  // ---------------------------------- MODUS 4 | User anlegen ...
+
+  if ($checkmodus == 4 && $send == 1)
+  {
+    $noadmin           = rex_post('noadmin', 'int');
+    $redaxo_user_login = rex_post('redaxo_user_login', 'string');
+    $redaxo_user_pass  = rex_post('redaxo_user_pass', 'string');
+
+    $err_msg = "";
+    if ($noadmin != 1)
+    {
+      if ($redaxo_user_login == '')
+      {
+        $err_msg .= $I18N->msg('setup_040');
+      }
+
+      if ($redaxo_user_pass == '')
+      {
+        // Falls auch kein Login eingegeben wurde, die Fehlermeldungen mit " " trennen
+        if($err_msg != '') $err_msg .= ' ';
+
+        $err_msg .= $I18N->msg('setup_041');
+      }
+
+      if ($err_msg == "")
+      {
+        $ga = rex_sql::factory();
+        $ga->setQuery("select * from ".$REX['TABLE_PREFIX']."user where login='$redaxo_user_login'");
+
+        if ($ga->getRows() > 0)
+        {
+          $err_msg .= $I18N->msg('setup_042');
+        }
+        else
+        {
+          if ($REX['PSWFUNC'] != '')
+          $redaxo_user_pass = call_user_func($REX['PSWFUNC'], $redaxo_user_pass);
+
+          $user = rex_sql::factory();
+          // $user->debugsql = true;
+          $user->setTable($REX['TABLE_PREFIX'].'user');
+          $user->setValue('name', 'Administrator');
+          $user->setValue('login', $redaxo_user_login);
+          $user->setValue('psw', $redaxo_user_pass);
+          $user->setValue('rights', '#admin[]#');
+          $user->addGlobalCreateFields('setup');
+          $user->setValue('status', '1');
+          if (!$user->insert())
+          {
+            $err_msg .= $I18N->msg("setup_043");
+          }
+        }
+      }
+    }
+    else
+    {
+      $gu = rex_sql::factory();
+      $gu->setQuery("select * from ".$REX['TABLE_PREFIX']."user LIMIT 1");
+      if ($gu->getRows() == 0)
+      $err_msg .= $I18N->msg('setup_044');
+    }
+
+    if ($err_msg == '')
+    {
+      $checkmodus = 5;
+      $send = '';
+    }
+  }
+
+  if ($checkmodus == 4)
+  {
+    $user_sql = rex_sql::factory();
+    $user_sql->setQuery("select * from ".$REX['TABLE_PREFIX']."user LIMIT 1");
+
+    rex_setup_title($I18N->msg("setup_step4"));
+
+    echo '
+    <div class="rex-form rex-form-setup-admin">
     <form action="index.php" method="post" autocomplete="off">
       <fieldset class="rex-form-col-1">
         <input type="hidden" name="page" value="setup" />
@@ -904,38 +988,38 @@ function rex_setup_setUtf8()
         <div class="rex-form-wrapper">
         ';
 
-		if ($err_msg != "")
-		echo rex_warning($err_msg);
+    if ($err_msg != "")
+    echo rex_warning($err_msg);
 
-		$redaxo_user_login = rex_post('redaxo_user_login', 'string');
-		$redaxo_user_pass  = rex_post('redaxo_user_pass', 'string');
+    $redaxo_user_login = rex_post('redaxo_user_login', 'string');
+    $redaxo_user_pass  = rex_post('redaxo_user_pass', 'string');
 
-		echo '
-    	<div class="rex-form-row">
-		    <p class="rex-form-col-a rex-form-text">
+    echo '
+      <div class="rex-form-row">
+        <p class="rex-form-col-a rex-form-text">
           <label for="redaxo_user_login">'.$I18N->msg("setup_046").':</label>
           <input class="rex-form-text" type="text" value="'.$redaxo_user_login.'" id="redaxo_user_login" name="redaxo_user_login"'. rex_tabindex() .'/>
         </p>
       </div>
-    	<div class="rex-form-row">
-		    <p class="rex-form-col-a rex-form-text">
+      <div class="rex-form-row">
+        <p class="rex-form-col-a rex-form-text">
           <label for="redaxo_user_pass">'.$I18N->msg("setup_047").':</label>
           <input class="rex-form-text" type="password" value="'.$redaxo_user_pass.'" id="redaxo_user_pass" name="redaxo_user_pass"'. rex_tabindex() .'/>
         </p>
       </div>';
 
-		if($user_sql->getRows() > 0)
-		{
-			echo '
-    	<div class="rex-form-row">
-		    <p class="rex-form-col-a rex-form-checkbox rex-form-label-right">
+    if($user_sql->getRows() > 0)
+    {
+      echo '
+      <div class="rex-form-row">
+        <p class="rex-form-col-a rex-form-checkbox rex-form-label-right">
           <input class="rex-form-checkbox" type="checkbox" id="noadmin" name="noadmin" value="1"'. rex_tabindex() .'/>
           <label for="noadmin">'.$I18N->msg("setup_048").'</label>
         </p>
       </div>';
-		}
+    }
 
-		echo '
+    echo '
       </div>
       </fieldset>
       <fieldset class="rex-form-col-1">
@@ -957,31 +1041,31 @@ function rex_setup_setUtf8()
        //-->
     </script>';
 
-	}
-
-	// ---------------------------------- MODUS 5 | Setup verschieben ...
-
-	if ($checkmodus == 5)
-	{
-		$master_file = $REX['INCLUDE_PATH'].'/master.inc.php';
-		$cont = rex_get_file_contents($master_file);
-		$cont = preg_replace("@(REX\['SETUP'\].?\=.?)[^;]*@", '$1false', $cont);
-
-		if(rex_put_file_contents($master_file, $cont))
-		{
-			$errmsg = "";
-		}
-		else
-		{
-			$errmsg = $I18N->msg('setup_050');
-		}
-
-		rex_setup_title($I18N->msg('setup_step5'));
-		echo $I18N->msg('setup_051', '<h2 class="rex-hl2">', '</h2>');
-		echo '<div class="rex-area-content">';
-		echo $I18N->msg('setup_052', '<h3 class="rex-hl3">', '</h3>', ' class="rex-ul1"', '<a href="index.php">', '</a>');
-		echo '<p class="rex-tx1">'.$I18N->msg('setup_053').'</p>';
-		echo '</div>';
-
-	}
-	echo '</div>';
\ No newline at end of file
+  }
+
+  // ---------------------------------- MODUS 5 | Setup verschieben ...
+
+  if ($checkmodus == 5)
+  {
+    $master_file = $REX['INCLUDE_PATH'].'/master.inc.php';
+    $cont = rex_get_file_contents($master_file);
+    $cont = preg_replace("@(REX\['SETUP'\].?\=.?)[^;]*@", '$1false', $cont);
+
+    if(rex_put_file_contents($master_file, $cont))
+    {
+      $errmsg = "";
+    }
+    else
+    {
+      $errmsg = $I18N->msg('setup_050');
+    }
+
+    rex_setup_title($I18N->msg('setup_step5'));
+    echo $I18N->msg('setup_051', '<h2 class="rex-hl2">', '</h2>');
+    echo '<div class="rex-area-content">';
+    echo $I18N->msg('setup_052', '<h3 class="rex-hl3">', '</h3>', ' class="rex-ul1"', '<a href="index.php">', '</a>');
+    echo '<p class="rex-tx1">'.$I18N->msg('setup_053').'</p>';
+    echo '</div>';
+
+  }
+  echo '</div>';
\ No newline at end of file