Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1189)
+++ branches/2.8.x/CHANGELOG	(revision 1190)
@@ -12,6 +12,8 @@
 
 ------------------------------------- 2.8.1 -------------------------------------
 26-Nov-2009 Dietmar Woellbrink (Luisehahne)
+!	validate some output files
+26-Nov-2009 Dietmar Woellbrink (Luisehahne)
 !	fix some PHP 5.3 deprecated functions 
 25-Nov-2009 Dietmar Woellbrink (Luisehahne)
 !	Fix to load edit_full_area only if needed
Index: branches/2.8.x/wb/account/login_form.php
===================================================================
--- branches/2.8.x/wb/account/login_form.php	(revision 1189)
+++ branches/2.8.x/wb/account/login_form.php	(revision 1190)
@@ -1,107 +1,92 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, 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
-
-*/
-
-if(!defined('WB_URL')) {
-	header('Location: ../pages/index.php');
-	exit(0);
-}
-
-if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') {
-	// Generate username field name
-	$username_fieldname = 'username_';
-	$password_fieldname = 'password_';
-	$salt = "abchefghjkmnpqrstuvwxyz0123456789";
-	srand((double)microtime()*1000000);
-	$i = 0;
-	while ($i <= 7) {
-		$num = rand() % 33;
-		$tmp = substr($salt, $num, 1);
-		$username_fieldname = $username_fieldname . $tmp;
-		$password_fieldname = $password_fieldname . $tmp;
-		$i++;
-	}
-} else {
-	$username_fieldname = 'username';
-	$password_fieldname = 'password';
-}
-
-?>
-<style>
-.value_input input, .value_input text, .value_input select {
-	width: 220px;
-}
-</style>
-
-<h1>&nbsp;Login</h1>
-&nbsp;<?php echo $thisApp->message; ?>
-<br />
-<br />
-
-<form name="login" action="<?php echo WB_URL.'/account/login.php'; ?>" method="post">
-<input type="hidden" name="username_fieldname" value="<?php echo $username_fieldname; ?>" />
-<input type="hidden" name="password_fieldname" value="<?php echo $password_fieldname; ?>" />
-<input type="hidden" name="redirect" value="<?php echo $thisApp->redirect_url;?>" />
-
-<table cellpadding="5" cellspacing="0" border="0" width="90%">
-<tr>
-	<td width="100"><?php echo $TEXT['USERNAME']; ?>:</td>
-	<td class="value_input">
-		<input type="text" name="<?php echo $username_fieldname; ?>" maxlength="30" />
-		<script type="text/javascript" language="javascript">
-		document.login.<?php echo $username_fieldname; ?>.focus();
-		</script>
-	</td>
-</tr>
-<tr>
-	<td width="100"><?php echo $TEXT['PASSWORD']; ?>:</td>
-	<td class="value_input">
-		<input type="password" name="<?php echo $password_fieldname; ?>" maxlength="30" />
-	</td>
-</tr>
-<?php if($username_fieldname != 'username') { ?>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="checkbox" name="remember" id="remember" value="true" />
-		<label for="remember">
-			<?php echo $TEXT['REMEMBER_ME']; ?>
-		</label>
-	</td>
-</tr>
-<?php } ?>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="<?php echo $TEXT['LOGIN']; ?>" />
-		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>" />
-	</td>
-</tr>
-</table>
-
-</form>
-
-<br />
-
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, 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
+
+*/
+
+if(!defined('WB_URL')) die(header('Location: ../../index.php'));
+
+$username_fieldname = 'username';
+$password_fieldname = 'password';
+	
+if(defined('SMART_LOGIN') AND SMART_LOGIN == 'enabled') {
+	// Generate username field name
+	$username_fieldname = 'username_';
+	$password_fieldname = 'password_';
+
+	$temp = array_merge(range('a','z'), range(0,9));
+	shuffle($temp);
+	for($i=0;$i<=7;$i++) {
+		$username_fieldname .= $temp[$i];
+		$password_fieldname .= $temp[$i];
+	}
+}
+?>
+<h1>&nbsp;Login</h1>
+&nbsp;<?php echo $thisApp->message; ?>
+<br />
+<br />
+
+<form action="<?php echo WB_URL.'/account/login.php'; ?>" method="post">
+<p style="display:none;"><input type="hidden" name="username_fieldname" value="<?php echo $username_fieldname; ?>" /></p>
+<p style="display:none;"><input type="hidden" name="password_fieldname" value="<?php echo $password_fieldname; ?>" /></p>
+<p style="display:none;"><input type="hidden" name="redirect" value="<?php echo $thisApp->redirect_url;?>" /></p>
+
+<table cellpadding="5" cellspacing="0" border="0" width="90%">
+<tr>
+	<td style="width:100px"><?php echo $TEXT['USERNAME']; ?>:</td>
+	<td class="value_input">
+		<input type="text" name="<?php echo $username_fieldname; ?>" maxlength="30" style="width:220px;"/>
+		<script type="text/javascript">
+		document.login.<?php echo $username_fieldname; ?>.focus();
+		</script>
+	</td>
+</tr>
+<tr>
+	<td style="width:100px"><?php echo $TEXT['PASSWORD']; ?>:</td>
+	<td class="value_input">
+		<input type="password" name="<?php echo $password_fieldname; ?>" maxlength="30" style="width:220px;"/>
+	</td>
+</tr>
+<?php if($username_fieldname != 'username') { ?>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="checkbox" name="remember" id="remember" value="true"/>
+		<label for="remember"><?php echo $TEXT['REMEMBER_ME']; ?></label>
+	</td>
+</tr>
+<?php } ?>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="submit" name="submit" value="<?php echo $TEXT['LOGIN']; ?>"  />
+		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>"  />
+	</td>
+</tr>
+</table>
+
+</form>
+
+<br />
+
 <a href="<?php echo WB_URL; ?>/account/forgot.php"><?php echo $TEXT['FORGOTTEN_DETAILS']; ?></a>
