Index: trunk/wb/install/save.php =================================================================== --- trunk/wb/install/save.php (revision 222) +++ trunk/wb/install/save.php (revision 223) @@ -1,3 +1,640 @@ + + Copyright (C) 2004-2005, Ryan Djurovich + + Website Baker is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + Website Baker is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Website Baker; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +*/ + +// Start a session +if(!defined('SESSION_STARTED')) { + session_name('wb_session_id'); + session_start(); + define('SESSION_STARTED', true); +} + +// Function to set error +function set_error($message) { + global $_POST; + if(isset($message) AND $message != '') { + // Copy values entered into session so user doesn't have to re-enter everything + if(isset($_POST['website_title'])) { + $_SESSION['wb_url'] = $_POST['wb_url']; + $_SESSION['wb_path'] = $_POST['wb_path']; + $_SESSION['default_timezone'] = $_POST['default_timezone']; + if(!isset($_POST['operating_system'])) { + $_SESSION['operating_system'] = 'linux'; + } else { + $_SESSION['operating_system'] = $_POST['operating_system']; + } + if(!isset($_POST['world_writeable'])) { + $_SESSION['world_writeable'] = false; + } else { + $_SESSION['world_writeable'] = true; + } + $_SESSION['database_host'] = $_POST['database_host']; + $_SESSION['database_username'] = $_POST['database_username']; + $_SESSION['database_password'] = $_POST['database_password']; + $_SESSION['database_name'] = $_POST['database_name']; + $_SESSION['table_prefix'] = $_POST['table_prefix']; + if(!isset($_POST['install_tables'])) { + $_SESSION['install_tables'] = false; + } else { + $_SESSION['install_tables'] = true; + } + $_SESSION['website_title'] = $_POST['website_title']; + $_SESSION['admin_username'] = $_POST['admin_username']; + $_SESSION['admin_email'] = $_POST['admin_email']; + $_SESSION['admin_password'] = $_POST['admin_password']; + } + // Set the message + $_SESSION['message'] = $message; + // Specify that session support is enabled + $_SESSION['session_support'] = 'Enabled'; + // Redirect to first page again and exit + header('Location: index.php?sessions_checked=true'); + exit(); + } +} + +// Function to workout what the default permissions are for files created by the webserver +function default_file_mode($temp_dir) { + $v = explode(".",PHP_VERSION); + $v = $v[0].$v[1]; + if($v > 41 AND is_writable($temp_dir)) { + $filename = $temp_dir.'/test_permissions.txt'; + $handle = fopen($filename, 'w'); + fwrite($handle, 'This file is to get the default file permissions'); + fclose($handle); + $default_file_mode = '0'.substr(sprintf('%o', fileperms($filename)), -3); + unlink($filename); + } else { + $default_file_mode = '0777'; + } + return $default_file_mode; +} + +// Function to workout what the default permissions are for directories created by the webserver +function default_dir_mode($temp_dir) { + $v = explode(".",PHP_VERSION); + $v = $v[0].$v[1]; + if($v > 41 AND is_writable($temp_dir)) { + $dirname = $temp_dir.'/test_permissions/'; + mkdir($dirname); + $default_dir_mode = '0'.substr(sprintf('%o', fileperms($dirname)), -3); + rmdir($dirname); + } else { + $default_dir_mode = '0777'; + } + return $default_dir_mode; +} + +function add_slashes($input) { + if ( get_magic_quotes_gpc() || ( !is_string($input) ) ) { + return $input; + } + $output = addslashes($input); + return $output; + } + +// Begin check to see if form was even submitted +// Set error if no post vars found +if(!isset($_POST['website_title'])) { + set_error('Please fill-in the form below'); +} +// End check to see if form was even submitted + +// Begin path and timezone details code + +// Check if user has entered the installation url +if(!isset($_POST['wb_url']) OR $_POST['wb_url'] == '') { + set_error('Please enter an absolute URL'); +} else { + $wb_url = $_POST['wb_url']; +} +// Remove any slashes at the end of the URL +if(substr($wb_url, strlen($wb_url)-1, 1) == "/") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +if(substr($wb_url, strlen($wb_url)-1, 1) == "/") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") { + $wb_url = substr($wb_url, 0, strlen($wb_url)-1); +} +// Get the default time zone +if(!isset($_POST['default_timezone']) OR !is_numeric($_POST['default_timezone'])) { + set_error('Please select a valid default timezone'); +} else { + $default_timezone = $_POST['default_timezone']*60*60; +} +// End path and timezone details code + +// Begin operating system specific code +// Get operating system +if(!isset($_POST['operating_system']) OR $_POST['operating_system'] != 'linux' AND $_POST['operating_system'] != 'windows') { + set_error('Please select a valid operating system'); +} else { + $operating_system = $_POST['operating_system']; +} +// Work-out file permissions +if($operating_system == 'windows') { + $file_mode = '0777'; + $dir_mode = '0777'; +} elseif(isset($_POST['world_writeable']) AND $_POST['world_writeable'] == 'true') { + $file_mode = '0777'; + $dir_mode = '0777'; +} else { + $file_mode = default_file_mode('../temp'); + $dir_mode = default_dir_mode('../temp'); +} +// End operating system specific code + +// Begin database details code +// Check if user has entered a database host +if(!isset($_POST['database_host']) OR $_POST['database_host'] == '') { + set_error('Please enter a database host name'); +} else { + $database_host = $_POST['database_host']; +} +// Check if user has entered a database username +if(!isset($_POST['database_username']) OR $_POST['database_username'] == '') { + set_error('Please enter a database username'); +} else { + $database_username = $_POST['database_username']; +} +// Check if user has entered a database password +if(!isset($_POST['database_password'])) { + set_error('Please enter a database password'); +} else { + $database_password = $_POST['database_password']; +} +// Check if user has entered a database name +if(!isset($_POST['database_name']) OR $_POST['database_name'] == '') { + set_error('Please enter a database name'); +} else { + $database_name = $_POST['database_name']; +} +// Get table prefix +$table_prefix = $_POST['table_prefix']; +// Find out if the user wants to install tables and data +if(isset($_POST['install_tables']) AND $_POST['install_tables'] == 'true') { + $install_tables = true; +} else { + $install_tables = false; +} +// End database details code + +// Begin website title code +// Get website title +if(!isset($_POST['website_title']) OR $_POST['website_title'] == '') { + set_error('Please enter a website title'); +} else { + $website_title = add_slashes($_POST['website_title']); +} +// End website title code + +// Begin admin user details code +// Get admin username +if(!isset($_POST['admin_username']) OR $_POST['admin_username'] == '') { + set_error('Please enter a username for the Administrator account'); +} else { + $admin_username = $_POST['admin_username']; +} +// Get admin email and validate it +if(!isset($_POST['admin_email']) OR $_POST['admin_email'] == '') { + set_error('Please enter an email for the Administrator account'); +} else { + if(eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $_POST['admin_email'])) { + $admin_email = $_POST['admin_email']; + } else { + set_error('Please enter a valid email address for the Administrator account'); + } +} +// Get the two admin passwords entered, and check that they match +if(!isset($_POST['admin_password']) OR $_POST['admin_password'] == '') { + set_error('Please enter a password for the Administrator account'); +} else { + $admin_password = $_POST['admin_password']; +} +if(!isset($_POST['admin_repassword']) OR $_POST['admin_repassword'] == '') { + set_error('Please make sure you re-enter the password for the Administrator account'); +} else { + $admin_repassword = $_POST['admin_repassword']; +} +if($admin_password != $admin_repassword) { + set_error('Sorry, the two Administrator account passwords you entered do not match'); +} +// End admin user details code + +// Try and write settings to config file +$config_content = "" . +""; + +$config_filename = '../config.php'; + +// Check if the file exists and is writable first. +if(file_exists($config_filename) AND is_writable($config_filename)) { + if(!$handle = fopen($config_filename, 'w')) { + set_error("Cannot open the configuration file ($config_filename)"); + } else { + if (fwrite($handle, $config_content) === FALSE) { + set_error("Cannot write to the configuration file ($config_filename)"); + } + // Close file + fclose($handle); + } +} else { + set_error("The configuration file $config_filename is not writable. Change its permissions so it is, then re-run step 4."); +} + +// Define configuration vars +define('DB_TYPE', 'mysql'); +define('DB_HOST', $database_host); +define('DB_USERNAME', $database_username); +define('DB_PASSWORD', $database_password); +define('DB_NAME', $database_name); +define('TABLE_PREFIX', $table_prefix); +define('WB_PATH', str_replace(array('/install','\install'), '',dirname(__FILE__))); +define('WB_URL', $wb_url); +define('ADMIN_PATH', WB_PATH.'/admin'); +define('ADMIN_URL', $wb_url.'/admin'); + +// Check if the user has entered a correct path +if(!file_exists(WB_PATH.'/framework/class.admin.php')) { + set_error('It appears the Absolute path that you entered is incorrect'); +} + +// Try connecting to database +if(!mysql_connect(DB_HOST, DB_USERNAME, DB_PASSWORD)) { + set_error('Database host name, username and/or password incorrect. MySQL Error:
'.mysql_error()); +} + +// Try to create the database +mysql_query('CREATE DATABASE '.$database_name); + +// Close the mysql connection +mysql_close(); + +// Include WB functions file +require_once(WB_PATH.'/framework/functions.php'); + +// Re-connect to the database, this time using in-build database class +require_once(WB_PATH.'/framework/class.login.php'); +$database=new database(); + +// Check if we should install tables +if($install_tables == true) { + + // Remove tables if they exist + + // Pages table + $pages = "DROP TABLE IF EXISTS `".TABLE_PREFIX."pages`"; + $database->query($pages); + // Sections table + $sections = "DROP TABLE IF EXISTS `".TABLE_PREFIX."sections`"; + $database->query($sections); + // Settings table + $settings = "DROP TABLE IF EXISTS `".TABLE_PREFIX."settings`"; + $database->query($settings); + // Users table + $users = "DROP TABLE IF EXISTS `".TABLE_PREFIX."users`"; + $database->query($users); + // Groups table + $groups = "DROP TABLE IF EXISTS `".TABLE_PREFIX."groups`"; + $database->query($groups); + // Search table + $search = "DROP TABLE IF EXISTS `".TABLE_PREFIX."search`"; + $database->query($search); + // Addons table + $addons = "DROP TABLE IF EXISTS `".TABLE_PREFIX."addons`"; + $database->query($addons); + + // Try installing tables + + // Pages table + $pages = 'CREATE TABLE `'.TABLE_PREFIX.'pages` ( `page_id` INT NOT NULL auto_increment,' + . ' `parent` INT NOT NULL ,' + . ' `root_parent` INT NOT NULL ,' + . ' `level` INT NOT NULL ,' + . ' `link` TEXT NOT NULL ,' + . ' `target` VARCHAR( 7 ) NOT NULL ,' + . ' `page_title` VARCHAR( 255 ) NOT NULL ,' + . ' `menu_title` VARCHAR( 255 ) NOT NULL ,' + . ' `description` TEXT NOT NULL ,' + . ' `keywords` TEXT NOT NULL ,' + . ' `page_trail` TEXT NOT NULL ,' + . ' `template` VARCHAR( 255 ) NOT NULL ,' + . ' `visibility` VARCHAR( 255 ) NOT NULL ,' + . ' `position` INT NOT NULL ,' + . ' `menu` INT NOT NULL ,' + . ' `language` VARCHAR( 5 ) NOT NULL ,' + . ' `searching` INT NOT NULL ,' + . ' `admin_groups` TEXT NOT NULL ,' + . ' `admin_users` TEXT NOT NULL ,' + . ' `viewing_groups` TEXT NOT NULL ,' + . ' `viewing_users` TEXT NOT NULL ,' + . ' `modified_when` INT NOT NULL ,' + . ' `modified_by` INT NOT NULL ,' + . ' PRIMARY KEY ( `page_id` ) )' + . ' '; + $database->query($pages); + + // Sections table + $pages = 'CREATE TABLE `'.TABLE_PREFIX.'sections` ( `section_id` INT NOT NULL auto_increment,' + . ' `page_id` INT NOT NULL ,' + . ' `position` INT NOT NULL ,' + . ' `module` VARCHAR( 255 ) NOT NULL ,' + . ' `block` VARCHAR( 255 ) NOT NULL ,' + . ' PRIMARY KEY ( `section_id` ) )' + . ' '; + $database->query($pages); + + require(WB_PATH.'/admin/interface/version.php'); + + // Settings table + $settings="CREATE TABLE `".TABLE_PREFIX."settings` ( `setting_id` INT NOT NULL auto_increment, + `name` VARCHAR( 255 ) NOT NULL , + `value` TEXT NOT NULL , + PRIMARY KEY ( `setting_id` ) )"; + $database->query($settings); + $settings_rows= "INSERT INTO `".TABLE_PREFIX."settings` 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;')," + ." ('', 'rename_files_on_upload', 'php,asp,phpx,aspx')," + ." ('', 'er_level', '')," + ." ('', 'default_language', 'EN')," + ." ('', 'app_name', 'wb')," + ." ('', 'default_timezone', '$default_timezone')," + ." ('', 'default_date_format', 'M d Y')," + ." ('', 'default_time_format', 'g:i A')," + ." ('', 'home_folders', 'true')," + ." ('', 'default_template', 'round')," + ." ('', 'multiple_menus', 'false')," + ." ('', 'page_level_limit', '4')," + ." ('', 'intro_page', 'false')," + ." ('', 'page_trash', 'disabled')," + ." ('', 'homepage_redirection', 'false')," + ." ('', 'page_languages', 'false')," + ." ('', 'wysiwyg_editor', 'htmlarea')," + ." ('', 'manage_sections', 'true')," + ." ('', 'section_blocks', 'false')," + ." ('', 'smart_login', 'false')," + ." ('', 'frontend_login', 'false')," + ." ('', 'frontend_signup', 'false')," + ." ('', 'server_email', '$admin_email')," + ." ('', 'search', 'public')," + ." ('', 'page_extension', '.php')," + ." ('', 'page_spacer', '-')," + ." ('', 'pages_directory', '/pages')," + ." ('', 'media_directory', '/media')," + ." ('', 'operating_system', '$operating_system')," + ." ('', 'string_file_mode', '$file_mode')," + ." ('', 'string_dir_mode', '$dir_mode');"; + $database->query($settings_rows); + + + // Users table + $users = 'CREATE TABLE `'.TABLE_PREFIX.'users` ( `user_id` INT NOT NULL auto_increment,' + . ' `group_id` INT NOT NULL ,' + . ' `active` INT NOT NULL ,' + . ' `username` VARCHAR( 255 ) NOT NULL ,' + . ' `password` VARCHAR( 255 ) NOT NULL ,' + . ' `remember_key` VARCHAR( 255 ) NOT NULL ,' + . ' `last_reset` INT NOT NULL ,' + . ' `display_name` VARCHAR( 255 ) NOT NULL ,' + . ' `email` TEXT NOT NULL ,' + . ' `timezone` INT NOT NULL ,' + . ' `date_format` VARCHAR( 255 ) NOT NULL ,' + . ' `time_format` VARCHAR( 255 ) NOT NULL ,' + . ' `language` VARCHAR( 5 ) NOT NULL ,' + . ' `home_folder` TEXT NOT NULL ,' + . ' `login_when` INT NOT NULL ,' + . ' `login_ip` VARCHAR( 15 ) NOT NULL ,' + . ' PRIMARY KEY ( `user_id` ) )' + . ' '; + $database->query($users); + + // Groups table + $groups = 'CREATE TABLE `'.TABLE_PREFIX.'groups` ( `group_id` INT NOT NULL auto_increment,' + . ' `name` VARCHAR( 255 ) NOT NULL ,' + . ' `system_permissions` TEXT NOT NULL ,' + . ' `module_permissions` TEXT NOT NULL ,' + . ' `template_permissions` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `group_id` ) )' + . ' '; + $database->query($groups); + + // Search settings table + $search = 'CREATE TABLE `'.TABLE_PREFIX.'search` ( `search_id` INT NOT NULL auto_increment,' + . ' `name` VARCHAR( 255 ) NOT NULL ,' + . ' `value` TEXT NOT NULL ,' + . ' `extra` TEXT NOT NULL ,' + . ' PRIMARY KEY ( `search_id` ) )' + . ' '; + $database->query($search); + + // Addons table + $addons = 'CREATE TABLE `'.TABLE_PREFIX.'addons` ( ' + .'`addon_id` INT NOT NULL auto_increment ,' + .'`type` VARCHAR( 255 ) NOT NULL ,' + .'`directory` VARCHAR( 255 ) NOT NULL ,' + .'`name` VARCHAR( 255 ) NOT NULL ,' + .'`description` TEXT NOT NULL ,' + .'`function` VARCHAR( 255 ) NOT NULL ,' + .'`version` VARCHAR( 255 ) NOT NULL ,' + .'`platform` VARCHAR( 255 ) NOT NULL ,' + .'`author` VARCHAR( 255 ) NOT NULL ,' + .'`license` VARCHAR( 255 ) NOT NULL ,' + .' PRIMARY KEY ( `addon_id` ) ); '; + $database->query($addons); + + // Insert default data + + // Admin group + $full_system_permissions = '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'; + $insert_admin_group = "INSERT INTO `".TABLE_PREFIX."groups` VALUES ('1', 'Administrators', '$full_system_permissions', '', '')"; + $database->query($insert_admin_group); + // Admin user + $insert_admin_user = "INSERT INTO `".TABLE_PREFIX."users` (user_id,group_id,active,username,password,email,display_name) VALUES ('1','1','1','$admin_username','".md5($admin_password)."','$admin_email','Administrator')"; + $database->query($insert_admin_user); + + // Search header + $search_header = addslashes(' +

