Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 94)
+++ trunk/wb/install/save.php	(revision 95)
@@ -268,62 +268,15 @@
 $config_content = "" .
 "<?php\n".
 "\n".
-"define('ER_LEVEL', '');\n".
-"\n".
-"define('DEFAULT_LANGUAGE', 'EN');\n".
-"\n".
-"define('APP_NAME', 'wb');\n".
-"\n".
 "define('DB_TYPE', 'mysql');\n".
 "define('DB_HOST', '$database_host');\n".
 "define('DB_USERNAME', '$database_username');\n".
 "define('DB_PASSWORD', '$database_password');\n".
 "define('DB_NAME', '$database_name');\n".
-"\n".
 "define('TABLE_PREFIX', '$table_prefix');\n".
 "\n".
-"define('DEFAULT_TIMEZONE', '$default_timezone');\n".
-"define('DEFAULT_DATE_FORMAT', 'M d Y');\n".
-"define('DEFAULT_TIME_FORMAT', 'g:i A');\n".
-"\n".
-"define('HOME_FOLDERS', true);\n".
-"\n".
-"define('DEFAULT_TEMPLATE', 'round');\n".
-"define('MULTIPLE_MENUS', false);\n".
-"\n".
-"define('PAGE_LEVEL_LIMIT', '4');\n".
-"define('INTRO_PAGE', false);\n".
-"define('PAGE_TRASH', 'disabled');\n".
-"define('HOMEPAGE_REDIRECTION', false);\n".
-"define('PAGE_LANGUAGES', false);\n".
-"define('WYSIWYG_EDITOR', 'htmlarea');\n".
-"\n".
-"define('MANAGE_SECTIONS', true);\n".
-"define('SECTION_BLOCKS', false);\n".
-"\n".
-"define('SMART_LOGIN', false);\n".
-"define('FRONTEND_LOGIN', false);\n".
-"define('FRONTEND_SIGNUP', '');\n".
-"\n".
-"define('SERVER_EMAIL', '".$admin_email."');\n".
-"\n".
-"define('SEARCH', 'public');\n".
-"\n".
-"define('PAGE_EXTENSION', '.php');\n".
-"define('PAGE_SPACER', '-');\n".
-"\n".
-"define('PAGES_DIRECTORY', '/pages');\n".
-"define('MEDIA_DIRECTORY', '/media');\n".
-"\n".
-"define('OPERATING_SYSTEM', '$operating_system');\n".
-"define('OCTAL_FILE_MODE', $file_mode);\n".
-"define('STRING_FILE_MODE', '$file_mode');\n".
-"define('OCTAL_DIR_MODE', $dir_mode);\n".
-"define('STRING_DIR_MODE', '$dir_mode');\n".
-"\n".
 "define('WB_PATH', '$wb_path');\n".
 "define('WB_URL', '$wb_url');\n".
-"\n".
 "define('ADMIN_PATH', '$wb_path/admin');\n".
 "define('ADMIN_URL', '$wb_url/admin');\n".
 "\n".
@@ -354,9 +307,6 @@
 	set_error('It appears the Absolute path that you entered is incorrect');
 }
 
-// Include WB functions file
-require_once(WB_PATH.'/framework/functions.php');
-
 // 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:<br />'.mysql_error());
@@ -368,9 +318,12 @@
 // 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.admin.php');
