Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 637)
+++ trunk/CHANGELOG	(revision 638)
@@ -23,7 +23,8 @@
 !	added possibility to select the default backend language during installation process
 !	Re-introduced Changeset 593 (filename in pages/ from page_title instead of menu_title)
 #	Fixed some bugs in the Javascript Admin modul
-28-Jan-2008 Thomas Hornik
+28-Jan-2008 Thomas Hornik
++	Allow a user-supplied From-Name in form-settings for email und success-email.
 !	changeset 627: menu_link and search/search.php needs some minor changes, too.
 +	Added Text-CAPTCHA on request. The captcha-text will be stored in temp/.captcha_text.txt
 27-Jan-2008 Christian Sommer
Index: trunk/wb/framework/class.wb.php
===================================================================
--- trunk/wb/framework/class.wb.php	(revision 637)
+++ trunk/wb/framework/class.wb.php	(revision 638)
@@ -295,7 +295,7 @@
 	}
 
 	// Validate send email
-	function mail($fromaddress, $toaddress, $subject, $message) {
+	function mail($fromaddress, $toaddress, $subject, $message, $fromname='') {
 		/* 
 			INTEGRATED OPEN SOURCE PHPMAILER CLASS FOR SMTP SUPPORT AND MORE
 			SOME SERVICE PROVIDERS DO NOT SUPPORT SENDING MAIL VIA PHP AS IT DOES NOT PROVIDE SMTP AUTHENTICATION
@@ -313,9 +313,10 @@
 		
 		// create PHPMailer object and define default settings
 		$myMail = new wbmailer();
-      
+
 		// set user defined from address
 		if ($fromaddress!='') {
+			if($fromname!='') $myMail->FromName = $fromname;         // FROM-NAME
 			$myMail->From = $fromaddress;                            // FROM:
 			$myMail->AddReplyTo($fromaddress);                       // REPLY TO:
 		}
Index: trunk/wb/framework/class.wbmailer.php
===================================================================
--- trunk/wb/framework/class.wbmailer.php	(revision 637)
+++ trunk/wb/framework/class.wbmailer.php	(revision 638)
@@ -89,12 +89,14 @@
 			$this->CharSet='utf-8';
 		}
 
-		// set default sender name
-		if (isset($_SESSION['DISPLAY_NAME'])) {
-			$this->FromName = $_SESSION['DISPLAY_NAME'];            // FROM NAME: display name of user logged in
-		} else {
-			$this->FromName = $db_wbmailer_default_sendername;			// FROM NAME: set default name
-		}
+		// set default sender name
+		if($this->FromName == 'Root User') {
+			if(isset($_SESSION['DISPLAY_NAME'])) {
+				$this->FromName = $_SESSION['DISPLAY_NAME'];            // FROM NAME: display name of user logged in
+			} else {
+				$this->FromName = $db_wbmailer_default_sendername;			// FROM NAME: set default name
+			}
+		}
 
 		/* 
 			some mail provider (lets say mail.com) reject mails send out by foreign mail 
Index: trunk/wb/modules/form/install.php
===================================================================
--- trunk/wb/modules/form/install.php	(revision 637)
+++ trunk/wb/modules/form/install.php	(revision 638)
@@ -53,10 +53,12 @@
 		. ' `footer` TEXT NOT NULL ,'
 		. ' `email_to` TEXT NOT NULL ,'
 		. ' `email_from` VARCHAR(255) NOT NULL DEFAULT \'\' ,'
+		. ' `email_fromname` VARCHAR(255) NOT NULL DEFAULT \'\' ,'
 		. ' `email_subject` VARCHAR(255) NOT NULL DEFAULT \'\' ,'
 		. ' `success_page` TEXT NOT NULL ,'
 		. ' `success_email_to` TEXT NOT NULL ,'
 		. ' `success_email_from` VARCHAR(255) NOT NULL DEFAULT \'\' ,'
+		. ' `success_email_fromname` VARCHAR(255) NOT NULL DEFAULT \'\' ,'
 		. ' `success_email_text` TEXT NOT NULL ,'
 		. ' `success_email_subject` VARCHAR(255) NOT NULL DEFAULT \'\' ,'
 		. ' `stored_submissions` INT NOT NULL DEFAULT \'0\' ,'
Index: trunk/wb/modules/form/modify_settings.php
===================================================================
--- trunk/wb/modules/form/modify_settings.php	(revision 637)
+++ trunk/wb/modules/form/modify_settings.php	(revision 638)
@@ -151,6 +151,12 @@
 		</td>
 	</tr>
 	<tr>
+		<td class="setting_name"><?php echo $TEXT['EMAIL'].' '.$TEXT['NAME']; ?>:</td>
+		<td class="setting_name">
+			<input type="text" name="email_fromname" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['email_fromname'])); ?>" />
+		</td>
+	</tr>
+	<tr>
 		<td class="setting_name"><?php echo $TEXT['EMAIL'].' '.$TEXT['SUBJECT']; ?>:</td>
 		<td class="setting_name">
 			<input type="text" name="email_subject" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['email_subject'])); ?>" />
@@ -190,6 +196,12 @@
 		</td>
 	</tr>
 	<tr>
+		<td class="setting_name"><?php echo $TEXT['EMAIL'].' '.$TEXT['NAME']; ?>:</td>
+		<td class="setting_name">
+			<input type="text" name="success_email_fromname" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['success_email_fromname'])); ?>" />
+		</td>
+	</tr>
+	<tr>
 		<td class="setting_name"><?php echo $TEXT['EMAIL'].' '.$TEXT['SUBJECT']; ?>:</td>
 		<td class="setting_name">
 			<input type="text" name="success_email_subject" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['success_email_subject'])); ?>" />
Index: trunk/wb/modules/form/view.php
===================================================================
--- trunk/wb/modules/form/view.php	(revision 637)
+++ trunk/wb/modules/form/view.php	(revision 638)
@@ -340,6 +340,7 @@
 				// Set the email from field to what the user entered in the specified field
 				$email_from = $wb->add_slashes($_POST[$email_from]);
 			}
+			$email_fromname = $fetch_settings['email_fromname'];
 			$email_subject = $fetch_settings['email_subject'];
 			$success_page = $fetch_settings['success_page'];
 			$success_email_to = $fetch_settings['success_email_to'];
@@ -348,6 +349,7 @@
 				$success_email_to = $wb->add_slashes($_POST[$success_email_to]);
 			}
 			$success_email_from = $fetch_settings['success_email_from'];
+			$success_email_fromname = $fetch_settings['success_email_fromname'];
 			$success_email_text = $fetch_settings['success_email_text'];
 			$success_email_subject = $fetch_settings['success_email_subject'];		
 			$max_submissions = $fetch_settings['max_submissions'];
@@ -445,11 +447,11 @@
 					// Now send the email
 					if($email_to != '') {
 						if($email_from != '') {
-							if($wb->mail($email_from,$email_to,$email_subject,$email_body)) {
+							if($wb->mail($email_from,$email_to,$email_subject,$email_body,$email_fromname)) {
 								$success = true;
 							}
 						} else {
-							if($wb->mail('',$email_to,$email_subject,$email_body)) { 
+							if($wb->mail('',$email_to,$email_subject,$email_body,$email_fromname)) { 
 								$success = true; 
 							}
 						}
@@ -456,11 +458,11 @@
 					}				
 					if($success_email_to != '') {
 						if($success_email_from != '') {
-							if($wb->mail($success_email_from,$success_email_to,$success_email_subject,$success_email_text)) {
+							if($wb->mail($success_email_from,$success_email_to,$success_email_subject,$success_email_text,$success_email_fromname)) {
 								$success = true;
 							}
 						} else {
-							if($wb->mail('',$success_email_to,$success_email_subject,$success_email_text)) {
+							if($wb->mail('',$success_email_to,$success_email_subject,$success_email_text,$success_email_fromname)) {
 								$success = true;
 							}
 						}
Index: trunk/wb/modules/form/save_settings.php
===================================================================
--- trunk/wb/modules/form/save_settings.php	(revision 637)
+++ trunk/wb/modules/form/save_settings.php	(revision 638)
@@ -47,10 +47,12 @@
 } else {
 	$email_from = $admin->add_slashes($_POST['email_from_field']);
 }
+$email_fromname = $admin->add_slashes($_POST['email_fromname']);
 $email_subject = $admin->add_slashes($_POST['email_subject']);
 $success_page = $_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_fromname = $admin->add_slashes($_POST['success_email_fromname']);
 $success_email_text = $admin->add_slashes($_POST['success_email_text']);
 $success_email_subject = $admin->add_slashes($_POST['success_email_subject']);
 if(!is_numeric($_POST['max_submissions'])) {
@@ -69,7 +71,7 @@
 }
 
 // Update settings
-$database->query("UPDATE ".TABLE_PREFIX."mod_form_settings SET header = '$header', field_loop = '$field_loop', footer = '$footer', email_to = '$email_to', email_from = '$email_from', email_subject = '$email_subject', success_page = '$success_page', success_email_to = '$success_email_to', success_email_from = '$success_email_from', success_email_text = '$success_email_text', success_email_subject = '$success_email_subject', max_submissions = '$max_submissions', stored_submissions = '$stored_submissions', use_captcha = '$use_captcha' WHERE section_id = '$section_id'");
+$database->query("UPDATE ".TABLE_PREFIX."mod_form_settings SET header = '$header', field_loop = '$field_loop', footer = '$footer', email_to = '$email_to', email_from = '$email_from', email_fromname = '$email_fromname', email_subject = '$email_subject', success_page = '$success_page', success_email_to = '$success_email_to', success_email_from = '$success_email_from', success_email_fromname = '$success_email_fromname', success_email_text = '$success_email_text', success_email_subject = '$success_email_subject', max_submissions = '$max_submissions', stored_submissions = '$stored_submissions', use_captcha = '$use_captcha' WHERE section_id = '$section_id'");
 
 // Check if there is a db error, otherwise say successful
 if($database->is_error()) {
Index: trunk/wb/modules/form/add.php
===================================================================
--- trunk/wb/modules/form/add.php	(revision 637)
+++ trunk/wb/modules/form/add.php	(revision 638)
@@ -39,10 +39,12 @@
 </table>';
 $email_to = $admin->get_email();
 $email_from = '';
+$email_fromname = '';
 $email_subject = 'Results from form on website...';
 $success_page = 'none';
 $success_email_to = '';
 $success_email_from = $admin->get_email();
+$success_email_fromname = '';
 $success_email_text = 'Thank you for submitting your form on '.WEBSITE_TITLE;
 $success_email_text = addslashes($success_email_text);
 $success_email_subject = 'You have submitted a form';
@@ -49,6 +51,6 @@
 $max_submissions = 50;
 $stored_submissions = 50;
 $use_captcha = true;
-$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id,header,field_loop,footer,email_to,email_from,email_subject,success_page,success_email_to,success_email_from,success_email_text,success_email_subject,max_submissions,stored_submissions,use_captcha) VALUES ('$page_id','$section_id','$header','$field_loop','$footer','$email_to','$email_from','$email_subject','$success_page','$success_email_to','$success_email_from','$success_email_text','$success_email_subject','$max_submissions','$stored_submissions','$use_captcha')");
+$database->query("INSERT INTO ".TABLE_PREFIX."mod_form_settings (page_id,section_id,header,field_loop,footer,email_to,email_from,email_fromname,email_subject,success_page,success_email_to,success_email_from,success_email_fromname,success_email_text,success_email_subject,max_submissions,stored_submissions,use_captcha) VALUES ('$page_id','$section_id','$header','$field_loop','$footer','$email_to','$email_from','$email_fromname','$email_subject','$success_page','$success_email_to','$success_email_from','$success_email_fromname','$success_email_text','$success_email_subject','$max_submissions','$stored_submissions','$use_captcha')");
 
 ?>
\ No newline at end of file