[TEXT_RESULTS_FOR] [SEARCH_STRING]:
\n[DESCRIPTION].. [EXCERPT]
', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='results_footer', - `value`='[TEXT_NO_RESULTS]
', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='module_order', - `value`='wysiwyg', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='max_excerpt', - `value`='5', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='time_limit', - `value`='0', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='cfg_enable_old_search', - `value`='true', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='cfg_search_keywords', - `value`='true', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='cfg_search_description', - `value`='true', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='cfg_show_description', - `value`='true', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='cfg_enable_flush', - `value`='true', - `extra`=''; -INSERT INTO `{TABLE_PREFIX}search` SET - `name`='template', - `value`='', - `extra`=''; --- End of file \ No newline at end of file Property changes on: branches/2.8.x/wb/install/sql/wb_search_data.sql ___________________________________________________________________ Deleted: svn:keywords ## -1,4 +0,0 ## -Id -Revision -HeadURL -Date \ 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 2103) +++ branches/2.8.x/wb/install/sql/websitebaker.sql (nonexistent) @@ -1,138 +0,0 @@ --- 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 --- --- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION} --- --- -------------------------------------------------------- --- --- 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) -){TABLE_ENGINE}; --- --- 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){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`) -){TABLE_ENGINE}; --- --- Structure of table '{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, - `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 '', - `position` int(11) NOT NULL DEFAULT '0', - `menu` int(11) NOT NULL DEFAULT '1', - `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){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){TABLE_COLLATION} NOT NULL DEFAULT '', - `custom02` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', - PRIMARY KEY (`page_id`) -) {TABLE_ENGINE}; --- --- 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){TABLE_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', - PRIMARY KEY (`section_id`) -) {TABLE_ENGINE}; --- --- 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' COMMENT 'this field is set deprecated and never used in WB', - `groups_id` varchar(255){TABLE_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 '', - `confirm_timeout` int(11) NOT NULL DEFAULT '0', - `remember_key` varchar(255){TABLE_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, - `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, - `login_when` int(11) NOT NULL DEFAULT '0', - `login_ip` varchar(15){TABLE_COLLATION} NOT NULL DEFAULT '', - PRIMARY KEY (`user_id`) -){TABLE_ENGINE}; --- --- 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){TABLE_COLLATION} NOT NULL DEFAULT '', - `value` text{TABLE_COLLATION} NOT NULL, - PRIMARY KEY (`setting_id`) -){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 Property changes on: branches/2.8.x/wb/install/sql/websitebaker.sql ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1,4 +0,0 ## -Id -Revision -HeadURL -Date \ No newline at end of property Index: branches/2.8.x/wb/install/sql/install-struct.sql =================================================================== --- branches/2.8.x/wb/install/sql/install-struct.sql (nonexistent) +++ branches/2.8.x/wb/install/sql/install-struct.sql (revision 2104) @@ -0,0 +1,138 @@ +-- 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 +-- +-- Replacements: {TABLE_PREFIX}, {TABLE_ENGINE}, {TABLE_COLLATION} +-- +-- -------------------------------------------------------- +-- +-- 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) +){TABLE_ENGINE}; +-- +-- 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){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`) +){TABLE_ENGINE}; +-- +-- Structure of table '{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, + `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 '', + `position` int(11) NOT NULL DEFAULT '0', + `menu` int(11) NOT NULL DEFAULT '1', + `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){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){TABLE_COLLATION} NOT NULL DEFAULT '', + `custom02` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', + PRIMARY KEY (`page_id`) +) {TABLE_ENGINE}; +-- +-- 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', + `title` varchar(255){TABLE_COLLATION} NOT NULL DEFAULT '', + `module` varchar(255){TABLE_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', + PRIMARY KEY (`section_id`) +) {TABLE_ENGINE}; +-- +-- 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' COMMENT 'this field is set deprecated and never used in WB', + `groups_id` varchar(255){TABLE_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 '', + `confirm_timeout` int(11) NOT NULL DEFAULT '0', + `remember_key` varchar(255){TABLE_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, + `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, + `login_when` int(11) NOT NULL DEFAULT '0', + `login_ip` varchar(15){TABLE_COLLATION} NOT NULL DEFAULT '', + PRIMARY KEY (`user_id`) +){TABLE_ENGINE}; +-- +-- Structure of table '{TABLE_PREFIX}settings' +-- +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, + PRIMARY KEY (`name`) +){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 Property changes on: branches/2.8.x/wb/install/sql/install-struct.sql ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1,4 ## +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/install/sql/install-data.sql =================================================================== --- branches/2.8.x/wb/install/sql/install-data.sql (nonexistent) +++ branches/2.8.x/wb/install/sql/install-data.sql (revision 2104) @@ -0,0 +1,91 @@ +-- phpMyAdmin SQL Dump +-- version 4.0.4.1 +-- http://www.phpmyadmin.net +-- +-- Host: 127.0.0.1 +-- Erstellungszeit: 17. Nov 2012 um 12:37 +-- Server Version: 5.5.32 +-- PHP-Version: 5.4.19 +-- +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +-- +-- Daten für Tabelle `groups` +-- +INSERT INTO `{TABLE_PREFIX}groups` (`group_id`, `name`, `system_permissions`, `module_permissions`, `template_permissions`) VALUES +(1, 'Administrators', 'pages,pages_view,pages_add,pages_add_l0,pages_settings,pages_modify,pages_intro,pages_delete,media,media_view,media_upload,media_rename,media_delete,media_create,addons,modules,modules_view,modules_install,modules_uninstall,templates,templates_view,templates_install,templates_uninstall,languages,languages_view,languages_install,languages_uninstall,settings,settings_basic,settings_advanced,access,users,users_view,users_add,users_modify,users_delete,groups,groups_view,groups_add,groups_modify,groups_delete,admintools', '', ''); +-- +-- Daten für Tabelle `search` +-- +INSERT INTO `{TABLE_PREFIX}search` (`name`, `value`, `extra`) VALUES +('header', '[TEXT_RESULTS_FOR] [SEARCH_STRING]:
\n[DESCRIPTION].. [EXCERPT]
', ''), +('results_footer', '[TEXT_NO_RESULTS]
', ''), +('module_order', 'wysiwyg', ''), +('max_excerpt', '15', ''), +('time_limit', '0', ''), +('cfg_enable_old_search', 'true', ''), +('cfg_search_keywords', 'true', ''), +('cfg_search_description', 'true', ''), +('cfg_show_description', 'true', ''), +('cfg_enable_flush', 'false', ''), +('template', '', ''); +-- +-- Daten für Tabelle `settings` +-- +INSERT INTO `{TABLE_PREFIX}settings` (`name`, `value`) VALUES +('website_description', ''), +('website_keywords', ''), +('website_header', ''), +('website_footer', ''), +('wysiwyg_style', 'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;'), +('er_level', ''), +('sec_anchor', 'wb_'), +('default_date_format', 'M d Y'), +('default_time_format', 'g:i A'), +('redirect_timer', '1500'), +('home_folders', 'true'), +('warn_page_leave', '1'), +('default_template', 'round'), +('default_theme', 'wb_theme'), +('default_charset', 'utf-8'), +('multiple_menus', 'true'), +('page_level_limit', '4'), +('intro_page', 'false'), +('page_trash', 'inline'), +('homepage_redirection', 'false'), +('page_languages', 'true'), +('wysiwyg_editor', 'fckeditor'), +('manage_sections', 'true'), +('section_blocks', 'true'), +('smart_login', 'true'), +('frontend_login', 'false'), +('frontend_signup', 'false'), +('search', 'public'), +('page_extension', '.php'), +('page_spacer', '-'), +('pages_directory', '/pages'), +('rename_files_on_upload', 'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js'), +('media_directory', '/media'), +('wbmailer_routine', 'phpmail'), +('wbmailer_default_sendername', 'WB Mailer'), +('wbmailer_smtp_host', ''), +('wbmailer_smtp_auth', ''), +('wbmailer_smtp_username', ''), +('wbmailer_smtp_password', ''), +('fingerprint_with_ip_octets', '2'), +('secure_form_module', ''), +('mediasettings', ''), +('page_icon_dir', '/templates/*/title_images'), +('dev_infos', 'false'), +('wbmail_signature', ''), +('confirmed_registration', '1'), +('page_extendet', 'true'), +('system_locked', '0'), +('password_crypt_loops', '12'), +('password_hash_type', 'false'), +('password_length', '10'), +('password_use_types', '65535'); +-- End of file \ No newline at end of file Property changes on: branches/2.8.x/wb/install/sql/install-data.sql ___________________________________________________________________ Added: svn:keywords ## -0,0 +1,4 ## +Id +Revision +HeadURL +Date \ No newline at end of property Index: branches/2.8.x/wb/install/save.php =================================================================== --- branches/2.8.x/wb/install/save.php (revision 2103) +++ branches/2.8.x/wb/install/save.php (revision 2104) @@ -39,6 +39,7 @@ include(dirname(__DIR__).'/framework/globalExceptionHandler.php'); include(dirname(__DIR__).'/framework/WbAutoloader.php'); WbAutoloader::doRegister(array('admin'=>'a', 'modules'=>'m', 'templates'=>'t', 'include'=>'i')); +include(__DIR__.'/InstallHelper.php'); // register PHPMailer autoloader --- if (!function_exists('PHPMailerAutoload')) { require(dirname(__DIR__).'/include/phpmailer/PHPMailerAutoload.php'); @@ -261,7 +262,8 @@ // End path and timezone details code // Get the default language -$allowed_languages = array('BG','CA', 'CS', 'DA', 'DE', 'EN', 'ES', 'ET', 'FI', 'FR', 'HR', 'HU', 'IT', 'LV', 'NL', 'NO', 'PL', 'PT', 'RU','SE','SK','TR'); +$sLanguageDirectory = dirname(__DIR__).'languages/'; +$allowed_languages = array_keys(InstallHelper::getAvailableLanguages($sLanguageDirectory)); if(!isset($_POST['default_language']) OR !in_array($_POST['default_language'], $allowed_languages)) { set_error('Please select a valid default backend language','default_language'); } else { @@ -400,6 +402,7 @@ ."pass = \"".$database_password."\"\n" ."host = \"".$database_host."\"\n" ."port = \"3306\"\n" +."socket = \"\"\n" ."name = \"".$database_name."\"\n" ."charset = \"utf8\"\n" ."table_prefix = \"".$table_prefix."\"\n" @@ -463,121 +466,70 @@ $sSecMod = (defined('SECURE_FORM_MODULE') && SECURE_FORM_MODULE != '') ? '.'.SECURE_FORM_MODULE : ''; $sSecMod = WB_PATH.'/framework/SecureForm'.$sSecMod.'.php'; require_once($sSecMod); +require(ADMIN_PATH.'/interface/version.php'); + +/***************************** +Begin Create Database Tables +*****************************/ +if (is_readable(__DIR__.'/sql/install-struct.sql')) { + if (! $database->SqlImport(__DIR__.'/sql/install-struct.sql', TABLE_PREFIX, false)) { + set_error('unable to import install-struct.sql'); + } +} +if (is_readable(__DIR__.'/sql/install-data.sql')) { + if (! $database->SqlImport(__DIR__.'/sql/install-data.sql', TABLE_PREFIX)) { + set_error('unable to import install-data.sql'); + } +} +$sql = // additional settings from install input + 'REPLACE INTO `'.TABLE_PREFIX.'settings` (`name`, `value`) VALUES ' + . '(\'wb_version\', \''.VERSION.'\'), ' + . '(\'website_title\', \''.$website_title.'\'), ' + . '(\'default_language\', \''.$default_language.'\'), ' + . '(\'app_name\', \'wb_'.$session_rand.'\'), ' + . '(\'default_timezone\', \''.$default_timezone.'\'), ' + . '(\'operating_system\', \''.$operating_system.'\'), ' + . '(\'string_file_mode\', \''.$file_mode.'\'), ' + . '(\'string_dir_mode\', \''.$dir_mode.'\'), ' + . '(\'server_email\', \''.$admin_email.'\'), ' + . '(\'wb_revision\', \''.REVISION.'\'), ' + . '(\'wb_sp\', \''.SP.'\'), ' + . '(\'groups_updated\', \''.time().'\')'; +if (! ($database->query($sql))) { + set_error('unable to write \'install presets\' into table \'settings\''); +} +$sql = // add the Admin user + 'INSERT INTO `'.TABLE_PREFIX.'users` ' + .'SET `user_id`=1, ' + . '`group_id`=1, ' + . '`groups_id`=\'1\', ' + . '`active`=\'1\', ' + . '`username`=\''.$admin_username.'\', ' + . '`password`=\''.md5($admin_password).'\', ' + . '`email`=\''.$admin_email.'\', ' + . '`timezone`=\''.$default_timezone.'\', ' + . '`language`=\''.$default_language.'\', ' + . '`display_name`=\'Administrator\''; +if (! ($database->query($sql))) { + set_error('unable to write Administrator account into table \'users\''); +} +/********************** +END OF TABLES IMPORT +**********************/ +// initialize the system +require_once(WB_PATH.'/framework/initialize.php'); require_once(WB_PATH.'/framework/class.admin.php'); - +/*********************** // Dummy class to allow modules' install scripts to call $admin->print_error - class admin_dummy extends admin - { - var $error=''; - function print_error($message, $link = 'index.php', $auto_footer = true) - { - $this->error=$message; - } - } - -// core tables only structure - $sSqlFileName = dirname(__FILE__).'/sql/websitebaker.sql'; - if(!$database->SqlImport($sSqlFileName,TABLE_PREFIX, false)) { set_error($database->get_error()); } - - require(ADMIN_PATH.'/interface/version.php'); - - $sql = 'INSERT INTO `'.TABLE_PREFIX.'settings` (`name`, `value`) VALUES ' - . '(\'wb_version\', \''.VERSION.'\'), ' - . '(\'website_title\', \''.$website_title.'\'), ' - . '(\'website_description\', \'\'), ' - . '(\'website_keywords\', \'\'), ' - . '(\'website_header\', \'\'), ' - . '(\'website_footer\', \'\'), ' - . '(\'wysiwyg_style\', \'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;\'), ' - . '(\'er_level\', \'0\'), ' - . '(\'default_language\', \''.$default_language.'\'), ' - . '(\'app_name\', \'wb_'.$session_rand.'\'), ' - . '(\'sec_anchor\', \'Sec\'), ' - . '(\'server_timezone\', \'UTC\'), ' - . '(\'default_timezone\', \''.$default_timezone.'\'), ' - . '(\'default_date_format\', \'Y-m-d\'), ' - . '(\'default_time_format\', \'h:i A\'), ' - . '(\'redirect_timer\', \'1500\'), ' - . '(\'home_folders\', \'false\'), ' - . '(\'warn_page_leave\', \'1\'), ' - . '(\'default_template\', \'round\'), ' - . '(\'default_theme\', \'WbTheme\'), ' - . '(\'default_charset\', \'utf-8\'), ' - . '(\'multiple_menus\', \'true\'), ' - . '(\'page_level_limit\', \'6\'), ' - . '(\'intro_page\', \'false\'), ' - . '(\'page_trash\', \'inline\'), ' - . '(\'homepage_redirection\', \'false\'), ' - . '(\'page_languages\', \'false\'), ' - . '(\'wysiwyg_editor\', \'fckeditor\'), ' - . '(\'manage_sections\', \'true\'), ' - . '(\'section_blocks\', \'false\'), ' - . '(\'smart_login\', \'false\'), ' - . '(\'frontend_login\', \'false\'), ' - . '(\'frontend_signup\', \'false\'), ' - . '(\'search\', \'public\'), ' - . '(\'page_extension\', \'.php\'), ' - . '(\'page_spacer\', \'-\'), ' - . '(\'pages_directory\', \'/pages\'), ' - . '(\'rename_files_on_upload\', \'ph.*?,cgi,pl,pm,exe,com,bat,pif,cmd,src,asp,aspx,js,txt\'), ' - . '(\'media_directory\', \'/media\'), ' - . '(\'operating_system\', \''.$operating_system.'\'), ' - . '(\'string_file_mode\', \''.$file_mode.'\'), ' - . '(\'string_dir_mode\', \''.$dir_mode.'\'), ' - . '(\'wbmailer_routine\', \'phpmail\'), ' - . '(\'server_email\', \''.$admin_email.'\'), ' - . '(\'wbmailer_default_sendername\', \'WebsiteBaker Mailer\'), ' - . '(\'wbmailer_smtp_host\', \'\'), ' - . '(\'wbmailer_smtp_auth\', \'\'), ' - . '(\'wbmailer_smtp_username\', \'\'), ' - . '(\'wbmailer_smtp_password\', \'\'), ' - . '(\'fingerprint_with_ip_octets\', \'2\'), ' - . '(\'secure_form_module\', \'\'), ' - . '(\'mediasettings\', \'\'), ' - . '(\'wb_revision\', \''.REVISION.'\'), ' - . '(\'wb_sp\', \''.SP.'\'), ' - . '(\'page_icon_dir\', \'/templates/*/title_images\'), ' - . '(\'dev_infos\', \'false\'), ' - . '(\'groups_updated\', \''.time().'\'), ' - . '(\'wbmail_signature\', \'\'), ' - . '(\'confirmed_registration\', \'1\'), ' - . '(\'page_extendet\', \'true\'), ' - . '(\'system_locked\', \'0\'), ' - . '(\'password_crypt_loops\', \'12\'), ' - . '(\'password_hash_type\', \'false\'), ' - . '(\'password_length\', \'10\'), ' - . '(\'password_use_types\', \''.(int)0xFFFF.'\') ' - . ''; - if(!$database->query($sql)) { set_error($database->get_error()); } - - // Admin group - $full_system_permissions = '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'; - $sql = 'INSERT INTO `'.TABLE_PREFIX.'groups` ' - . 'SET `group_id` =1,' - . '`name`=\'Administrators\',' - . '`system_permissions`=\''.$full_system_permissions.'\',' - . '`module_permissions`=\'\',' - . '`template_permissions`=\'\''; - if(!$database->query($sql)) { 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', $default_timezone, '', '', '$default_language', '', 0, '');"; - if(!$database->query($insert_admin_user)) { set_error($database->get_error()); } - -// Search layout default data - $sSqlFileName = dirname(__FILE__).'/sql/wb_search_data.sql'; - if(!$database->SqlImport($sSqlFileName,TABLE_PREFIX, false)) { set_error($database->get_error()); } - - require_once(WB_PATH.'/framework/initialize.php'); -// +***********************/ +class admin_dummy extends admin +{ + public $error=''; + public function print_error($message, $link = 'index.php', $auto_footer = true) + { + $this->error=$message; + } +} // Include WB functions file require_once(WB_PATH.'/framework/functions.php'); // Re-connect to the database, this time using in-build database class @@ -585,45 +537,33 @@ // Include the PclZip class file (thanks to require_once(WB_PATH.'/include/pclzip/pclzip.lib.php'); // Install add-ons - if(file_exists(WB_PATH.'/install/modules')) { - // Unpack pre-packaged modules - } - if(file_exists(WB_PATH.'/install/templates')) { - // Unpack pre-packaged templates - } - if(file_exists(WB_PATH.'/install/languages')) { - // Unpack pre-packaged languages - } - $admin=new admin_dummy('Start','',false,false); - // Load addons into DB - $dirs['modules'] = WB_PATH.'/modules/'; - $dirs['templates'] = WB_PATH.'/templates/'; - $dirs['languages'] = WB_PATH.'/languages/'; +// Load addons and templates into DB + $aScanDirs = array( + 'module' => dirname(__DIR__).'/modules/', + 'template' => dirname(__DIR__).'/templates/', + 'language' => dirname(__DIR__).'/languages/' + ); + foreach ($aScanDirs as $sType => $sPath) { + $sCommand = 'load_'.$sType; + if ($sType != 'language') { + foreach (glob($sPath, GLOB_ONLYDIR) as $sMatchingPath) { + if ($sType == 'module') { + $sCommand($sMatchingPath, true); + if ($admin->error) { set_error($admin->error); } + } elseif ($sType == 'template') { + $sCommand($sMatchingPath); + } + } + } else { + foreach (glob(dirname(__DIR__).'/languages/??.php') as $sMatchingPath) { + if (preg_match('/\/[A-Z]{2}\.php$/sU', $sMatchingPath)) { + $sCommand($sMatchingPath); + } + } + } + } - foreach($dirs AS $type => $dir) { - if(($handle = opendir($dir))) { - while(false !== ($file = readdir($handle))) { - if($file != '' AND substr($file, 0, 1) != '.' AND $file != 'admin.php' AND $file != 'index.php') { - // Get addon type - if($type == 'modules') { - load_module($dir.'/'.$file, true); - // Pretty ugly hack to let modules run $admin->set_error - // See dummy class definition admin_dummy above - if ($admin->error!='') { - set_error($admin->error); - } - } elseif($type == 'templates') { - load_template($dir.'/'.$file); - } elseif($type == 'languages') { - load_language($dir.'/'.$file); - } - } - } - closedir($handle); - } - } - // Check if there was a database error if($database->is_error()) { set_error($database->get_error()); Index: branches/2.8.x/wb/install/InstallHelper.php =================================================================== --- branches/2.8.x/wb/install/InstallHelper.php (nonexistent) +++ branches/2.8.x/wb/install/InstallHelper.php (revision 2104) @@ -0,0 +1,51 @@ + + * @author Manuela v.d.DeckenWebsiteBaker 2.8.4 and above is not able to run with PHP-Version less then 5.3.2!!
'
- . 'Please change your PHP-Version to any kind from 5.3.2 and up!
'
+// PHP less then 5.4.0 is prohibited ---
+if (version_compare(PHP_VERSION, '5.4.0', '<')) {
+ $sMsg = '
WebsiteBaker 2.8.4 and above is not able to run with PHP-Version less then 5.4.0!!
'
+ . 'Please change your PHP-Version to any kind from 5.4.0 and up!
'
. 'If you have problems to solve that, ask your hosting provider for it.
'
. 'The very best solution is the use of PHP-5.4 and up