\ No newline at end of file
Index: branches/2.8.x/wb/account/preferences_form.php
===================================================================
--- branches/2.8.x/wb/account/preferences_form.php	(revision 1189)
+++ branches/2.8.x/wb/account/preferences_form.php	(revision 1190)
@@ -1,231 +1,215 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, 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
-
-*/
-
-if(!defined('WB_URL')) {
-	header('Location: ../index.php');
-	exit(0);
-}
-
-?>
-
-<h1>&nbsp;<?php echo $HEADING['MY_SETTINGS']; ?></h1>
-
-<form name="user" action="<?php echo WB_URL.'/account/preferences.php'; ?>" method="post" style="margin-bottom: 5px;">
-<input type="hidden" name="user_id" value="{USER_ID}" />
-
-<table cellpadding="5" cellspacing="0" border="0" width="97%">
-	<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 $wb->get_display_name(); ?>" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['LANGUAGE']; ?>:</td>
-	<td>
-		<select name="language" style="width: 380px;">
-		<?php
-		// Insert language values
-		if($handle = opendir(WB_PATH.'/languages/')) {
-		   while (false !== ($file = readdir($handle))) {
-				if($file != '.' AND $file != '..' AND $file != '.svn' AND $file != 'index.php') {
-					// Get language name
-					require(WB_PATH.'/languages/'.$file);
-					// Check if it is selected
-					if(LANGUAGE == $language_code) {
-						?>
-						<option value="<?php echo $language_code; ?>" selected><?php echo $language_name.' ('.$language_code.')'; ?></option>
-						<?php
-					} else {
-						?>
-						<option value="<?php echo $language_code; ?>"><?php echo $language_name.' ('.$language_code.')'; ?></option>
-						<?php
-					}
-				}
-			}
-			// Restore language to original file
-			require(WB_PATH.'/languages/'.LANGUAGE.'.php');
-		}
-		?>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['TIMEZONE']; ?>:</td>
-	<td>
-		<select name="timezone" style="width: 380px;">
-			<option value="-20"><?php echo $TEXT['PLEASE_SELECT']; ?>...</option>
-			<?php
-			// Insert default timezone values
-			require_once(ADMIN_PATH.'/interface/timezones.php');
-			foreach($TIMEZONES AS $hour_offset => $title) {
-				if($wb->get_timezone() == $hour_offset*60*60) {
-					?>
-					<option value="<?php echo $hour_offset; ?>" selected><?php echo $title; ?></option>
-					<?php
-				} else {
-					?>
-					<option value="<?php echo $hour_offset; ?>"><?php echo $title; ?></option>
-					<?php
-				}
-			}
-			?>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['DATE_FORMAT']; ?>:</td>
-	<td>
-		<select name="date_format" style="width: 98%;">
-			<option value="">Please select...</option>
-			<?php
-			// Insert date format list
-			$user_time = true;
-			require_once(ADMIN_PATH.'/interface/date_formats.php');
-			foreach($DATE_FORMATS AS $format => $title) {
-				$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
-				if($format != 'system_default') {
-					$value = $format;
-				} else {
-					$value = '';
-				}
-				if(DATE_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
-					$selected = ' selected';
-				} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
-					$selected = ' selected';
-				} else {
-					$selected = '';
-				}
-				echo '<option value="'.$value.'"'.$selected.'>'.$title.'</option>';
-			}
-			?>>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['TIME_FORMAT']; ?>:</td>
-	<td>
-		<select name="time_format" style="width: 98%;">
-			<option value="">Please select...</option>
-			<?php
-			// Insert time format list
-			$user_time = true;
-			require_once(ADMIN_PATH.'/interface/time_formats.php');
-			foreach($TIME_FORMATS AS $format => $title) {
-				$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
-				if($format != 'system_default') {
-					$value = $format;
-				} else {
-					$value = '';
-				}
-				if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
-					$selected = ' selected';
-				} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) {
-					$selected = ' selected';
-				} else {
-					$selected = '';
-				}
-				echo '<option value="'.$value.'"'.$selected.'>'.$title.'</option>';
-			}
-			?>
-		</select>
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="<?php echo $TEXT['SAVE']; ?>" />
-		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>" />
-	</td>
-</tr>
-</table>
-
-</form>
-
-
-<h1>&nbsp;<?php echo $HEADING['MY_EMAIL']; ?></h1>
-
-<form name="email" action="<?php echo WB_URL.'/account/preferences.php'; ?>" method="post" style="margin-bottom: 5px;">
-<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['CURRENT_PASSWORD']; ?>:</td>
-	<td>
-		<input type="password" name="current_password" style="width: 380px;" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['EMAIL']; ?>:</td>
-	<td class="value_input">
-		<input type="text" name="email" style="width: 380px;" maxlength="255" value="<?php echo $wb->get_email(); ?>" />
-	</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="<?php echo $TEXT['SAVE']; ?>" />
-		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>" />
-	</td>
-</tr>
-</table>
-
-</form>
-
-
-<h1>&nbsp;<?php echo $HEADING['MY_PASSWORD']; ?></h1>
-
-<form name="user" action="<?php echo WB_URL.'/account/preferences.php'; ?>" method="post">
-<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['CURRENT_PASSWORD']; ?>:</td>
-	<td>
-		<input type="password" name="current_password" style="width: 380px;" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['NEW_PASSWORD']; ?>:</td>
-	<td>
-		<input type="password" name="new_password" style="width: 380px;" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['RETYPE_NEW_PASSWORD']; ?>:</td>
-	<td>
-		<input type="password" name="new_password2" style="width: 380px;" />
-	</td>
-</tr>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="<?php echo $TEXT['SAVE']; ?>" />
-		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>" />
-	</td>
-</tr>
-</table>
-
+<?php
+
+// $Id$
+
+/*
+
+ Website Baker Project <http://www.websitebaker.org/>
+ Copyright (C) 2004-2009, 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
+
+*/
+
+if(!defined('WB_URL')) die(header('Location: ../../index.php'));
+
+?>
+
+<h2>&nbsp;<?php print $HEADING['MY_SETTINGS']; ?></h2>
+
+<form name="user" action="<?php print WB_URL.'/account/preferences.php'; ?>" method="post" style="margin-bottom: 5px;">
+<input type="hidden" name="user_id" value="{USER_ID}" />
+
+<table cellpadding="5" cellspacing="0" border="0" width="97%">
+<tr>
+	<td width="140"><?php print $TEXT['DISPLAY_NAME']; ?>:</td>
+	<td class="value_input">
+		<input type="text" name="display_name" style="width: 380px;" maxlength="255" value="<?php print $wb->get_display_name(); ?>" />
+	</td>
+</tr>
+<tr>
+	<td><?php print $TEXT['LANGUAGE']; ?>:</td>
+	<td>
+		<select name="language" style="width: 380px;">
+		<?php
+		/**
+		 *
+		 *	Getting the languages from the database. (addons)
+		 *	It's a little bit corious, but the language-shortform is
+		 *	storred in the field "directory" ...
+		 *
+		 */
+		$query = "SELECT directory, name from ".TABLE_PREFIX."addons where type='language' order by 'name'";
+		$result = $database->query($query);
+		if ($result) {
+			$options_html = "";
+			while($data = $result->fetchRow()) {
+				$sel = ($data['directory'] == LANGUAGE) ? " selected=\"selected\" " : "";
+				$options_html .= "<option value=\"".$data['directory']."\" ".$sel.">".$data['name']." (".$data['directory'].")</option>\n";
+			}
+			echo $options_html;
+		}
+		?>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td><?php print $TEXT['TIMEZONE']; ?>:</td>
+	<td>
+		<select name="timezone" style="width: 380px;">
+			<option value="-20"><?php print $TEXT['PLEASE_SELECT']; ?>...</option>
+			<?php
+				// Insert default timezone values
+				require_once(ADMIN_PATH.'/interface/timezones.php');
+				$test_time = $wb->get_timezone();
+				$options_html = "";
+				foreach($TIMEZONES as $hour_offset => $title) {
+					$sel = ($test_time == $hour_offset*60*60) ? " selected=\"selected\" " : ""; 
+					$options_html .= "<option value=\"".$hour_offset."\" ".$sel.">".$title."</option>\n";
+				}
+				print $options_html;
+?>
+
+		</select>
+	</td>
+</tr>
+<tr>
+	<td><?php print $TEXT['DATE_FORMAT']; ?>:</td>
+	<td>
+		<select name="date_format" style="width: 98%;">
+			<option value="">Please select...</option>
+			<?php
+			// Insert date format list
+			$user_time = true;
+			require_once(ADMIN_PATH.'/interface/date_formats.php');
+			foreach($DATE_FORMATS AS $format => $title) {
+				$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
+				if($format != 'system_default') {
+					$value = $format;
+				} else {
+					$value = '';
+				}
+				if(DATE_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
+					$selected = ' selected="selected"';
+				} elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) {
+					$selected = ' selected="selected"';
+				} else {
+					$selected = '';
+				}
+				print '<option value="'.$value.'"'.$selected.'>'.$title.'</option>'."\n";
+			}
+			?>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td><?php print $TEXT['TIME_FORMAT']; ?>:</td>
+	<td>
+		<select name="time_format" style="width: 98%;">
+			<option value="">Please select...</option>
+			<?php
+			// Insert time format list
+			$user_time = true;
+			require_once(ADMIN_PATH.'/interface/time_formats.php');
+			foreach($TIME_FORMATS AS $format => $title)
+            {
+				$format = str_replace('|', ' ', $format); // Add's white-spaces (not able to be stored in array key)
+                $value = ($format != 'system_default') ? $format : '';
+
+                $selected = ((TIME_FORMAT == $format AND ! isset($_SESSION['USE_DEFAULT_TIME_FORMAT']))
+                    OR ($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])))
+                	? ' selected="selected"' : '';
+
+				print '<option value="'.$value.'"'.$selected.'>'.$title.'</option>';
+			}
+			?>
+		</select>
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="submit" name="submit" value="<?php print $TEXT['SAVE']; ?>" />
+		<input type="reset" name="reset" value="<?php print $TEXT['RESET']; ?>" />
+	</td>
+</tr>
+</table>
+
+</form>
+
+<h2>&nbsp;<?php print $HEADING['MY_EMAIL']; ?></h2>
+
+<form name="email" action="<?php print WB_URL.'/account/preferences.php'; ?>" method="post" style="margin-bottom: 5px;">
+<input type="hidden" name="user_id" value="{USER_ID}" />
+
+<table cellpadding="5" cellspacing="0" border="0" width="97%">
+<tr>
+	<td width="140"><?php print $TEXT['CURRENT_PASSWORD']; ?>:</td>
+	<td>
+		<input type="password" name="current_password" style="width: 380px;" />
+	</td>
+</tr>
+<tr>
+	<td><?php print $TEXT['EMAIL']; ?>:</td>
+	<td class="value_input">
+		<input type="text" name="email" style="width: 380px;" maxlength="255" value="<?php print $wb->get_email(); ?>" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="submit" name="submit" value="<?php print $TEXT['SAVE']; ?>" />
+		<input type="reset" name="reset" value="<?php print $TEXT['RESET']; ?>" />
+	</td>
+</tr>
+</table>
+
+</form>
+
+
+<h2>&nbsp;<?php print $HEADING['MY_PASSWORD']; ?></h2>
+
+<form name="user" action="<?php print WB_URL.'/account/preferences.php'; ?>" method="post">
+<input type="hidden" name="user_id" value="{USER_ID}" />
+
+<table cellpadding="5" cellspacing="0" border="0" width="97%">
+<tr>
+	<td width="140"><?php print $TEXT['CURRENT_PASSWORD']; ?>:</td>
+	<td>
+		<input type="password" name="current_password" style="width: 380px;" />
+	</td>
+</tr>
+<tr>
+	<td><?php print $TEXT['NEW_PASSWORD']; ?>:</td>
+	<td>
+		<input type="password" name="new_password" style="width: 380px;" />
+	</td>
+</tr>
+<tr>
+	<td><?php print $TEXT['RETYPE_NEW_PASSWORD']; ?>:</td>
+	<td>
+		<input type="password" name="new_password2" style="width: 380px;" />
+	</td>
+</tr>
+<tr>
+	<td>&nbsp;</td>
+	<td>
+		<input type="submit" name="submit" value="<?php print $TEXT['SAVE']; ?>" />
+		<input type="reset" name="reset" value="<?php print $TEXT['RESET']; ?>" />
+	</td>
+</tr>
+</table>
+
 </form>
