The upgrade script could not be start automatically.\n" . - "Please click on this link to start the script!
\n"; - exit; - } +echo "If the upgrade script could not be start automatically.\n" . + "Please click on this link to start the script!
\n"; + +echo ""; + +// if(!headers_sent()) { +// header('Location: '.WB_URL.'/upgrade-script.php'); +// exit; +// } else { +// echo "The upgrade script could not be start automatically.\n" . +// "Please click on this link to start the script!
\n"; +// exit; +// } } } // --------------------------------------- Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1821) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1822) @@ -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.3'); -if(!defined('REVISION')) define('REVISION', '1821'); +if(!defined('REVISION')) define('REVISION', '1822'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/install/sql/wb_search.sql =================================================================== --- branches/2.8.x/wb/install/sql/wb_search.sql (revision 1821) +++ branches/2.8.x/wb/install/sql/wb_search.sql (nonexistent) @@ -1,33 +0,0 @@ - --- --- Tabellenstruktur für Tabelle `{TABLE_PREFIX}search` --- - -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) NOT NULL DEFAULT '', - `value` text NOT NULL, - `extra` text NOT NULL, - PRIMARY KEY (`search_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; - --- --- Daten für Tabelle `{TABLE_PREFIX}search` --- - -INSERT INTO `{TABLE_PREFIX}search` VALUES(1, 'header', '[TEXT_RESULTS_FOR] "[SEARCH_STRING]":
\r\n[DESCRIPTION].. [EXCERPT]
', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(5, 'results_footer', '[TEXT_NO_RESULTS]
', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(7, 'module_order', 'faqbaker,manual,wysiwyg', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(8, 'max_excerpt', '5', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(9, 'time_limit', '0', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(10, 'cfg_enable_old_search', 'true', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(11, 'cfg_search_keywords', 'true', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(12, 'cfg_search_description', 'true', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(13, 'cfg_show_description', 'true', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(14, 'cfg_enable_flush', 'true', ''); -INSERT INTO `{TABLE_PREFIX}search` VALUES(15, 'template', '', ''); Property changes on: branches/2.8.x/wb/install/sql/wb_search.sql ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/install/sql/wb_search_data.sql =================================================================== --- branches/2.8.x/wb/install/sql/wb_search_data.sql (nonexistent) +++ branches/2.8.x/wb/install/sql/wb_search_data.sql (revision 1822) @@ -0,0 +1,22 @@ +-- phpMyAdmin SQL Dump +-- Date of creation: 2012-11-17 12:37am +-- Server Version: 5.1.41 +-- +-- initial data for table `{TABLE_PREFIX}search` +-- +INSERT INTO `{TABLE_PREFIX}search` VALUES(1, 'header', '[TEXT_RESULTS_FOR] "[SEARCH_STRING]":
\r\n[DESCRIPTION].. [EXCERPT]
', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(5, 'results_footer', '[TEXT_NO_RESULTS]
', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(7, 'module_order', 'faqbaker,manual,wysiwyg', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(8, 'max_excerpt', '5', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(9, 'time_limit', '0', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(10, 'cfg_enable_old_search', 'true', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(11, 'cfg_search_keywords', 'true', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(12, 'cfg_search_description', 'true', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(13, 'cfg_show_description', 'true', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(14, 'cfg_enable_flush', 'true', ''); +INSERT INTO `{TABLE_PREFIX}search` VALUES(15, 'template', '', ''); +-- End of file \ No newline at end of file Property changes on: branches/2.8.x/wb/install/sql/wb_search_data.sql ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Index: branches/2.8.x/wb/install/sql/websitebaker.sql =================================================================== --- branches/2.8.x/wb/install/sql/websitebaker.sql (revision 1821) +++ branches/2.8.x/wb/install/sql/websitebaker.sql (revision 1822) @@ -1,48 +1,45 @@ +-- phpMyAdmin SQL Dump +-- Date of creation: 2012-11-17 12:37am +-- Server Version: 5.1.41 +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; +-- -------------------------------------------------------- +-- Database structure for WebsiteBaker core -- --- Tabellenstruktur für Tabelle '{TABLE_PREFIX}addons' +-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION} -- - -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) NOT NULL DEFAULT '', - `directory` varchar(255) NOT NULL DEFAULT '', - `name` varchar(255) NOT NULL DEFAULT '', - description text NOT NULL, - `function` varchar(255) NOT NULL DEFAULT '', - version varchar(255) NOT NULL DEFAULT '', - platform varchar(255) NOT NULL DEFAULT '', - author varchar(255) NOT NULL DEFAULT '', - license varchar(255) NOT NULL DEFAULT '', +-- -------------------------------------------------------- +-- +-- Structure of table '{TABLE_PREFIX}addons' +-- +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 '', PRIMARY KEY (addon_id) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - +){TABLE_ENGINE}; -- --- Tabellenstruktur für Tabelle `{TABLE_PREFIX}groups` +-- Structure of table '{TABLE_PREFIX}groups' -- - 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) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `system_permissions` text COLLATE utf8_unicode_ci NOT NULL, - `module_permissions` text COLLATE utf8_unicode_ci NOT NULL, - `template_permissions` text COLLATE utf8_unicode_ci NOT NULL, + `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, PRIMARY KEY (`group_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - +){TABLE_ENGINE}; -- --- Daten für Tabelle `{TABLE_PREFIX}groups` +-- Structure of table '{TABLE_PREFIX}pages' -- - -INSERT INTO `{TABLE_PREFIX}groups` VALUES(1, 'Administrators', 'access,addons,admintools,admintools_view,groups,groups_add,groups_delete,groups_modify,groups_view,languages,languages_install,languages_uninstall,languages_view,media,media_create,media_delete,media_rename,media_upload,media_view,modules,modules_advanced,modules_install,modules_uninstall,modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,pages_modify,pages_settings,pages_view,preferences,preferences_view,settings,settings_advanced,settings_basic,settings_view,templates,templates_install,templates_uninstall,templates_view,users,users_add,users_delete,users_modify,users_view', '', ''); - --- -------------------------------------------------------- - --- --- Tabellenstruktur für Tabelle `{TABLE_PREFIX}pages` --- - DROP TABLE IF EXISTS `{TABLE_PREFIX}pages`; CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}pages` ( `page_id` int(11) NOT NULL AUTO_INCREMENT, @@ -49,92 +46,93 @@ `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) COLLATE utf8_unicode_ci NOT NULL, - `target` varchar(7) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `page_title` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `page_icon` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `menu_title` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `menu_icon_0` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `menu_icon_1` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `tooltip` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `description` text COLLATE utf8_unicode_ci NOT NULL, - `keywords` text COLLATE utf8_unicode_ci NOT NULL, - `page_trail` varchar(255) COLLATE utf8_unicode_ci NOT NULL, - `template` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `visibility` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + `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 '', `position` int(11) NOT NULL DEFAULT '0', `menu` int(11) NOT NULL DEFAULT '1', - `language` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + `language` varchar(5){TABLE_COLLATION} NOT NULL DEFAULT '', `page_code` int(11) NOT NULL DEFAULT '0', `searching` int(11) NOT NULL DEFAULT '0', - `admin_groups` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1', - `admin_users` varchar(512) COLLATE utf8_unicode_ci NOT NULL, - `viewing_groups` varchar(512) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1', - `viewing_users` varchar(512) COLLATE utf8_unicode_ci NOT NULL, + `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, `modified_when` int(11) NOT NULL DEFAULT '0', `modified_by` int(11) NOT NULL DEFAULT '0', - `custom01` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `custom02` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + `custom01` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', + `custom02` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', PRIMARY KEY (`page_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - -- --- Tabellenstruktur für Tabelle `{TABLE_PREFIX}sections` +-- Structure of table '{TABLE_PREFIX}sections' -- - DROP TABLE IF EXISTS `{TABLE_PREFIX}sections`; CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}sections` ( `section_id` int(11) NOT NULL AUTO_INCREMENT, `page_id` int(11) NOT NULL DEFAULT '0', `position` int(11) NOT NULL DEFAULT '0', - `module` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `block` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `publ_start` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0', - `publ_end` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0', + `module` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', + `block` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', + `publ_start` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0', + `publ_end` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0', PRIMARY KEY (`section_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - --- -------------------------------------------------------- - -- --- Tabellenstruktur für Tabelle `{TABLE_PREFIX}users` +-- Structure of table '{TABLE_PREFIX}users' -- - DROP TABLE IF EXISTS `{TABLE_PREFIX}users`; CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}users` ( `user_id` int(11) NOT NULL AUTO_INCREMENT, `group_id` int(11) NOT NULL DEFAULT '0', - `groups_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0', + `groups_id` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '0', `active` int(11) NOT NULL DEFAULT '0', - `username` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `password` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `confirm_code` varchar(32) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + `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 '', `confirm_timeout` int(11) NOT NULL DEFAULT '0', - `remember_key` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + `remember_key` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', `last_reset` int(11) NOT NULL DEFAULT '0', - `display_name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `email` text COLLATE utf8_unicode_ci NOT NULL, + `display_name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', + `email` text{TABLE_COLLATION} NOT NULL, `timezone` int(11) NOT NULL DEFAULT '0', - `date_format` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `time_format` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `language` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'EN', - `home_folder` text COLLATE utf8_unicode_ci NOT NULL, + `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, `login_when` int(11) NOT NULL DEFAULT '0', - `login_ip` varchar(15) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + `login_ip` varchar(15){TABLE_COLLATION} NOT NULL DEFAULT '', PRIMARY KEY (`user_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - +){TABLE_ENGINE}; -- --- Tabellenstruktur für Tabelle `{TABLE_PREFIX}settings` +-- Structure of table '{TABLE_PREFIX}settings' -- - DROP TABLE IF EXISTS `{TABLE_PREFIX}settings`; CREATE TABLE IF NOT EXISTS `{TABLE_PREFIX}settings` ( `setting_id` int(11) NOT NULL AUTO_INCREMENT, - `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '', - `value` text COLLATE utf8_unicode_ci NOT NULL, + `name` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', + `value` text{TABLE_COLLATION} NOT NULL, PRIMARY KEY (`setting_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - +){TABLE_ENGINE}; +-- +-- Structure of table `{TABLE_PREFIX}search` +-- +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, + 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 1821) +++ branches/2.8.x/wb/install/save.php (revision 1822) @@ -350,7 +350,7 @@ } } -// core tables structure and some default values +// core tables only structure $sSqlFileName = dirname(__FILE__).'/sql/websitebaker.sql'; if(!$database->SqlImport($sSqlFileName,TABLE_PREFIX, false)) { set_error($database->get_error()); } @@ -422,12 +422,20 @@ ." (62, 'system_locked', '0')"; if(!$database->query($settings_rows)) { set_error($database->get_error()); } + // Admin group + $full_system_permissions = 'access,addons,admintools,admintools_view,groups,groups_add,groups_delete,groups_modify,groups_view,'; + $full_system_permissions .= 'languages,languages_install,languages_uninstall,languages_view,media,media_create,media_delete,media_rename,media_upload,media_view,'; + $full_system_permissions .= 'modules,modules_advanced,modules_install,modules_uninstall,modules_view,pages,pages_add,pages_add_l0,pages_delete,pages_intro,pages_modify,pages_settings,pages_view,'; + $full_system_permissions .= 'preferences,preferences_view,settings,settings_advanced,settings_basic,settings_view,templates,templates_install,templates_uninstall,templates_view,users,users_add,users_delete,users_modify,users_view'; + $insert_admin_group = "INSERT INTO `".TABLE_PREFIX."groups` VALUES ('1', 'Administrators', '$full_system_permissions', '', '')"; + if(!$database->query($insert_admin_group)) { set_error($database->get_error()); } + // Admin user $insert_admin_user = "INSERT INTO `".TABLE_PREFIX."users` VALUES (1, 1, '1', 1, '$admin_username', '".md5($admin_password)."', '', 0, '', 0, 'Administrator', '$admin_email', 0, '', '', '$default_language', '', 0, '');"; if(!$database->query($insert_admin_user)) { set_error($database->get_error()); } -// Search settings table structure and default values - $sSqlFileName = dirname(__FILE__).'/sql/wb_search.sql'; +// Search layout default data + $sSqlFileName = dirname(__FILE__).'/sql/wb_search_data.sql'; if(!$database->SqlImport($sSqlFileName,TABLE_PREFIX, false)) { set_error($database->get_error()); } // Include WB functions file