Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1578)
+++ branches/2.8.x/CHANGELOG	(revision 1579)
@@ -11,6 +11,8 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+16 Jan-2012 Build 1579 Dietmar Woellbrink (Luisehahne)
+- remove unneeded input fields in form settings
 16 Jan-2012 Build 1578 Dietmar Woellbrink (Luisehahne)
 # fixed warning in domain independend image links
 16 Jan-2012 Build 1577 Dietmar Woellbrink (Luisehahne)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1578)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1579)
@@ -52,5 +52,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.2');
-if(!defined('REVISION')) define('REVISION', '1578');
+if(!defined('REVISION')) define('REVISION', '1579');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/modules/form/modify_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1578)
+++ branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1579)
@@ -53,7 +53,7 @@
 	$setting['email_to'] = ($setting['email_to'] != '' ? $setting['email_to'] : emailAdmin());
 	$setting['email_subject'] = ($setting['email_subject']  != '') ? $setting['email_subject'] : '';
 	$setting['success_email_subject'] = ($setting['success_email_subject']  != '') ? $setting['success_email_subject'] : '';
-	$setting['success_email_from'] = ($setting['success_email_from'] != '' ? $setting['success_email_from'] : SERVER_EMAIL);
+	$setting['success_email_from'] = $admin->add_slashes(SERVER_EMAIL);
 	$setting['success_email_fromname'] = ($setting['success_email_fromname'] != '' ? $setting['success_email_fromname'] : WBMAILER_DEFAULT_SENDERNAME);
 	$setting['success_email_subject'] = ($setting['success_email_subject']  != '') ? $setting['success_email_subject'] : '';
 }
@@ -141,59 +141,11 @@
 			<input type="text" name="email_to" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['email_to'])); ?>" />
 		</td>
 	</tr>
+
 	<tr>
-		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['FROM']; ?>:</td>
-		<td class="frm-setting_value">
-			<select name="email_from_field" style="width: 98%;">
-			<option value="" onclick="javascript: document.getElementById('email_from').style.display = 'block';"><?php echo $TEXT['CUSTOM']; ?>:</option>
-			<?php
-			$selected = false;
-			$email_from_value = str_replace($raw, $friendly, ($setting['email_from']));
-			// $query_email_fields = $database->query("SELECT field_id,title FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' AND ( type = 'textfield' OR  type = 'email' ) ORDER BY position ASC");
-			$sql  = 'SELECT `field_id`, `title` FROM `'.TABLE_PREFIX.'mod_form_fields` ';
-			$sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
-			$sql .= '  AND ( `type` = \'textfield\' OR  `type` = \'email\' )';
-			$sql .= 'ORDER BY `position` ASC ';
-			if($query_email_fields = $database->query($sql)) {
-				if($query_email_fields->numRows() > 0) {
-					while($field = $query_email_fields->fetchRow(MYSQL_ASSOC)) {
-						?>
-						<option value="field<?php echo $field['field_id']; ?>"<?php if($email_from_value == 'field'.$field['field_id']) { echo ' selected'; $selected = true; } ?> onclick="javascript: document.getElementById('email_from').style.display = 'none';">
-							<?php echo $TEXT['FIELD'].': '.$field['title']; ?>
-						</option>
-						<?php
-					}
-				}
-			}
-			?>
-			</select>
-			<input type="text" name="email_from" id="email_from" style="width: 98%; display: <?php if(isset($selected) AND $selected == true) { echo 'none'; } else { echo 'block'; } ?>;" maxlength="255" value="<?php if(substr($email_from_value, 0, 5) != 'field') { echo $email_from_value; } ?>" />
-		</td>
-	</tr>
-	<tr>
 		<td class="frm-setting_name"><?php echo $TEXT['DISPLAY_NAME']; ?>:</td>
 		<td class="frm-setting_value">
