Index: trunk/wb/account/password.php
===================================================================
--- trunk/wb/account/password.php	(revision 274)
+++ trunk/wb/account/password.php	(revision 275)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: password.php,v 1.2 2005/03/28 11:58:03 rdjurovich Exp $
+// $Id$
 
 /*
 
@@ -37,18 +37,18 @@
 
 // Get existing password
 $database = new database();
-$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($current_password)."'";
+$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$wb->get_user_id()."' AND password = '".md5($current_password)."'";
 $results = $database->query($query);
 
 // Validate values
 if($results->numRows() == 0) {
-	$admin->print_error($MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT'], $js_back);
+	$wb->print_error($MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT'], $js_back, false);
 }
 if(strlen($new_password) < 3) {
-	$admin->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back);
+	$wb->print_error($MESSAGE['USERS']['PASSWORD_TOO_SHORT'], $js_back, false);
 }
 if($new_password != $new_password2) {
-	$admin->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back);
+	$wb->print_error($MESSAGE['USERS']['PASSWORD_MISMATCH'], $js_back, false);
 }
 
 // MD5 the password
@@ -56,12 +56,12 @@
 
 // Update the database
 $database = new database();
-$query = "UPDATE ".TABLE_PREFIX."users SET password = '$md5_password' WHERE user_id = '".$admin->get_user_id()."'";
+$query = "UPDATE ".TABLE_PREFIX."users SET password = '$md5_password' WHERE user_id = '".$wb->get_user_id()."'";
 $database->query($query);
 if($database->is_error()) {
-	$admin->print_error($database->get_error);
+	$wb->print_error($database->get_error, 'index.php', false);
 } else {
-	$admin->print_success($MESSAGE['PREFERENCES']['PASSWORD_CHANGED'], WB_URL.'/account/preferences'.PAGE_EXTENSION);
+	$wb->print_success($MESSAGE['PREFERENCES']['PASSWORD_CHANGED'], WB_URL.'/account/preferences'.PAGE_EXTENSION);
 }
 
 
Index: trunk/wb/account/preferences_form.php
===================================================================
--- trunk/wb/account/preferences_form.php	(revision 274)
+++ trunk/wb/account/preferences_form.php	(revision 275)
@@ -35,10 +35,9 @@
 <input type="hidden" name="user_id" value="{USER_ID}" />
 
 <table cellpadding="5" cellspacing="0" border="0" width="97%">
-<tr>
 	<td width="140"><?php echo $TEXT['DISPLAY_NAME']; ?>:</td>
 	<td class="value_input">
-		<input type="text" name="display_name" style="width: 380px;" maxlength="255" value="<?php echo $admin->get_display_name(); ?>" />
+		<input type="text" name="display_name" style="width: 380px;" maxlength="255" value="<?php echo $wb->get_display_name(); ?>" />
 	</td>
 </tr>
 <tr>
@@ -80,7 +79,7 @@
 			// Insert default timezone values
 			require_once(ADMIN_PATH.'/interface/timezones.php');
 			foreach($TIMEZONES AS $hour_offset => $title) {
-				if($admin->get_timezone() == $hour_offset*60*60) {
+				if($wb->get_timezone() == $hour_offset*60*60) {
 					?>
 					<option value="<?php echo $hour_offset; ?>" selected><?php echo $title; ?></option>
 					<?php
@@ -179,7 +178,7 @@
 <tr>
 	<td><?php echo $TEXT['EMAIL']; ?>:</td>
 	<td class="value_input">
-		<input type="text" name="email" style="width: 380px;" maxlength="255" value="<?php echo $admin->get_email(); ?>" />
+		<input type="text" name="email" style="width: 380px;" maxlength="255" value="<?php echo $wb->get_email(); ?>" />
 	</td>
 </tr>
 <tr>
Index: trunk/wb/account/details.php
===================================================================
--- trunk/wb/account/details.php	(revision 274)
+++ trunk/wb/account/details.php	(revision 275)
@@ -28,11 +28,11 @@
 }
 
 // Get entered values
-$display_name = $admin->get_post('display_name');
-$language = $admin->get_post('language');
-$timezone = $admin->get_post('timezone')*60*60;
-$date_format = $admin->get_post('date_format');
-$time_format = $admin->get_post('time_format');
+$display_name = $wb->get_post('display_name');
+$language = $wb->get_post('language');
+$timezone = $wb->get_post('timezone')*60*60;
+$date_format = $wb->get_post('date_format');
+$time_format = $wb->get_post('time_format');
 
 // Create a javascript back link
 $js_back = "javascript: history.go(-1);";
@@ -39,12 +39,12 @@
 
 // Update the database
 $database = new database();
-$query = "UPDATE ".TABLE_PREFIX."users SET display_name = '$display_name', language = '$language', timezone = '$timezone', date_format = '$date_format', time_format = '$time_format' WHERE user_id = '".$admin->get_user_id()."'";
+$query = "UPDATE ".TABLE_PREFIX."users SET display_name = '$display_name', language = '$language', timezone = '$timezone', date_format = '$date_format', time_format = '$time_format' WHERE user_id = '".$wb->get_user_id()."'";
 $database->query($query);
 if($database->is_error()) {
-	$admin->print_error($database->get_error);
+	$wb->print_error($database->get_error,'index.php',false);
 } else {
-	$admin->print_success($MESSAGE['PREFERENCES']['DETAILS_SAVED'], WB_URL.'/account/preferences'.PAGE_EXTENSION);
+	$wb->print_success($MESSAGE['PREFERENCES']['DETAILS_SAVED'], WB_URL.'/account/preferences'.PAGE_EXTENSION);
 	$_SESSION['DISPLAY_NAME'] = $display_name;
 	$_SESSION['LANGUAGE'] = $language;
 	$_SESSION['TIMEZONE'] = $timezone;
Index: trunk/wb/account/email.php
===================================================================
--- trunk/wb/account/email.php	(revision 274)
+++ trunk/wb/account/email.php	(revision 275)
@@ -1,6 +1,6 @@
 <?php
 
-// $Id: email.php,v 1.2 2005/03/28 11:58:03 rdjurovich Exp $
+// $Id$
 
 /*
 
@@ -28,8 +28,8 @@
 }
 
 // Get the values entered
-$current_password = $admin->get_post('current_password');
-$email = $admin->get_post('email');
+$current_password = $wb->get_post('current_password');
+$email = $wb->get_post('email');
 
 // Create a javascript back link
 $js_back = "javascript: history.go(-1);";
@@ -36,26 +36,26 @@
 
 // Get existing password
 $database = new database();
-$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($current_password)."'";
+$query = "SELECT user_id FROM ".TABLE_PREFIX."users WHERE user_id = '".$wb->get_user_id()."' AND password = '".md5($current_password)."'";
 $results = $database->query($query);
 
 // Validate values
 if($results->numRows() == 0) {
-	$admin->print_error($MESSAGE['PREFERENCES']['OLD_PASSWORD_INCORRECT'], $js_back);
+	$wb->print_error($MESSAGE['PREFERENCES']['OLD_PASSWORD_INCORRECT'], $js_back, false);
 }
 // Validate values
-if(!$admin->validate_email($email)) {
-	$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back);
+if(!$wb->validate_email($email)) {
+	$wb->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back, false);
 }
 
 // Update the database
 $database = new database();
-$query = "UPDATE ".TABLE_PREFIX."users SET email = '$email' WHERE user_id = '".$admin->get_user_id()."' AND password = '".md5($current_password)."'";
+$query = "UPDATE ".TABLE_PREFIX."users SET email = '$email' WHERE user_id = '".$wb->get_user_id()."' AND password = '".md5($current_password)."'";
 $database->query($query);
 if($database->is_error()) {
-	$admin->print_error($database->get_error);
+	$wb->print_error($database->get_error,'index.php', false);
 } else {
-	$admin->print_success($MESSAGE['PREFERENCES']['EMAIL_UPDATED'], WB_URL.'/account/preferences'.PAGE_EXTENSION);
+	$wb->print_success($MESSAGE['PREFERENCES']['EMAIL_UPDATED'], WB_URL.'/account/preferences'.PAGE_EXTENSION);
 	$_SESSION['EMAIL'] = $email;
 }
 
Index: trunk/wb/account/signup2.php
===================================================================
--- trunk/wb/account/signup2.php	(revision 274)
+++ trunk/wb/account/signup2.php	(revision 275)
@@ -27,8 +27,8 @@
 	header('Location: ../pages/index.php');
 }
 
-require_once(WB_PATH.'/framework/class.admin.php');
-$admin = new admin('Start', 'start', false, false);
+require_once(WB_PATH.'/framework/class.wb.php');
+$wb = new wb('Start', 'start', false, false);
 
 // Create new database object
 $database = new database();
@@ -36,9 +36,9 @@
 // Get details entered
 $group_id = FRONTEND_SIGNUP;
 $active = 1;
-$username = strtolower($admin->get_post('username'));
-$display_name = $admin->get_post('display_name');
-$email = $admin->get_post('email');
+$username = strtolower($wb->get_post('username'));
+$display_name = $wb->get_post('display_name');
+$email = $wb->get_post('email');
 
 // Create a javascript back link
 $js_back = "javascript: history.go(-1);";
@@ -45,17 +45,17 @@
 
 // Check values
 if($group_id == "") {
-	$admin->print_error($MESSAGE['USERS']['NO_GROUP'], $js_back);
+	$wb->print_error($MESSAGE['USERS']['NO_GROUP'], $js_back, false);
 }
 if(strlen($username) < 3) {
-	$admin->print_error($MESSAGE['USERS']['USERNAME_TOO_SHORT'], $js_back);
+	$wb->print_error($MESSAGE['USERS']['USERNAME_TOO_SHORT'], $js_back, false);
 }
 if($email != "") {
-	if($admin->validate_email($email) == false) {
-		$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back);
+	if($wb->validate_email($email) == false) {
+		$wb->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back, false);
 	}
 } else {
-	$admin->print_error($MESSAGE['SIGNUP']['NO_EMAIL'], $js_back);
+	$wb->print_error($MESSAGE['SIGNUP']['NO_EMAIL'], $js_back, false);
 }
 // Captcha
 if(extension_loaded('gd') AND function_exists('imageCreateFromJpeg') AND CAPTCHA_VERIFICATION) { /* Make's sure GD library is installed */