-$database = new database();
+require_once(WB_PATH.'/framework/class.login.php');
+$database=new database();
 
 // Check if we should install tables
 if($install_tables == true) {
@@ -396,6 +349,8 @@
 	$search = "DROP TABLE IF EXISTS `".TABLE_PREFIX."search`";
 	$database->query($search);
 			
+
+
 	// Try installing tables
 	
 	// Pages table
@@ -437,13 +392,52 @@
 	$database->query($pages);
 	
 	// 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` ) )'
-	          . ' ';
+	$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 ('', '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', '0'),"
+	." ('', 'default_date_format', 'M d Y'),"
+	." ('', 'default_time_format', 'g:i A'),"
+	." ('', 'home_folders', '1'),"
+	." ('', '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', '1'),"
+	." ('', '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'),"
+	." ('', 'octal_file_mode', '$file_mode'),"
+	." ('', 'string_file_mode', '$file_mode'),"
+	." ('', 'octal_dir_mode', '$dir_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 ,'
@@ -493,21 +487,6 @@
 	// 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);
-	// Default settings
-	$insert_website_title = "INSERT INTO `".TABLE_PREFIX."settings` VALUES ('', 'title', '".$website_title."')";
-	$database->query($insert_website_title);
-	$insert_website_description = "INSERT INTO `".TABLE_PREFIX."settings` VALUES ('', 'description', '')";
-	$database->query($insert_website_description);
-	$insert_website_keywords = "INSERT INTO `".TABLE_PREFIX."settings` VALUES ('', 'keywords', '')";
-	$database->query($insert_website_keywords);
-	$insert_website_header = "INSERT INTO `".TABLE_PREFIX."settings` VALUES ('', 'header', '')";
-	$database->query($insert_website_header);
-	$insert_website_footer = "INSERT INTO `".TABLE_PREFIX."settings` VALUES ('', 'footer', '')";
-	$database->query($insert_website_footer);
-	$insert_wysiwyg_style = "INSERT INTO `".TABLE_PREFIX."settings` VALUES ('', 'wysiwyg_style', 'font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px;')";
-	$database->query($insert_wysiwyg_style);
-	$insert_rename_files_on_upload = "INSERT INTO `".TABLE_PREFIX."settings` VALUES ('', 'rename_files_on_upload', 'php,asp,phpx,aspx')";
-	$database->query($insert_rename_files_on_upload);
 	
 	// Search header
 	$search_header = addslashes('
@@ -571,6 +550,8 @@
 	// Search template
 	$database->query("INSERT INTO `".TABLE_PREFIX."search` (name) VALUES ('template')");
 	
+	$wb=new wb();
+	
 	// Include the pre-installed module install scripts
 	require(WB_PATH.'/modules/wysiwyg/install.php');
 	require(WB_PATH.'/modules/code/install.php');
@@ -586,7 +567,6 @@
 }
 
 // Log the user in and go to Website Baker Administration
-require(WB_PATH.'/framework/class.login.php');
 $thisApp = new Login(
 							array(
 									"MAX_ATTEMPS" => "50",
Index: trunk/wb/admin/index.php
===================================================================
--- trunk/wb/admin/index.php	(revision 94)
+++ trunk/wb/admin/index.php	(revision 95)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: index.php,v 1.2 2005/03/28 11:58:03 rdjurovich Exp $
+// $Id$
 
 /*
 
Index: trunk/wb/admin/interface/timezones.php
===================================================================
--- trunk/wb/admin/interface/timezones.php	(revision 94)
+++ trunk/wb/admin/interface/timezones.php	(revision 95)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: timezones.php,v 1.1.1.1 2005/01/30 10:30:19 rdjurovich Exp $
+// $Id$
 
 /*
 
@@ -31,11 +31,6 @@
 
 */
 
-// Define that this file is loaded
-if(!defined('TIMEZONES_LOADED')) {
-	define('TIMEZONES_LOADED', true);
-}
-
 // Create array
 $TIMEZONES = array();
 
Index: trunk/wb/admin/settings/save.php
===================================================================
--- trunk/wb/admin/settings/save.php	(revision 94)
+++ trunk/wb/admin/settings/save.php	(revision 95)
@@ -168,65 +168,15 @@
 	$config_filename = $WB_PATH.'/config.php';
 	$config_content = "" .
 	"<?php \n".
-	"\n".
-	"define('ER_LEVEL', '$er_level');\n".
-	$er_level_code.
-	"\n".
-	"define('DEFAULT_LANGUAGE', '".str_replace(';', '', $_POST['language'])."');\n".
-	"\n".
-	"define('APP_NAME', 'wb');\n".
-	"\n".
 	"define('DB_TYPE', '".DB_TYPE."');\n".
 	"define('DB_HOST', '".DB_HOST."');\n".
 	"define('DB_USERNAME', '".DB_USERNAME."');\n".
 	"define('DB_PASSWORD', '".DB_PASSWORD."');\n".
 	"define('DB_NAME', '".DB_NAME."');\n".
-	"\n".
 	"define('TABLE_PREFIX', '".TABLE_PREFIX."');\n".
 	"\n".
-	"define('DEFAULT_TIMEZONE', '".$timezone_offset."');\n".
-	"define('DEFAULT_DATE_FORMAT', '".str_replace(';', '', $_POST['date_format'])."');\n".
-	"define('DEFAULT_TIME_FORMAT', '".str_replace(';', '', $_POST['time_format'])."');\n".
-	"\n".
-	"define('HOME_FOLDERS', ".$_POST['home_folders'].");\n".
-	"\n".
-	"define('DEFAULT_TEMPLATE', '".$_POST['template']."');\n".
-	"define('MULTIPLE_MENUS', ".str_replace(';', '', $_POST['multiple_menus']).");\n".
-	"\n".
-	"define('INTRO_PAGE', ".str_replace(';', '', $_POST['intro_page']).");\n".
-	"define('PAGE_TRASH', '".str_replace(';', '', $_POST['page_trash'])."');\n".
-	"define('PAGE_LEVEL_LIMIT', '".str_replace(';', '', $_POST['page_level_limit'])."');\n".
-	"define('HOMEPAGE_REDIRECTION', ".str_replace(';', '', $_POST['homepage_redirection']).");\n".
-	"define('PAGE_LANGUAGES', ".str_replace(';', '', $_POST['page_languages']).");\n".
-	"\n".
-	"define('WYSIWYG_EDITOR', '".addslashes($_POST['wysiwyg_editor'])."');\n".
-	"\n".
-	"define('MANAGE_SECTIONS', ".str_replace(';', '', $_POST['manage_sections']).");\n".
-	"define('SECTION_BLOCKS', ".str_replace(';', '', $_POST['section_blocks']).");\n".
-	"\n".
-	"define('SMART_LOGIN', ".str_replace(';', '', $_POST['smart_login']).");\n".
-	"define('FRONTEND_LOGIN', ".str_replace(';', '', $_POST['frontend_login']).");\n".
-	"define('FRONTEND_SIGNUP', ".str_replace(';', '', $_POST['frontend_signup']).");\n".
-	"\n".
-	"define('SERVER_EMAIL', '".$_POST['server_email']."');\n".
-	"\n".
-	"define('SEARCH', '".$admin->get_post('search')."');\n".
-	"\n".
-	"define('PAGE_EXTENSION', '".str_replace(';', '', $_POST['page_extension'])."');\n".
-	"define('PAGE_SPACER', '".str_replace(';', '', $_POST['page_spacer'])."');\n".
-	"\n".
-	"define('PAGES_DIRECTORY', '".PAGES_DIRECTORY."');\n".
-	"define('MEDIA_DIRECTORY', '".MEDIA_DIRECTORY."');\n".
-	"\n".
-	"define('OPERATING_SYSTEM', '".str_replace(';', '', $_POST['operating_system'])."');\n".
-	"define('OCTAL_FILE_MODE', ".$file_mode.");\n".
-	"define('STRING_FILE_MODE', '".$file_mode."');\n".
-	"define('OCTAL_DIR_MODE', ".$dir_mode.");\n".
-	"define('STRING_DIR_MODE', '".$dir_mode."');\n".
-	"\n".
 	"define('WB_PATH', '".$WB_PATH."');\n".
 	"define('WB_URL', '".WB_URL."');\n".
-	"\n".
 	"define('ADMIN_PATH', '".$ADMIN_PATH."');\n".
 	"define('ADMIN_URL', '".ADMIN_URL."');\n".
 	"\n".
Index: trunk/wb/admin/settings/index.php
===================================================================
--- trunk/wb/admin/settings/index.php	(revision 94)
+++ trunk/wb/admin/settings/index.php	(revision 95)
@@ -44,40 +44,13 @@
 $results = $database->query($query);
 while($setting = $results->fetchRow()) {
 	$setting_name = $setting['name'];
-	$setting_value = htmlspecialchars($admin->strip_slashes_dummy($setting['value']));
-	switch($setting_name) {
-		// Website title
-		case 'title':
-			$template->set_var('TITLE', $setting_value);
-		break;
-		// Website description
-		case 'description':
-			$template->set_var('DESCRIPTION', $setting_value);
-		break;
-		// Website keywords
-		case 'keywords':
-			$template->set_var('KEYWORDS', $setting_value);
-		break;
-		// Website header
-		case 'header':
-			$template->set_var('HEADER', $setting_value);
-		break;
-		// Website header
-		case 'header':
-			$template->set_var('HEADER', $setting_value);
-		break;
-		// Website footer
-		case 'footer':
-			$template->set_var('FOOTER', $setting_value);
-		break;
-		// WYSIWYG style
-		case 'wysiwyg_style':
-			$template->set_var('WYSIWYG_STYLE', $setting_value);
-		break;
-		case 'rename_files_on_upload':
-			$template->set_var('RENAME_FILES_ON_UPLOAD', $setting_value);
-		break;
-	}
+	$setting_value = htmlspecialchars($setting['value']);
+	/*if ($setting_value=='false')
+		$setting_value=false;
+	if ($setting_value=='true')
+		$setting_value=true;*/
+	echo strtoupper($setting_name).'-'.$setting_value.'-'.($setting_value=="false").'<br />';
+	$template->set_var(strtoupper($setting_name),$setting_value);
 }
 
 // Query current settings in the db, then loop through them and print them
Index: trunk/wb/admin/settings/template.html
===================================================================
--- trunk/wb/admin/settings/template.html	(revision 94)
+++ trunk/wb/admin/settings/template.html	(revision 95)
@@ -87,7 +87,7 @@
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_TITLE}:</td>
 	<td class="setting_value" colspan="2">
-		<input type="text" name="title" value="{TITLE}" />
+		<input type="text" name="website_title" value="{WEBSITE_TITLE}" />
 	</td>
 	<script language="javascript" type="text/javascript">
 	document.settings.title.focus();
@@ -96,25 +96,25 @@
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_DESCRIPTION}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="description">{DESCRIPTION}</textarea>
+		<textarea name="website_description">{WEBSITE_DESCRIPTION}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_KEYWORDS}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="keywords">{KEYWORDS}</textarea>
+		<textarea name="website_keywords">{WEBSITE_KEYWORDS}</textarea>
 	</td>
 </tr>
 <tr class="advanced">
 	<td class="setting_name">{TEXT_WEBSITE_HEADER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="header">{HEADER}</textarea>
+		<textarea name="website_header">{WEBSITE_HEADER}</textarea>
 	</td>
 </tr>
 <tr>
 	<td class="setting_name">{TEXT_WEBSITE_FOOTER}:</td>
 	<td class="setting_value" colspan="2">
-		<textarea name="footer">{FOOTER}</textarea>
+		<textarea name="website_footer">{WEBSITE_FOOTER}</textarea>
 	</td>
 </tr>
 <tr>
@@ -281,7 +281,7 @@
 <tr>
 	<td class="setting_name">{TEXT_LANGUAGE}:</td>
 	<td class="setting_value" colspan="2">
-		<select name="language">
+		<select name="default_language">
 			<!-- BEGIN language_list_block -->
 			<option value="{CODE}"{SELECTED}>{NAME} ({CODE})</option>
 			<!-- END language_list_block -->
@@ -291,7 +291,7 @@
 <tr>
 	<td class="setting_name">{TEXT_TIMEZONE}:</td>
 	<td class="setting_value" colspan="2">
-		<select name="timezone">
+		<select name="default_timezone">
 			<option value="0">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN timezone_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
@@ -302,7 +302,7 @@
 <tr>
 	<td class="setting_name">{TEXT_DATE_FORMAT}:</td>
 	<td class="setting_value" colspan="2">
-		<select name="date_format">
+		<select name="default_date_format">
 			<option value="M d Y">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN date_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
@@ -313,7 +313,7 @@
 <tr>
 	<td class="setting_name">{TEXT_TIME_FORMAT}:</td>
 	<td class="setting_value" colspan="2">
-		<select name="time_format">
+		<select name="default_time_format">
 			<option value="g:i A">{TEXT_PLEASE_SELECT}...</option>
 			<!-- BEGIN time_format_list_block -->
 				<option value="{VALUE}" {SELECTED}>{NAME}</option>
@@ -324,7 +324,7 @@
 <tr>
 	<td class="setting_name">{TEXT_TEMPLATE}:</td>
 	<td class="setting_value" colspan="2">
-		<select name="template">
+		<select name="default_template">
 		<!-- BEGIN template_list_block -->
 			<option value="{FILE}"{SELECTED}>{NAME}</option>
 		<!-- END template_list_block -->
Index: trunk/wb/framework/class.admin.php
===================================================================
--- trunk/wb/framework/class.admin.php	(revision 94)
+++ trunk/wb/framework/class.admin.php	(revision 95)
@@ -84,7 +84,7 @@
 		global $MESSAGE;
 		global $TEXT;
 		// Connect to database and get website title
-		$database = & $this->database;
+		global $database;
 		$get_title = $database->query("SELECT value FROM ".TABLE_PREFIX."settings WHERE name = 'title'");
 		$title = $get_title->fetchRow();
 		$header_template = new Template(ADMIN_PATH."/interface");
Index: trunk/wb/framework/class.wb.php
===================================================================
--- trunk/wb/framework/class.wb.php	(revision 94)
+++ trunk/wb/framework/class.wb.php	(revision 95)
@@ -31,11 +31,11 @@
 
 */
 if (file_exists(WB_PATH.'/framework/class.database.php'))
-require_once(WB_PATH.'/framework/class.database.php');
+	require_once(WB_PATH.'/framework/class.database.php');
 		
 
 class wb
-{	
+{
 	// General initialization function 
 	// performed when frontend or backend is loaded.
 	function wb() {
@@ -42,8 +42,8 @@
 		// set global database variable
 		global $database;
 		// Create database class
-		$database = new database();
-		$this->database = $database;
+		$this->database = new database();
+		$database=$this->database;
 
 		// Start a session
 		if(!defined('SESSION_STARTED')) {
@@ -51,7 +51,26 @@
 			session_start();
 			define('SESSION_STARTED', true);
 		}
+
+		set_magic_quotes_runtime(0);
 		
+		// Get website settings (title, keywords, description, header, and footer)
+		$query_settings = "SELECT name,value FROM ".TABLE_PREFIX."settings";
+		$get_settings = $database->query($query_settings);
+		while($setting = $get_settings->fetchRow()) {
+			$setting_name=strtoupper($setting['name']);
+			$setting_value=$setting['value'];
+			if ($setting_value=='false')
+				$setting_value=false;
+			if ($setting_value=='true')
+				$setting_value=true;
+			define($setting_name,$setting_value);
+		}
+		$string_file_mode = STRING_FILE_MODE;
+		define('OCTAL_FILE_MODE',(int) $string_file_mode);
+		$string_dir_mode = STRING_DIR_MODE;
+		define('OCTAL_DIR_MODE',(int) $string_dir_mode);
+		
 		// Get users language
 		if(isset($_GET['lang']) AND $_GET['lang'] != '' AND !is_numeric($_GET['lang']) AND strlen($_GET['lang']) == 2) {
 		  	define('LANGUAGE', strtoupper($_GET['lang']));
@@ -77,31 +96,23 @@
 		}
 		
 		// Get users timezone
-		if(!defined('TIMEZONE')) {
-			if(isset($_SESSION['TIMEZONE'])) {
-				define('TIMEZONE', $_SESSION['TIMEZONE']);
-			} else {
-				define('TIMEZONE', DEFAULT_TIMEZONE);
-			}
+		if(isset($_SESSION['TIMEZONE'])) {
+			define('TIMEZONE', $_SESSION['TIMEZONE']);
+		} else {
+			define('TIMEZONE', DEFAULT_TIMEZONE);
 		}
 		// Get users date format
-		if(!defined('DATE_FORMAT')) {
-			if(isset($_SESSION['DATE_FORMAT'])) {
-				define('DATE_FORMAT', $_SESSION['DATE_FORMAT']);
-			} else {
-				define('DATE_FORMAT', DEFAULT_DATE_FORMAT);
-			}
+		if(isset($_SESSION['DATE_FORMAT'])) {
+			define('DATE_FORMAT', $_SESSION['DATE_FORMAT']);
+		} else {
+			define('DATE_FORMAT', DEFAULT_DATE_FORMAT);
 		}
 		// Get users time format
-		if(!defined('TIME_FORMAT')) {
-			if(isset($_SESSION['TIME_FORMAT'])) {
-				define('TIME_FORMAT', $_SESSION['TIME_FORMAT']);
-			} else {
-				define('TIME_FORMAT', DEFAULT_TIME_FORMAT);
-			}
+		if(isset($_SESSION['TIME_FORMAT'])) {
+			define('TIME_FORMAT', $_SESSION['TIME_FORMAT']);
+		} else {
+			define('TIME_FORMAT', DEFAULT_TIME_FORMAT);
 		}
-		
-		set_magic_quotes_runtime(0);
 	}
 
 	// Check whether we should show a page or not (for front-end)
Index: trunk/wb/framework/class.frontend.php
===================================================================
--- trunk/wb/framework/class.frontend.php	(revision 94)
+++ trunk/wb/framework/class.frontend.php	(revision 95)
@@ -47,7 +47,7 @@
 	// page database row
 	var $page;
 	var $page_id,$page_title,$menu_title,$parent,$root_parent,$level,$visibility;
-	var $page_description,$page_keywords,$page_link_original,$page_link;
+	var $page_description,$page_keywords,$page_link;
 	var $page_trail=array();
 	
 	var $page_access_denied;
@@ -64,7 +64,7 @@
 	
 	function page_select() {
 		global $page_id,$no_intro;
-		$database=& $this->database;
+		global $database;
 		// We have no page id and are supposed to show the intro page
 		if((INTRO_PAGE AND !isset($no_intro)) AND (!isset($page_id) OR !is_numeric($page_id))) {
 			// Since we have no page id check if we should go to intro page or default page
@@ -121,7 +121,7 @@
 	}
 
 	function get_page_details() {
-		$database = & $this->database;
+		global $database;
 	    if($this->page_id != 0) {
 			// Query page details
 			$query_page = "SELECT * FROM ".TABLE_PREFIX."pages WHERE page_id = '{$this->page_id}'";
@@ -142,7 +142,6 @@
 			// Begin code to set details as either variables of constants
 			// Page ID
 			define('PAGE_ID', $this->page['page_id']);
-			$this->page_id=$this->page['page_id'];
 			// Page Title
 			define('PAGE_TITLE', $this->strip_slashes_dummy($this->page['page_title']));
 			$this->page_title=PAGE_TITLE;
@@ -180,30 +179,6 @@
 		// End code to set details as either variables of constants
 		}
 
-		// Work-out if any possible in-line search boxes should be shown
-		if(SEARCH == 'public') {
-			define('SHOW_SEARCH', true);
-		} elseif(SEARCH == 'private' AND VISIBILITY == 'private') {
-			define('SHOW_SEARCH', true);
-		} elseif(SEARCH == 'private' AND $wb->is_authenticated() == true) {
-			define('SHOW_SEARCH', true);
-		} else {
-			define('SHOW_SEARCH', false);
-		}
-		// Work-out if menu should be shown
-		if(!defined('SHOW_MENU')) {
-			define('SHOW_MENU', true);
-		}
-		// Work-out if login menu constants should be set
-		if(FRONTEND_LOGIN) {
-			// Set login menu constants
-			define('LOGIN_URL', WB_URL.'/account/login'.PAGE_EXTENSION);
-			define('LOGOUT_URL', WB_URL.'/account/logout'.PAGE_EXTENSION);
-			define('FORGOT_URL', WB_URL.'/account/forgot'.PAGE_EXTENSION);
-			define('PREFERENCES_URL', WB_URL.'/account/preferences'.PAGE_EXTENSION);
-			define('SIGNUP_URL', WB_URL.'/account/signup'.PAGE_EXTENSION);
-		}
-
 		// Figure out what template to use
 		if(!defined('TEMPLATE')) {
 			if(isset($this->page['template']) AND $this->page['template'] != '') {
@@ -219,7 +194,7 @@
 		// Set the template dir
 		define('TEMPLATE_DIR', WB_URL.'/templates/'.TEMPLATE);
 
-		// Check if user is allow to view this page
+		// Check if user is allowed to view this page
 		if(VISIBILITY == 'private' OR VISIBILITY == 'registered') {
 			// Check if the user is authenticated
 			if($this->is_authenticated() == false) {
@@ -234,6 +209,12 @@
 			// User isnt allowed on this page so tell them
 			$this->page_access_denied=true;
 		}
+	}
+
+	function get_website_settings() {
+		global $database;
+
+		// set visibility SQL code
 		// never show no-vis, hidden or deleted pages
 		$this->extra_where_sql = "visibility != 'none' AND visibility != 'hidden' AND visibility != 'deleted'";
 		// Set extra private sql code
@@ -246,45 +227,30 @@
 			}
 		}
 		$this->extra_where_sql .= $this->sql_where_language;
-	}
 
-	function get_website_settings() {
-		$database = & $this->database;
-		// Get website settings (title, keywords, description, header, and footer)
-		$query_settings = "SELECT name,value FROM ".TABLE_PREFIX."settings";
-		$get_settings = $database->query($query_settings);
-		while($setting = $get_settings->fetchRow()) {
-			switch($setting['name']) {
-				case 'title':
-					define('WEBSITE_TITLE', $this->strip_slashes_dummy($setting['value']));
-					$this->website_title=WEBSITE_TITLE;
-				break;
-				case 'description':
-					if($page_description != '') {
-						define('WEBSITE_DESCRIPTION', $page_description);
-					} else {
-						define('WEBSITE_DESCRIPTION', $this->strip_slashes_dummy($setting['value']));
-					}
-					$this->website_description=WEBSITE_DESCRIPTION;
-				break;
-				case 'keywords':
-					if($page_keywords != '') {
-						define('WEBSITE_KEYWORDS', $this->strip_slashes_dummy($setting['value']).' '.$page_keywords);
-					} else {
-						define('WEBSITE_KEYWORDS', $this->strip_slashes_dummy($setting['value']));
-					}
-					$this->website_keywords=WEBSITE_KEYWORDS;
-				break;
-				case 'header':
-					define('WEBSITE_HEADER', $this->strip_slashes_dummy($setting['value']));
-					$this->website_header=WEBSITE_HEADER;
-				break;
-				case 'footer':
-					define('WEBSITE_FOOTER', $this->strip_slashes_dummy($setting['value']));
-					$this->website_footer=WEBSITE_FOOTER;
-				break;
-			}
+		// Work-out if any possible in-line search boxes should be shown
+		if(SEARCH == 'public') {
+			define('SHOW_SEARCH', true);
+		} elseif(SEARCH == 'private' AND VISIBILITY == 'private') {
+			define('SHOW_SEARCH', true);
+		} elseif(SEARCH == 'private' AND $wb->is_authenticated() == true) {
+			define('SHOW_SEARCH', true);
+		} else {
+			define('SHOW_SEARCH', false);
 		}
+		// Work-out if menu should be shown
+		if(!defined('SHOW_MENU')) {
+			define('SHOW_MENU', true);
+		}
+		// Work-out if login menu constants should be set
+		if(FRONTEND_LOGIN) {
+			// Set login menu constants
+			define('LOGIN_URL', WB_URL.'/account/login'.PAGE_EXTENSION);
+			define('LOGOUT_URL', WB_URL.'/account/logout'.PAGE_EXTENSION);
+			define('FORGOT_URL', WB_URL.'/account/forgot'.PAGE_EXTENSION);
+			define('PREFERENCES_URL', WB_URL.'/account/preferences'.PAGE_EXTENSION);
+			define('SIGNUP_URL', WB_URL.'/account/signup'.PAGE_EXTENSION);
+		}
 	}
 	
 	function page_link($link){
@@ -297,7 +263,7 @@
 	}
 	
 	function preprocess(&$content) {
-		$database = & $this->database;
+		global $database;
 		// Replace [wblink--PAGE_ID--] with real link
 		$pattern = '/\[wblink(.+?)\]/s';
 		preg_match_all($pattern,$content,$ids);
@@ -360,7 +326,7 @@
 	}
 	
 	function show_menu() {
-	   $database = & $this->database;
+	   global $database;
 	   if ($this->menu_recurse==0)
 	       return;
 	   // Check if we should add menu number check to query
@@ -414,7 +380,7 @@
 		// Get outside objects
 		global $TEXT,$MENU,$HEADING,$MESSAGE;
 		global $globals;
-		$database = & $this->database;
+		global $database;
 		$admin = & $this;
 		if ($this->page_access_denied==true) {
             echo $MESSAGE['FRONTEND']['SORRY_NO_VIEWING_PERMISSIONS'];
Index: trunk/wb/framework/class.database.php
===================================================================
--- trunk/wb/framework/class.database.php	(revision 94)
+++ trunk/wb/framework/class.database.php	(revision 95)
@@ -74,7 +74,7 @@
 	
 	// Disconnect from the database
 	function disconnect() {
-		if(isset($this->Database)) {
+		if($this->connected==true) {
 			mysql_close();
 			return true;
 		} else {