-			<select name="email_fromname_field" style="width: 98%;">
-			<option value="" onclick="javascript: document.getElementById('email_fromname').style.display = 'block';" ><?php echo $TEXT['CUSTOM']; ?>:</option>
-<?php
-			$selected = false;
-			$email_fromname_value = str_replace($raw, $friendly, ($setting['email_fromname']));
-			if($query_email_fields->rewind()) {
-				if($query_email_fields->numRows() > 0) {
-						//!-- LOOP email_from_name -->
-					while($fieldFrom = $query_email_fields->fetchRow(MYSQL_ASSOC)) {
-?>
-						<option value="field<?php echo $fieldFrom['field_id']; ?>"<?php if($email_fromname_value == 'field'.$fieldFrom['field_id']) { echo ' selected'; $selected = true; } ?>  onclick="javascript: document.getElementById('email_fromname').style.display = 'none';">
-							<?php echo $TEXT['FIELD'].': '.$fieldFrom['title']; ?>
-						</option>
-<?php
-					}
-						//!-- ENDLOOP  -->
-				}
-			}
-?>
-			</select>
-			<input type="text" name="email_fromname" id="email_fromname" style="width: 98%; display: <?php if(isset($selected) AND $selected == true) { echo 'none'; } else { echo 'block'; } ?>;" maxlength="255" value="<?php if(substr($email_fromname_value, 0, 5) != 'field') { echo $email_fromname_value; } ?>" />
+			<input type="text" name="email_fromname" id="email_fromname" style="width: 98%;  ?>;" maxlength="255" value="<?php  echo $setting['success_email_fromname'];  ?>" />
 		</td>
 	</tr>
 	<tr>
@@ -221,7 +173,7 @@
 			$success_email_to = str_replace($raw, $friendly, ($setting['success_email_to']));
 			$sql  = 'SELECT `field_id`, `title` FROM `'.TABLE_PREFIX.'mod_form_fields` ';
 			$sql .= 'WHERE `section_id` = '.(int)$section_id.' ';
-			$sql .= '  AND ( `type` = \'textfield\' OR  `type` = \'email\' )';
+			$sql .= '  AND ( `type` = \'email\' AND required = \'1\' )';
 			$sql .= 'ORDER BY `position` ASC ';
 			if($query_email_fields = $database->query($sql)) {
 				if($query_email_fields->numRows() > 0) {
@@ -238,13 +190,8 @@
 			</select>
 		</td>
 	</tr>
+
 	<tr>
-		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['FROM']; ?>:</td>
-		<td class="frm-setting_value">
-			<input type="text" name="success_email_from" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['success_email_from'])); ?>" />
-		</td>
-	</tr>
-	<tr>
 		<td class="frm-setting_name"><?php echo $TEXT['DISPLAY_NAME']; ?>:</td>
 		<td class="frm-setting_value">
 			<?php $setting['success_email_fromname'] = ($setting['success_email_fromname'] != '' ? $setting['success_email_fromname'] : WBMAILER_DEFAULT_SENDERNAME); ?>
Index: branches/2.8.x/wb/modules/form/view.php
===================================================================
--- branches/2.8.x/wb/modules/form/view.php	(revision 1578)
+++ branches/2.8.x/wb/modules/form/view.php	(revision 1579)
@@ -287,11 +287,13 @@
 
 				// $email_to = $fetch_settings['email_to'];
 				$email_to = (($fetch_settings['email_to'] != '') ? $fetch_settings['email_to'] : emailAdmin());
-				$email_from = $fetch_settings['email_from'];
+				$email_from = $admin->add_slashes(SERVER_EMAIL);
+/*
 				if(substr($email_from, 0, 5) == 'field') {
 					// Set the email from field to what the user entered in the specified field
 					$email_from = htmlspecialchars($wb->add_slashes($_POST[$email_from]));
 				}
+*/
 				$email_fromname = $fetch_settings['email_fromname'];
 				if(substr($email_fromname, 0, 5) == 'field') {
 					// Set the email_fromname to field to what the user entered in the specified field
@@ -304,7 +306,7 @@
 					// Set the success_email to field to what the user entered in the specified field
 					$success_email_to = htmlspecialchars($wb->add_slashes($_POST[$success_email_to]));
 				}
-				$success_email_from = $fetch_settings['success_email_from'];
+				$success_email_from = $admin->add_slashes(SERVER_EMAIL);
 				$success_email_fromname = $fetch_settings['success_email_fromname'];
 				$success_email_text = htmlspecialchars($wb->add_slashes($fetch_settings['success_email_text']));
 				$success_email_text = (($success_email_text != '') ? $success_email_text : $MOD_FORM['SUCCESS_EMAIL_TEXT']);