@@ -62,10 +62,10 @@
 	if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){
 		// Check for a mismatch
 		if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) {
-			$admin->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back);
+			$wb->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back, false);
 		}
 	} else {
-		$admin->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back);
+		$wb->print_error($MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'], $js_back, false);
 	}
 }
 if(isset($_SESSION['catpcha'])) { unset($_SESSION['captcha']); }
@@ -86,7 +86,7 @@
 // Check if username already exists
 $results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE username = '$username'");
 if($results->numRows() > 0) {
-	$admin->print_error($MESSAGE['USERS']['USERNAME_TAKEN'], $js_back);
+	$wb->print_error($MESSAGE['USERS']['USERNAME_TAKEN'], $js_back, false);
 }
 
 // Check if the email already exists
@@ -93,9 +93,9 @@
 $results = $database->query("SELECT user_id FROM ".TABLE_PREFIX."users WHERE email = '".$wb->add_slashes($_POST['email'])."'");
 if($results->numRows() > 0) {
 	if(isset($MESSAGE['USERS']['EMAIL_TAKEN'])) {
-		$admin->print_error($MESSAGE['USERS']['EMAIL_TAKEN'], $js_back);
+		$wb->print_error($MESSAGE['USERS']['EMAIL_TAKEN'], $js_back, false);
 	} else {
-		$admin->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back);
+		$wb->print_error($MESSAGE['USERS']['INVALID_EMAIL'], $js_back, false);
 	}
 }
 