Search

+ +
+ + + + + + + + +
+ + + +
+ +[TEXT_ALL_WORDS] + +[TEXT_ANY_WORDS] + +[TEXT_EXACT_MATCH] +
+ +
+ +
+ '); + $insert_search_header = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'header', '$search_header', '')"; + $database->query($insert_search_header); + // Search footer + $search_footer = addslashes(''); + $insert_search_footer = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'footer', '$search_footer', '')"; + $database->query($insert_search_footer); + // Search results header + $search_results_header = addslashes(''. +'[TEXT_RESULTS_FOR] \'[SEARCH_STRING]\': +'); + $insert_search_results_header = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_header', '$search_results_header', '')"; + $database->query($insert_search_results_header); + // Search results loop + $search_results_loop = addslashes(''. +' + + + +'); + + $insert_search_results_loop = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_loop', '$search_results_loop', '')"; + $database->query($insert_search_results_loop); + // Search results footer + $search_results_footer = addslashes("
[TITLE][TEXT_LAST_UPDATED_BY] [DISPLAY_NAME] ([USERNAME]) [TEXT_ON] [DATE]
[DESCRIPTION]
"); + $insert_search_results_footer = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'results_footer', '$search_results_footer', '')"; + $database->query($insert_search_results_footer); + // Search no results + $search_no_results = addslashes('
No results found'); + $insert_search_no_results = "INSERT INTO `".TABLE_PREFIX."search` VALUES ('', 'no_results', '$search_no_results', '')"; + $database->query($insert_search_no_results); + // Search template + $database->query("INSERT INTO `".TABLE_PREFIX."search` (name) VALUES ('template')"); + + require_once(WB_PATH.'/framework/initialize.php'); + $admin = new admin('dummy'); + + // 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 + + } + // Load addons into DB + $dirs['modules'] = WB_PATH.'/modules/'; + $dirs['templates'] = WB_PATH.'/templates/'; + $dirs['languages'] = WB_PATH.'/languages/'; + 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); + } 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()); + } + +} + +// Log the user in and go to Website Baker Administration +$thisApp = new Login( + array( + "MAX_ATTEMPS" => "50", + "WARNING_URL" => ADMIN_URL."/login/warning.html", + "USERNAME_FIELDNAME" => 'admin_username', + "PASSWORD_FIELDNAME" => 'admin_password', + "REMEMBER_ME_OPTION" => SMART_LOGIN, + "MIN_USERNAME_LEN" => "2", + "MIN_PASSWORD_LEN" => "2", + "MAX_USERNAME_LEN" => "30", + "MAX_PASSWORD_LEN" => "30", + 'LOGIN_URL' => ADMIN_URL."/login/index.php", + 'DEFAULT_URL' => ADMIN_URL."/start/index.php", + 'TEMPLATE_DIR' => ADMIN_PATH."/login", + 'TEMPLATE_FILE' => "template.html", + 'FRONTEND' => false, + 'FORGOTTEN_DETAILS_APP' => ADMIN_URL."/login/forgot/index.php", + 'USERS_TABLE' => TABLE_PREFIX."users", + 'GROUPS_TABLE' => TABLE_PREFIX."groups", + ) + ); + +?>======= set_block('page', 'main_block', 'main'); // Insert values -require(WB_PATH.'/templates/'.$file.'/info.php'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'template' AND directory = '$file'"); +if($result->numRows() > 0) { + $row = $result->fetchRow(); +} + $template->set_var(array( - 'NAME' => $template_name, - 'AUTHOR' => $template_author, - 'DESCRIPTION' => $template_description, - 'VERSION' => $template_version, - 'DESIGNED_FOR' => $template_designed_for + 'NAME' => $row['name'], + 'AUTHOR' => $row['author'], + 'DESCRIPTION' => $row['description'], + 'VERSION' => $row['version'], + 'DESIGNED_FOR' => $row['platform'] ) ); Index: trunk/wb/admin/modules/details.php =================================================================== --- trunk/wb/admin/modules/details.php (revision 222) +++ trunk/wb/admin/modules/details.php (revision 223) @@ -1,6 +1,6 @@ set_block('page', 'main_block', 'main'); // Insert values -require(WB_PATH.'/modules/'.$file.'/info.php'); +$result = $database->query("SELECT * FROM ".TABLE_PREFIX."addons WHERE type = 'module' AND directory = '$file'"); +if($result->numRows() > 0) { + $module = $result->fetchRow(); +} + $template->set_var(array( - 'NAME' => $module_name, - 'AUTHOR' => $module_author, - 'DESCRIPTION' => $module_description, - 'VERSION' => $module_version, - 'DESIGNED_FOR' => $module_designed_for + 'NAME' => $module['name'], + 'AUTHOR' => $module['author'], + 'DESCRIPTION' => $module['description'], + 'VERSION' => $module['version'], + 'DESIGNED_FOR' => $module['platform'] ) ); -if(!isset($module_type)) { - $type_name = $TEXT['UNKNOWN']; -} elseif($module_type == 'page') { - $type_name = $TEXT['PAGE']; -} elseif($module_type == 'admin') { - $type_name = $TEXT['ADMIN']; -} elseif($module_type == 'administration') { - $type_name = $TEXT['ADMINISTRATION']; -} elseif($module_type == 'block') { - $type_name = $TEXT['BLOCK']; -} else { - $type_name = $TEXT['UNKNOWN']; + +switch ($module['function']) { + case NULL: + $type_name = $TEXT['UNKNOWN']; + break; + case 'page': + $type_name = $TEXT['PAGE']; + break; + case 'wysiwyg': + $type_name = $TEXT['WYSIWYG_EDITOR']; + break; + case 'tool': + $type_name = $TEXT['ADMINISTRATION_TOOL']; + break; + case 'admin': + $type_name = $TEXT['ADMIN']; + break; + case 'administration': + $type_name = $TEXT['ADMINISTRATION']; + break; + $type_name = $TEXT['unknown']; } $template->set_var('TYPE', $type_name);