\ No newline at end of file
Index: branches/2.8.x/wb/account/signup_form.php
===================================================================
--- branches/2.8.x/wb/account/signup_form.php	(revision 1189)
+++ branches/2.8.x/wb/account/signup_form.php	(revision 1190)
@@ -1,103 +1,194 @@
-<?php
-
-// $Id$
-
-/*
-
- Website Baker Project <http://www.websitebaker.org/>
- Copyright (C) 2004-2009, 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
-
-*/
-
-if(!defined('WB_URL')) {
-	header('Location: ../index.php');
-	exit(0);
-}
-require_once(WB_PATH.'/include/captcha/captcha.php');
-
-?>
-<style type="text/css">
-.value_input input, .value_input text, .value_input select {
-	width: 300px;
-}
-<?php if(ENABLED_ASP) { ?>
-.nixhier { display:none; }
-<?php } ?>
-</style>
-
-<h1>&nbsp;<?php echo $TEXT['SIGNUP']; ?></h1>
-
-<form name="user" action="<?php echo WB_URL.'/account/signup.php'; ?>" method="post">
-
-<table cellpadding="5" cellspacing="0" border="0" width="90%">
-<tr>
-	<?php if(ENABLED_ASP) { // add some honeypot-fields
-	?>
-	<input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />
-	<p class="nixhier">
-	email-address:
-	<label for="email-address">Leave this field email-address blank:</label>
-	<input id="email-address" name="email-address" size="60" value="" /><br />
-	username (id):
-	<label for="name">Leave this field name blank:</label>
-	<input id="name" name="name" size="60" value="" /><br />
-	Full Name:
-	<label for="full_name">Leave this field full_name blank:</label>
-	<input id="full_name" name="full_name" size="60" value="" /><br />
-	</p>
-	<?php }
-	?>
-	<td width="180"><?php echo $TEXT['USERNAME']; ?>:</td>
-	<td class="value_input">
-		<input type="text" name="username" maxlength="30" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['DISPLAY_NAME']; ?> (<?php echo $TEXT['FULL_NAME']; ?>):</td>
-	<td class="value_input">
-		<input type="text" name="display_name" maxlength="255" />
-	</td>
-</tr>
-<tr>
-	<td><?php echo $TEXT['EMAIL']; ?>:</td>
-	<td class="value_input">
-		<input type="text" name="email" maxlength="255" />
-	</td>
-</tr>
-<?php
-// Captcha
-if(ENABLED_CAPTCHA) {
-	?><tr>
-		<td class="field_title"><?php echo $TEXT['VERIFICATION']; ?>:</td>
-		<td><?php call_captcha(); ?></td>
-		</tr>
-	<?php
-}
-?>
-<tr>
-	<td>&nbsp;</td>
-	<td>
-		<input type="submit" name="submit" value="<?php echo $TEXT['SIGNUP']; ?>" />
-		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>" />
-	</td>
-</tr>
-</table>
-
-</form>
-
-<br />
-&nbsp; 
+<?php+
++
+// $Id$+
++
+/*+
++
+ Website Baker Project <http://www.websitebaker.org/>+
+ Copyright (C) 2004-2009, 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+
++
+*/+
++
+if(!defined('WB_URL')) {+
+	header('Location: ../index.php');+
+	exit(0);+
+}+
+require_once(WB_PATH.'/include/captcha/captcha.php');+
++
+?>+
++
+<h1>&nbsp;<?php echo $TEXT['SIGNUP']; ?></h1>+
++
+<form name="user" action="<?php echo WB_URL.'/account/signup.php'; ?>" method="post">+
++
+	<?php if(ENABLED_ASP) { // add some honeypot-fields+
+	?>+
+    <div style="display:none;">+
+	<input type="hidden" name="submitted_when" value="<?php $t=time(); echo $t; $_SESSION['submitted_when']=$t; ?>" />+
+	<p class="nixhier">+
+	email-address:+
+	<label for="email-address">Leave this field email-address blank:</label>+
+	<input id="email-address" name="email-address" size="60" value="" /><br />+
+	username (id):+
+	<label for="name">Leave this field name blank:</label>+
+	<input id="name" name="name" size="60" value="" /><br />+
+	Full Name:+
+	<label for="full_name">Leave this field full_name blank:</label>+
+	<input id="full_name" name="full_name" size="60" value="" /><br />+
+	</p>+
+	<?php }+
+	?>+
+    </div>+
+<table cellpadding="5" cellspacing="0" border="0" width="90%">+
+<tr>+
+	<td width="180"><?php echo $TEXT['USERNAME']; ?>:</td>+
+	<td class="value_input">+
+		<input type="text" name="username" maxlength="30" style="width:300px;"/>+
+	</td>+
+</tr>+
+<tr>+
+	<td><?php echo $TEXT['DISPLAY_NAME']; ?> (<?php echo $TEXT['FULL_NAME']; ?>):</td>+
+	<td class="value_input">+
+		<input type="text" name="display_name" maxlength="255" style="width:300px;" />+
+	</td>+
+</tr>+
+<tr>+
+	<td><?php echo $TEXT['EMAIL']; ?>:</td>+
+	<td class="value_input">+
+		<input type="text" name="email" maxlength="255" style="width:300px;"/>+
+	</td>+
+</tr>+
+<?php+
+// Captcha+
+if(ENABLED_CAPTCHA) {+
+	?><tr>+
+		<td class="field_title"><?php echo $TEXT['VERIFICATION']; ?>:</td>+
+		<td><?php call_captcha(); ?></td>+
+		</tr>+
+	<?php+
+}+
+?>+
+<tr>+
+	<td>&nbsp;</td>+
+	<td>+
+		<input type="submit" name="submit" value="<?php echo $TEXT['SIGNUP']; ?>" />+
+		<input type="reset" name="reset" value="<?php echo $TEXT['RESET']; ?>" />+
+	</td>+
+</tr>+
+</table>+
++
+</form>+
++
+<br />+
+&nbsp; +