@@ -126,10 +126,10 @@
 
 	// Try sending the email
 	if(mail($mail_to, $mail_subject, $mail_message, 'From: '.SERVER_EMAIL)) {
-		$admin->print_success($MESSAGE['FORGOT_PASS']['PASSWORD_RESET'], WB_URL.'/account/login'.PAGE_EXTENSION);
+		$wb->print_success($MESSAGE['FORGOT_PASS']['PASSWORD_RESET'], WB_URL.'/account/login'.PAGE_EXTENSION);
 		$display_form = false;
 	} else {
-		$admin->print_error($MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'], $js_back);
+		$wb->print_error($MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'], $js_back, false);
 	}
 }
 
Index: trunk/wb/framework/class.admin.php
===================================================================
--- trunk/wb/framework/class.admin.php	(revision 274)
+++ trunk/wb/framework/class.admin.php	(revision 275)
@@ -145,36 +145,6 @@
 		$footer_template->pparse('output', 'page');
 	}
 	
-	// Print a success message which then automatically redirects the user to another page
-	function print_success($message, $redirect = 'index.php') {
-		global $TEXT;
-		$success_template = new Template(ADMIN_PATH.'/interface');
-		$success_template->set_file('page', 'success.html');
-		$success_template->set_block('page', 'main_block', 'main');
-		$success_template->set_var('MESSAGE', $message);
-		$success_template->set_var('REDIRECT', $redirect);
-		$success_template->set_var('NEXT', $TEXT['NEXT']);
-		$success_template->parse('main', 'main_block', false);
-		$success_template->pparse('output', 'page');
-	}
-	
-	// Print a error message
-	function print_error($message, $link = 'index.php', $auto_footer = true) {
-		global $TEXT;
-		$success_template = new Template(ADMIN_PATH.'/interface');
-		$success_template->set_file('page', 'error.html');
-		$success_template->set_block('page', 'main_block', 'main');
-		$success_template->set_var('MESSAGE', $message);
-		$success_template->set_var('LINK', $link);
-		$success_template->set_var('BACK', $TEXT['BACK']);
-		$success_template->parse('main', 'main_block', false);
-		$success_template->pparse('output', 'page');
-		if($auto_footer == true) {
-			$this->print_footer();
-		}
-		exit();
-	}
-
 	// Return a system permission
 	function get_permission($name, $type = 'system') {
 		// Append to permission type
Index: trunk/wb/framework/class.wb.php
===================================================================
--- trunk/wb/framework/class.wb.php	(revision 274)
+++ trunk/wb/framework/class.wb.php	(revision 275)
@@ -31,6 +31,9 @@
 
 */
 
+// Include PHPLIB template class
+require_once(WB_PATH."/include/phplib/template.inc");
+
 require_once(WB_PATH.'/framework/class.database.php');
 
 class wb
@@ -193,6 +196,35 @@
 		}
 	}
 
