Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 2109)
+++ branches/2.8.x/CHANGELOG	(revision 2110)
@@ -11,6 +11,8 @@
 ! = Update/Change
 ===============================================================================
 
+25 Nov-2014 Build 2110 Manuela v.d.Decken(DarkViper)
+# install/ change old install-struct format into new one
 25 Nov-2014 Build 2109 Manuela v.d.Decken(DarkViper)
 # admin/settings/ little typofix, save settings now use official method
 25 Nov-2014 Build 2108 Manuela v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 2109)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 2110)
@@ -51,5 +51,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.4');
-if(!defined('REVISION')) define('REVISION', '2109');
+if(!defined('REVISION')) define('REVISION', '2110');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/install/sql/install-struct.sql
===================================================================
--- branches/2.8.x/wb/install/sql/install-struct.sql	(revision 2109)
+++ branches/2.8.x/wb/install/sql/install-struct.sql	(revision 2110)
@@ -5,7 +5,7 @@
 -- --------------------------------------------------------
 -- Database structure for WebsiteBaker core
 --
--- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION}
+-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {FIELD_COLLATION}
 --
 -- --------------------------------------------------------
 --
@@ -14,15 +14,15 @@
 DROP TABLE IF EXISTS `{TABLE_PREFIX}addons`;
 CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}addons` (
   `addon_id` int(11) NOT NULL AUTO_INCREMENT,
-  `type` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `directory` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `description` text{TABLE_COLLATION} NOT NULL,
-  `function` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `version` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `platform` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `author` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `license` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `type` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `directory` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `description` text{FIELD_COLLATION} NOT NULL,
+  `function` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `version` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `platform` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `author` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `license` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
   PRIMARY KEY (addon_id)
 ){TABLE_ENGINE};
 --
@@ -31,10 +31,10 @@
 DROP TABLE IF EXISTS `{TABLE_PREFIX}groups`;
 CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}groups` (
   `group_id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `system_permissions` text{TABLE_COLLATION} NOT NULL,
-  `module_permissions` text{TABLE_COLLATION} NOT NULL,
-  `template_permissions` text{TABLE_COLLATION} NOT NULL,
+  `name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `system_permissions` text{FIELD_COLLATION} NOT NULL,
+  `module_permissions` text{FIELD_COLLATION} NOT NULL,
+  `template_permissions` text{FIELD_COLLATION} NOT NULL,
   PRIMARY KEY (`group_id`)
 ){TABLE_ENGINE};
 --
@@ -46,32 +46,32 @@
   `parent` int(11) NOT NULL DEFAULT '0',
   `root_parent` int(11) NOT NULL DEFAULT '0',
   `level` int(11) NOT NULL DEFAULT '0',