@@ -442,7 +444,7 @@
 						$success_email_text = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $success_email_text );
 						if($success_email_to != '') {
 							if($success_email_from != '') {
-								if($wb->mail($success_email_from,$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname)) {
+								if($wb->mail(SERVER_EMAIL,$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname)) {
 									$success = true;
 								}
 							} else {
Index: branches/2.8.x/wb/modules/form/README.de.txt
===================================================================
--- branches/2.8.x/wb/modules/form/README.de.txt	(revision 1578)
+++ branches/2.8.x/wb/modules/form/README.de.txt	(revision 1579)
@@ -7,15 +7,13 @@
 E-Mail Optionen in Formular Einstellungen
 -----------------------------------------
 E-Mail Empfänger: wenn leer dann wird automatisch mit Superadmin (user_id==1) E-Mail vorbelegt
-E-Mail Absender:  Benutzerdefiniert oder Field E-Mail Adresse ( depecrated )
-Angezeigter Name: Benutzerdefiniert oder Field Name
-E-Mail Betreff: wenn leer dann senden mit $MOD_FORM['EMAIL_SUBJECT']
+Angezeigter Name: Benutzerdefiniert oder WBMAILER_DEFAULT_SENDERNAME
+E-Mail Betreff:   Benutzerdefiniert oder wenn leer dann senden mit $MOD_FORM['EMAIL_SUBJECT']
 
 E-Mail Bestätigung in Formular Einstellungen
 --------------------------------------------
-E-Mail Empfänger: wenn leer dann keine Bestätigungs E-Mail an Sender
-E-Mail Absender:  wenn leer dann Vorbelegung mit SERVER_EMAIL (Eintrag unter Optionen Maileinstellungen)
-Angezeigter Name: wenn leer dann Vorbelegung mit WBMAILER_DEFAULT_SENDERNAME (Eintrag unter Optionen Maileinstellungen)
-E-Mail Betreff:   wenn leer dann senden mit $MOD_FORM['SUCCESS_EMAIL_SUBJECT']
-E-Mail Text:      wenn leer dann senden mit $MOD_FORM['SUCCESS_EMAIL_TEXT'].$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED']
+E-Mail Empfänger: wenn Auswahl "keine"" dann keine Bestätigungs E-Mail an Sender
+Angezeigter Name: Benutzerdefiniert oder WBMAILER_DEFAULT_SENDERNAME (Eintrag unter Optionen Maileinstellungen)
+E-Mail Betreff:   Benutzerdefiniert oder wenn leer dann senden mit $MOD_FORM['SUCCESS_EMAIL_SUBJECT']
+E-Mail Text:      Benutzerdefiniert oder wenn leer dann senden mit $MOD_FORM['SUCCESS_EMAIL_TEXT'].$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED']
 
Index: branches/2.8.x/wb/modules/form/save_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/save_settings.php	(revision 1578)
+++ branches/2.8.x/wb/modules/form/save_settings.php	(revision 1579)
@@ -57,14 +57,15 @@
 $footer = $admin->add_slashes($_POST['footer']);
 $email_to = $admin->add_slashes($_POST['email_to']);
 $email_to = ($email_to != '' ? $email_to : emailAdmin());
+$email_from = $admin->add_slashes(SERVER_EMAIL);
 $use_captcha = $admin->add_slashes($_POST['use_captcha']);
-
+/*
 if( isset($_POST['email_from_field']) && ($_POST['email_from_field'] != '')) {
 	$email_from = $admin->add_slashes($_POST['email_from_field']);
 } else {
 	$email_from = $admin->add_slashes($_POST['email_from']);
 }
-
+*/
 if( isset($_POST['email_fromname_field']) && ($_POST['email_fromname_field'] != '')) {
 	$email_fromname = $admin->add_slashes($_POST['email_fromname_field']);
 } else {
@@ -75,7 +76,7 @@
 $email_subject = (($email_subject  != '') ? $email_subject : '');
 $success_page = $admin->add_slashes($_POST['success_page']);
 $success_email_to = $admin->add_slashes($_POST['success_email_to']);
-$success_email_from = $admin->add_slashes($_POST['success_email_from']);
+$success_email_from = $admin->add_slashes(SERVER_EMAIL);
 $success_email_fromname = $admin->add_slashes($_POST['success_email_fromname']);
 $success_email_fromname = ($success_email_fromname != '' ? $success_email_fromname : WBMAILER_DEFAULT_SENDERNAME);
 $success_email_text = $admin->add_slashes($_POST['success_email_text']);