+	// Print a success message which then automatically redirects the user to another page
+	function print_success($message, $redirect = 'index.php') {
+		global $TEXT;
+		$success_template = new Template(ADMIN_PATH.'/interface');
+		$success_template->set_file('page', 'success.html');
+		$success_template->set_block('page', 'main_block', 'main');
+		$success_template->set_var('MESSAGE', $message);
+		$success_template->set_var('REDIRECT', $redirect);
+		$success_template->set_var('NEXT', $TEXT['NEXT']);
+		$success_template->parse('main', 'main_block', false);
+		$success_template->pparse('output', 'page');
+	}
 	
+	// Print an error message
+	function print_error($message, $link = 'index.php', $auto_footer = true) {
+		global $TEXT;
+		$success_template = new Template(ADMIN_PATH.'/interface');
+		$success_template->set_file('page', 'error.html');
+		$success_template->set_block('page', 'main_block', 'main');
+		$success_template->set_var('MESSAGE', $message);
+		$success_template->set_var('LINK', $link);
+		$success_template->set_var('BACK', $TEXT['BACK']);
+		$success_template->parse('main', 'main_block', false);
+		$success_template->pparse('output', 'page');
+		if($auto_footer == true) {
+			$this->print_footer();
+		}
+		exit();
+	}
+
 }
 ?>
\ No newline at end of file