-  `link` varchar(255){TABLE_COLLATION} NOT NULL,
-  `target` varchar(7){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `page_title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `page_icon` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `menu_title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `menu_icon_0` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `menu_icon_1` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `tooltip` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `description` text{TABLE_COLLATION} NOT NULL,
-  `keywords` text{TABLE_COLLATION} NOT NULL,
-  `page_trail` varchar(255){TABLE_COLLATION} NOT NULL,
-  `template` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `visibility` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `link` varchar(255){FIELD_COLLATION} NOT NULL,
+  `target` varchar(7){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `page_title` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `page_icon` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `menu_title` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `menu_icon_0` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `menu_icon_1` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `tooltip` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `description` text{FIELD_COLLATION} NOT NULL,
+  `keywords` text{FIELD_COLLATION} NOT NULL,
+  `page_trail` varchar(255){FIELD_COLLATION} NOT NULL,
+  `template` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `visibility` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
   `position` int(11) NOT NULL DEFAULT '0',
   `menu` int(11) NOT NULL DEFAULT '1',
-  `language` varchar(5){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `language` varchar(5){FIELD_COLLATION} NOT NULL DEFAULT '',
   `page_code` int(11) NOT NULL DEFAULT '0',
   `searching` int(11) NOT NULL DEFAULT '0',
-  `admin_groups` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '1',
-  `admin_users` varchar(512){TABLE_COLLATION} NOT NULL,
-  `viewing_groups` varchar(512){TABLE_COLLATION} NOT NULL DEFAULT '1',
-  `viewing_users` varchar(512){TABLE_COLLATION} NOT NULL,
+  `admin_groups` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '1',
+  `admin_users` varchar(512){FIELD_COLLATION} NOT NULL,
+  `viewing_groups` varchar(512){FIELD_COLLATION} NOT NULL DEFAULT '1',
+  `viewing_users` varchar(512){FIELD_COLLATION} NOT NULL,
   `modified_when` int(11) NOT NULL DEFAULT '0',
   `modified_by` int(11) NOT NULL DEFAULT '0',
-  `custom01` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `custom02` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `custom01` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `custom02` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
   PRIMARY KEY (`page_id`)
 ) {TABLE_ENGINE};
 --
@@ -82,8 +82,8 @@
   `section_id` int(11) NOT NULL AUTO_INCREMENT,
   `page_id` int(11) NOT NULL DEFAULT '0',
   `position` int(11) NOT NULL DEFAULT '0',
-  `title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `module` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `title` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `module` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
   `block` int(11) NOT NULL DEFAULT '1',
   `publ_start` int(11) NOT NULL DEFAULT '0',
   `publ_end` int(11) NOT NULL DEFAULT '0',
@@ -96,23 +96,23 @@
 CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}users` (
   `user_id` int(11) NOT NULL AUTO_INCREMENT,
   `group_id` int(11) NOT NULL DEFAULT '0' COMMENT 'this field is set deprecated and never used in WB',
-  `groups_id` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0',
+  `groups_id` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '0',
   `active` int(11) NOT NULL DEFAULT '0',
-  `username` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `password` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `confirm_code` varchar(32){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `username` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `password` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `confirm_code` varchar(32){FIELD_COLLATION} NOT NULL DEFAULT '',
   `confirm_timeout` int(11) NOT NULL DEFAULT '0',
-  `remember_key` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `remember_key` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
   `last_reset` int(11) NOT NULL DEFAULT '0',
-  `display_name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `email` text{TABLE_COLLATION} NOT NULL,
+  `display_name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `email` text{FIELD_COLLATION} NOT NULL,
   `timezone` int(11) NOT NULL DEFAULT '0',
-  `date_format` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `time_format` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `language` varchar(5){TABLE_COLLATION} NOT NULL DEFAULT 'EN',
-  `home_folder` text{TABLE_COLLATION} NOT NULL,
+  `date_format` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `time_format` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `language` varchar(5){FIELD_COLLATION} NOT NULL DEFAULT 'EN',
+  `home_folder` text{FIELD_COLLATION} NOT NULL,
   `login_when` int(11) NOT NULL DEFAULT '0',
-  `login_ip` varchar(15){TABLE_COLLATION} NOT NULL DEFAULT '',
+  `login_ip` varchar(15){FIELD_COLLATION} NOT NULL DEFAULT '',
   PRIMARY KEY (`user_id`)
 ){TABLE_ENGINE};
 --
@@ -120,8 +120,8 @@
 --
 DROP TABLE IF EXISTS `{TABLE_PREFIX}settings`;
 CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}settings` (
-  `name` varchar(255){TABLE_COLLATION} NOT NULL,
-  `value` text{TABLE_COLLATION} NOT NULL,
+  `name` varchar(255){FIELD_COLLATION} NOT NULL,
+  `value` text{FIELD_COLLATION} NOT NULL,
   PRIMARY KEY (`name`)
 ){TABLE_ENGINE};
 --
@@ -130,9 +130,9 @@
 DROP TABLE IF EXISTS `{TABLE_PREFIX}search`;
 CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}search` (
   `search_id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '',
-  `value` text{TABLE_COLLATION} NOT NULL,
-  `extra` text{TABLE_COLLATION} NOT NULL,
+  `name` varchar(255){FIELD_COLLATION} NOT NULL DEFAULT '',
+  `value` text{FIELD_COLLATION} NOT NULL,
+  `extra` text{FIELD_COLLATION} NOT NULL,
   PRIMARY KEY (`search_id`)
 ){TABLE_ENGINE};
 -- EndOfFile
\ No newline at end of file
Index: branches/2.8.x/wb/install/save.php
===================================================================
--- branches/2.8.x/wb/install/save.php	(revision 2109)
+++ branches/2.8.x/wb/install/save.php	(revision 2110)
@@ -474,13 +474,13 @@
 /*****************************
 Begin Create Database Tables
 *****************************/
-$oSqlInst = new SqlInstall($database, __DIR__.'/sql/install-struct.sql');
+$oSqlInst = new SqlImport($database, __DIR__.'/sql/install-struct.sql');
 if ($oSqlInst) {
     if (!$oSqlInst->doImport('install')) {
         set_error($oSqlInst->getError());
     }
 }
-$oSqlInst = new SqlInstall($database, __DIR__.'/sql/install-data.sql');
+$oSqlInst = new SqlImport($database, __DIR__.'/sql/install-data.sql');
 if ($oSqlInst) {
     if (!$oSqlInst->doImport('install')) {
         set_error($oSqlInst->getError());