Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 788)
+++ trunk/CHANGELOG	(revision 789)
@@ -12,6 +12,7 @@
 
 ------------------------------------- 2.7.0 -------------------------------------
 02-Apr-2008 Christian Sommer
+!	fixed some layout issues with Form module (combination with Output-filter)
 !	fixed layout issue with optional subject/body text of encrypted mailto links
 #	fixed bug in the mailto Javascript encryption code of the Output-Filter module
 01-Apr-2008 Christian Sommer
Index: trunk/wb/admin/interface/stylesheet.css
===================================================================
--- trunk/wb/admin/interface/stylesheet.css	(revision 788)
+++ trunk/wb/admin/interface/stylesheet.css	(revision 789)
@@ -86,7 +86,7 @@
 	background-color: #ECF3F7;
 }
 .row_b {
-	background-color: #EBF7FC;
+	background-color: #DBEBF2;
 }
 .hide {
 	display: none;
Index: trunk/wb/index.php
===================================================================
--- trunk/wb/index.php	(revision 788)
+++ trunk/wb/index.php	(revision 789)
@@ -92,10 +92,10 @@
 	
 	if(function_exists('filter_frontend_output')) {
 		// store output in variable for filtering
-		ob_start();
+		@ob_start();
 		require(WB_PATH.'/templates/'.TEMPLATE.'/index.php');
 		$frontend_output = ob_get_contents();
-		ob_end_clean();
+		@ob_end_clean();
 		// Display the filtered output on the frontend
 		echo filter_frontend_output($frontend_output);
 		die;
Index: trunk/wb/modules/form/edit_css.php
===================================================================
--- trunk/wb/modules/form/edit_css.php	(revision 788)
+++ trunk/wb/modules/form/edit_css.php	(revision 789)
@@ -40,7 +40,6 @@
 }
 
 // set defaults if output varibles are not set in the languages files
-if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS	= 'Edit CSS';
 if(!isset($HEADING_CSS_FILE))	$HEADING_CSS_FILE = 'Actual module file: ';
 if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.';
 
Index: trunk/wb/modules/form/css.functions.php
===================================================================
--- trunk/wb/modules/form/css.functions.php	(revision 788)
+++ trunk/wb/modules/form/css.functions.php	(revision 789)
@@ -59,8 +59,6 @@
 		if($frontend_css || $backend_css) {
 			// default text used for the edit CSS routines if not defined in the modules language file
 			if(!isset($CAP_EDIT_CSS)) $CAP_EDIT_CSS	= 'Edit CSS';
-			if(!isset($HEADING_CSS_FILE)) $HEADING_CSS_FILE	= 'Actual module file: ';
-			if(!isset($TXT_EDIT_CSS_FILE)) $TXT_EDIT_CSS_FILE = 'Edit the CSS definitions in the textarea below.';
 			?>
 			<form name="edit_module_file" action="<?php echo WB_URL .'/modules/' .$mod_dir .
 				'/edit_css.php';?>" method="post" style="margin: 0; align:right;">
Index: trunk/wb/modules/form/view.php
===================================================================
--- trunk/wb/modules/form/view.php	(revision 788)
+++ trunk/wb/modules/form/view.php	(revision 789)
@@ -41,6 +41,15 @@
 
 require_once(WB_PATH.'/include/captcha/captcha.php');
 
+// obtain the settings of the output filter module
+if(file_exists(WB_PATH.'/modules/output_filter/filter-routines.php')) {
+	include_once(WB_PATH.'/modules/output_filter/filter-routines.php');
+	$filter_settings = get_output_filter_settings();
+} else {
+	// no output filter used, define default settings
+	$filter_settings['email_filter'] = 0;
+}
+
 // Function for generating an optionsfor a select field
 if (!function_exists('make_option')) {
 function make_option(&$n, $k, $values) {
@@ -221,6 +230,16 @@
 // Print footer
 echo $footer;
 
+/**
+	NOTE: comment out the line ob_end_flush() if you indicate problems (e.g. when using ob_start in the index.php of your template)
+	With ob_end_flush(): output filter will be disabled for this page (and all sections embedded on this page)
+	Without ob_end_flush(): emails are rewritten (e.g. name@domain.com --> name(at)domain(dot)com) if output filter is enabled
+	All replacements made by the Output-Filter module will be reverted before the email is send out
+*/
+if($filter_settings['email_filter'] && !($filter_settings['at_replacement']=='@' && $filter_settings['dot_replacement']=='.')) { 
+	ob_end_flush();
+}
+
 // Add form end code
 ?>
 </form>
@@ -305,6 +324,14 @@
 						} else {
 							$_SESSION['field'.$field['field_id']] = htmlspecialchars($_POST['field'.$field['field_id']]);
 						}
+						// if the output filter is active, we need to revert (dot) to . and (at) to @ (using current filter settings)
+						// otherwise the entered mail will not be accepted and the recipient would see (dot), (at) etc.
+						if ($filter_settings['email_filter']) {
+							$field_value = $_POST['field'.$field['field_id']];
+							$field_value = str_replace($filter_settings['at_replacement'], '@', $field_value);
+							$field_value = str_replace($filter_settings['dot_replacement'], '.', $field_value);
+							$_POST['field'.$field['field_id']] = $field_value;
+						}
 						if($field['type'] == 'email' AND $admin->validate_email($_POST['field'.$field['field_id']]) == false) {
 							$email_error = $MESSAGE['USERS']['INVALID_EMAIL'];
 						}