Index: trunk/wb/install/save.php
===================================================================
--- trunk/wb/install/save.php	(revision 158)
+++ trunk/wb/install/save.php	(revision 159)
@@ -122,12 +122,7 @@
 // End check to see if form was even submitted
 
 // Begin path and timezone details code
-// Check if user has entered the installation path
-if(!isset($_POST['wb_path']) OR $_POST['wb_path'] == '') {
-	set_error('Please enter an absolute path');
-} else {
-	$wb_path = $_POST['wb_path'];
-}
+
 // Check if user has entered the installation url
 if(!isset($_POST['wb_url']) OR $_POST['wb_url'] == '') {
 	set_error('Please enter an absolute URL');
@@ -134,31 +129,19 @@
 } else {
 	$wb_url = $_POST['wb_url'];
 }
-// Remove any slashes at the end of the URL and path
+// 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_path, strlen($wb_path)-1, 1) == "/") {
-	$wb_path = substr($wb_path, 0, strlen($wb_path)-1);
-}
 if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") {
 	$wb_url = substr($wb_url, 0, strlen($wb_url)-1);
 }
-if(substr($wb_path, strlen($wb_path)-1, 1) == "\\") {
-	$wb_path = substr($wb_path, 0, strlen($wb_path)-1);
-}
 if(substr($wb_url, strlen($wb_url)-1, 1) == "/") {
 	$wb_url = substr($wb_url, 0, strlen($wb_url)-1);
 }
-if(substr($wb_path, strlen($wb_path)-1, 1) == "/") {
-	$wb_path = substr($wb_path, 0, strlen($wb_path)-1);
-}
 if(substr($wb_url, strlen($wb_url)-1, 1) == "\\") {
 	$wb_url = substr($wb_url, 0, strlen($wb_url)-1);
 }
-if(substr($wb_path, strlen($wb_path)-1, 1) == "\\") {
-	$wb_path = substr($wb_path, 0, strlen($wb_path)-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');
@@ -275,12 +258,13 @@
 "define('DB_NAME', '$database_name');\n".
 "define('TABLE_PREFIX', '$table_prefix');\n".
 "\n".
-"define('WB_PATH', '$wb_path');\n".
+"define('WB_PATH', dirname(__FILE__));\n".
 "define('WB_URL', '$wb_url');\n".
-"define('ADMIN_PATH', '$wb_path/admin');\n".
+"define('ADMIN_PATH', WB_PATH.'/admin');\n".
 "define('ADMIN_URL', '$wb_url/admin');\n".
 "\n".
 "require_once(WB_PATH.'/framework/initialize.php');\n".
+"\n".
 "?>";
 
 $config_filename = '../config.php';
@@ -300,7 +284,7 @@
 	set_error("The configuration file $config_filename is not writable. Change its permissions so it is, then re-run step 4.");
 }
 
-// Include configuration file
+// Define configuration vars
 define('DB_TYPE', 'mysql');
 define('DB_HOST', $database_host);
 define('DB_USERNAME', $database_username);
@@ -307,13 +291,11 @@
 define('DB_PASSWORD', $database_password);
 define('DB_NAME', $database_name);
 define('TABLE_PREFIX', $table_prefix);
-define('WB_PATH', $wb_path);
+define('WB_PATH', str_replace('/install','',dirname(__FILE__)));
 define('WB_URL', $wb_url);
-define('ADMIN_PATH', $wb_path.'/admin');
+define('ADMIN_PATH', WB_PATH.'/admin');
 define('ADMIN_URL', $wb_url.'/admin');
 
-//require('../config.php');
-
 // 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');
@@ -591,12 +573,16 @@
 	require_once(WB_PATH.'/framework/initialize.php');
 	$wb = new wb();
 	
-	// Include the pre-installed module install scripts
+	// Install add-ons
+	if(!file_exists(WB_PATH.'/install/addons')) {
 	require(WB_PATH.'/modules/wysiwyg/install.php');
 	require(WB_PATH.'/modules/code/install.php');
 	require(WB_PATH.'/modules/news/install.php');
 	require(WB_PATH.'/modules/form/install.php');
 	require(WB_PATH.'/modules/wrapper/install.php');
+	} else {
+		
+	}
 	
 	// Check if there was a database error
 	if($database->is_error()) {
Index: trunk/wb/install/index.php
===================================================================
--- trunk/wb/install/index.php	(revision 158)
+++ trunk/wb/install/index.php	(revision 159)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: index.php,v 1.10 2005/06/21 09:14:24 rdjurovich Exp $
+// $Id$
 
 /*
 
@@ -183,24 +183,6 @@
 		</tr>
 		<tr>
 			<td style="color: #666666;">
-				Absolute Path:
-			</td>
-			<td>
-				<?php
-				// Try to guess installation path
-				if(isset($_SERVER['SCRIPT_FILENAME']) AND $_SERVER['SCRIPT_FILENAME'] != "") { // This usually works on linux systems
-					$guessed_path = rtrim(dirname($_SERVER['SCRIPT_FILENAME']), 'install');
-				} elseif(isset($_SERVER['PATH_TRANSLATED']) AND $_SERVER['PATH_TRANSLATED'] != "") { // This usually works on windows systems
-					$guessed_path = rtrim(dirname($_SERVER['PATH_TRANSLATED']), 'install');
-				} else {
-					$guessed_path = "";
-				}
-				?>
-				<input type="text" tabindex="2" name="wb_path" style="width: 99%;" value="<?php if(isset($_SESSION['wb_path'])) { echo $_SESSION['wb_path']; } else { echo $guessed_path; } ?>" />
-			</td>
-		</tr>
-		<tr>
-			<td style="color: #666666;">
 				Default Timezone:
 			</td>
 			<td>