Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1572)
+++ branches/2.8.x/CHANGELOG	(revision 1573)
@@ -11,6 +11,10 @@
 ! = Update/Change
 
 =========================== add small Features 2.8.2 ==========================
+16 Jan-2012 Build 1573 Dietmar Woellbrink (Luisehahne)
++ add automatically generated e-mail language form variable
+! send confirmation mail with details to superadmin from SERVER_EMAIL
+! send confirmation mail without details to sender from SERVER_EMAIL
 14 Jan-2012 Build 1572 Dietmar Woellbrink (Luisehahne)
 ! security fix, force SMTP Authentifikation
 ! server and email settings only for superadmin
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1572)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1573)
@@ -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', '1572');
+if(!defined('REVISION')) define('REVISION', '1573');
 if(!defined('SP')) define('SP', 'SP2');
Index: branches/2.8.x/wb/languages/EN.php
===================================================================
--- branches/2.8.x/wb/languages/EN.php	(revision 1572)
+++ branches/2.8.x/wb/languages/EN.php	(revision 1573)
@@ -540,7 +540,7 @@
 $MESSAGE['MEDIA_TARGET_DOT_DOT_SLASH'] = 'Cannot have ../ in the folder target';
 $MESSAGE['MEDIA_UPLOADED'] = ' files were successfully uploaded';
 $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
-$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: <a href="mailto:'.'.SERVER_EMAIL.'.'">'.'.SERVER_EMAIL.'.'</a>';
+$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email: <a href="mailto:'.SERVER_EMAIL.'">'.SERVER_EMAIL.'</a>';
 $MESSAGE['MOD_FORM_REQUIRED_FIELDS'] = 'You must enter details for the following fields';
 $MESSAGE['PAGES_ADDED'] = 'Page added successfully';
 $MESSAGE['PAGES_ADDED_HEADING'] = 'Page heading added successfully';
Index: branches/2.8.x/wb/modules/form/modify_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/modify_settings.php	(revision 1573)
@@ -24,7 +24,7 @@
 require(WB_PATH.'/modules/admin.php');
 
 // include core functions of WB 2.7 to edit the optional module CSS files (frontend.css, backend.css)
-@include_once(WB_PATH .'/framework/module.functions.php');
+include_once(WB_PATH .'/framework/module.functions.php');
 
 // load module language file
 $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
@@ -32,18 +32,30 @@
 
 $sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
 
+if (!function_exists('emailAdmin')) {
+	function emailAdmin() {
+		global $database,$admin;
+        $retval = $admin->get_email();
+        if($admin->get_user_id()!='1') {
+			$sql  = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ';
+			$sql .= 'WHERE `user_id`=\'1\' ';
+	        $retval = $database->get_one($sql);
+        }
+		return $retval;
+	}
+}
+
 // Get Settings from DB
 $sql  = 'SELECT * FROM '.TABLE_PREFIX.'mod_form_settings ';
 $sql .= 'WHERE `section_id` = '.(int)$section_id.'';
 if($query_content = $database->query($sql)) {
 	$setting = $query_content->fetchRow(MYSQL_ASSOC);
-	$setting['email_to'] = ($setting['email_to'] != '' ? $setting['email_to'] : SERVER_EMAIL);
-	$setting['email_subject'] = ($setting['email_subject']  != '') ? $setting['email_subject'] : $MOD_FORM['EMAIL_SUBJECT'];
-	$setting['success_email_subject'] = ($setting['success_email_subject']  != '') ? $setting['success_email_subject'] : $MOD_FORM['SUCCESS_EMAIL_SUBJECT'];
+	$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_fromname'] = ($setting['success_email_fromname'] != '' ? $setting['success_email_fromname'] : WBMAILER_DEFAULT_SENDERNAME);
-	$setting['success_email_subject'] = ($setting['success_email_subject']  != '') ? $setting['success_email_subject'] : $MOD_FORM['SUCCESS_EMAIL_SUBJECT'];
-
+	$setting['success_email_subject'] = ($setting['success_email_subject']  != '') ? $setting['success_email_subject'] : '';
 }
 
 // Set raw html <'s and >'s to be replace by friendly html code
@@ -124,13 +136,13 @@
 		<td colspan="2"><strong><?php echo $TEXT['EMAIL'].' '.$TEXT['SETTINGS']; ?></strong></td>
 	</tr>
 	<tr>
-		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_TEXT['TO']; ?>:</td>
+		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['TO']; ?>:</td>
 		<td class="frm-setting_value">
 			<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_TEXT['FROM']; ?>:</td>
+		<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>
@@ -190,14 +202,18 @@
 			<input type="text" name="email_subject" style="width: 98%;" maxlength="255" value="<?php echo str_replace($raw, $friendly, ($setting['email_subject'])); ?>" />
 		</td>
 	</tr>
-</table>	
+	<tr><td>&nbsp;</td></tr>
+</table>
 <!-- Erfolgreich Optionen -->
-<table summary="<?php echo $TEXT['SUCCESS'].' '.$TEXT['SETTINGS']; ?>" class="row_a" cellpadding="2" cellspacing="0" border="0" width="100%" style="margin-top: 3px;">
+<table summary="<?php echo $TEXT['EMAIL'].' '.$MOD_FORM['CONFIRM']; ?>" class="row_a" cellpadding="2" cellspacing="0" border="0" width="100%" style="margin-top: 3px;">
+	<thead>
 	<tr>
-		<td colspan="2"><strong><?php echo $TEXT['SUCCESS'].' '.$TEXT['SETTINGS']; ?></strong></td>
+		<th colspan="2"><strong><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['CONFIRM']; ?></strong></th>
 	</tr>
+	</thead>
+	<tbody>
 	<tr>
-		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_TEXT['TO']; ?>:</td>
+		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_FORM['TO']; ?>:</td>
 		<td class="frm-setting_value">
 			<select name="success_email_to" style="width: 98%;">
 			<option value="" onclick="javascript: document.getElementById('success_email_to').style.display = 'block';"><?php echo $TEXT['NONE']; ?></option>
@@ -223,7 +239,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td class="frm-setting_name"><?php echo $TEXT['EMAIL'].' '.$MOD_TEXT['FROM']; ?>:</td>
+		<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>
@@ -272,6 +288,7 @@
 			</select>
 		</td>
 	</tr>
+	</tbody>
 </table>
 
 <table summary="" cellpadding="0" cellspacing="0" border="0" width="100%">
Index: branches/2.8.x/wb/modules/form/view.php
===================================================================
--- branches/2.8.x/wb/modules/form/view.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/view.php	(revision 1573)
@@ -27,6 +27,8 @@
 // load module language file
 $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
 require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
+
+include_once(WB_PATH .'/framework/functions.php');
 /*
 function removebreaks($value) {
 	return trim(preg_replace('=((<CR>|<LF>|0x0A/%0A|0x0D/%0D|\\n|\\r)\S).*=i', null, $value));
@@ -35,6 +37,21 @@
 	return $value === removebreaks($value);
 }
 */
+
+if (!function_exists('emailAdmin')) {
+	function emailAdmin() {
+		global $database,$admin;
+        $retval = $admin->get_email();
+        if($admin->get_user_id()!='1') {
+			$sql  = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ';
+			$sql .= 'WHERE `user_id`=\'1\' ';
+	        $retval = $database->get_one($sql);
+
+        }
+		return $retval;
+	}
+}
+
 // Function for generating an optionsfor a select field
 if (!function_exists('make_option')) {
 	function make_option(&$n, $k, $values) {
@@ -268,7 +285,8 @@
 			if($query_settings->numRows() > 0) {
 				$fetch_settings = $query_settings->fetchRow(MYSQL_ASSOC);
 
-				$email_to = $fetch_settings['email_to'];
+				// $email_to = $fetch_settings['email_to'];
+				$email_to = (($fetch_settings['email_to'] != '') ? $fetch_settings['email_to'] : emailAdmin());
 				$email_from = $fetch_settings['email_from'];
 				if(substr($email_from, 0, 5) == 'field') {
 					// Set the email from field to what the user entered in the specified field
@@ -279,9 +297,9 @@
 					// Set the email_fromname to field to what the user entered in the specified field
 					$email_fromname = htmlspecialchars($wb->add_slashes($_POST[$email_fromname]));
 				}
-				$email_subject = $fetch_settings['email_subject'];
+				$email_subject = (($fetch_settings['email_subject'] != '') ? $fetch_settings['email_subject'] : $MOD_FORM['EMAIL_SUBJECT']);
 				$success_page = $fetch_settings['success_page'];
-				$success_email_to = $fetch_settings['success_email_to'];
+				$success_email_to = (($fetch_settings['success_email_to'] != '') ? $fetch_settings['success_email_to'] : '');
 				if(substr($success_email_to, 0, 5) == 'field') {
 					// 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]));
@@ -290,7 +308,7 @@
 				$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']);
-				$success_email_subject = $fetch_settings['success_email_subject'];
+				$success_email_subject = (($fetch_settings['success_email_subject'] != '') ? $fetch_settings['success_email_subject'] : $MOD_FORM['SUCCESS_EMAIL_SUBJECT']);
 				$max_submissions = $fetch_settings['max_submissions'];
 				$stored_submissions = $fetch_settings['stored_submissions'];
 				$use_captcha = $fetch_settings['use_captcha'];
@@ -306,12 +324,14 @@
 		// Captcha
 		if($use_captcha) {
 			if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){
-				// Check for a mismatch
+				// Check for a mismatch get email user_id
 				if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) {
-					$captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'];
+					$replace = array('webmaster_email' => emailAdmin() );
+					$captcha_error = replace_vars($MOD_FORM['INCORRECT_CAPTCHA'], array('webmaster_email'=>emailAdmin()));
 				}
 			} else {
-				$captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA'];
+				$replace = array('webmaster_email'=>emailAdmin() );
+				$captcha_error = replace_vars($MOD_FORM['INCORRECT_CAPTCHA'],$replace );
 			}
 		}
 		if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); }
@@ -334,7 +354,7 @@
 								$_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("&#91;&#91;", "&#93;&#93;"), htmlspecialchars($_POST['field'.$field['field_id']]));
 							}
 							if($field['type'] == 'email' AND $admin->validate_email($_POST['field'.$field['field_id']]) == false) {
-								$email_error = $MESSAGE['USERS']['INVALID_EMAIL'];
+								$email_error = $MESSAGE['USERS_INVALID_EMAIL'];
 							}
 							if($field['type'] == 'heading') {
 								$email_body .= $_POST['field'.$field['field_id']]."\n\n";
@@ -401,12 +421,13 @@
 					} else {
 						// Adding the IP to the body and try to send the email
 						// $email_body .= "\n\nIP: ".$_SERVER['REMOTE_ADDR'];
+
 						$recipient = preg_replace( "/[^a-z0-9 !?:;,.\/_\-=+@#$&\*\(\)]/im", "", $email_fromname );
 						$email_fromname = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $recipient );
 						$email_body = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $email_body );
 						if($email_to != '') {
 							if($email_from != '') {
-								if($wb->mail($email_from,$email_to,$email_subject,$email_body,$email_fromname)) {
+								if($wb->mail(SERVER_EMAIL,$email_to,$email_subject,$email_body,$email_fromname)) {
 									$success = true;
 								}
 							} else {
@@ -421,11 +442,11 @@
 						$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,$success_email_fromname)) {
+								if($wb->mail($success_email_from,$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname)) {
 									$success = true;
 								}
 							} else {
-								if($wb->mail('',$success_email_to,$success_email_subject,$success_email_text,$success_email_fromname)) {
+								if($wb->mail('',$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname)) {
 									$success = true;
 								}
 							}
@@ -478,7 +499,8 @@
 	// Now check if the email was sent successfully
 	if(isset($success) AND $success == true) {
 	   if ($success_page=='none') {
-			echo str_replace("\n","<br />",$success_email_text);
+			echo str_replace("\n","<br />",($success_email_text));
+				echo '<p>&nbsp;</p>'.PHP_EOL.'<p><a href="'.htmlspecialchars(strip_tags($_SERVER['SCRIPT_NAME'])).'">'.$TEXT['BACK'].'</a></p>'.PHP_EOL;
   		} else {
 			$query_menu = $database->query("SELECT link,target FROM ".TABLE_PREFIX."pages WHERE `page_id` = '$success_page'");
 			if($query_menu->numRows() > 0) {
Index: branches/2.8.x/wb/modules/form/delete_submission.php
===================================================================
--- branches/2.8.x/wb/modules/form/delete_submission.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/delete_submission.php	(revision 1573)
@@ -24,11 +24,13 @@
 // Get id
 $submission_id = intval($admin->checkIDKEY('submission_id', false, 'GET'));
 if (!$submission_id) {
- $admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
+	$admin->clearIDKEY();
+	$admin->print_error($MESSAGE['GENERIC_SECURITY_ACCESS'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id);
 }
 
 // Delete row
 $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'");
+	$admin->clearIDKEY();
 
 // Check if there is a db error, otherwise say successful
 if($database->is_error()) {
Index: branches/2.8.x/wb/modules/form/save_settings.php
===================================================================
--- branches/2.8.x/wb/modules/form/save_settings.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/save_settings.php	(revision 1573)
@@ -32,6 +32,19 @@
 
 $sec_anchor = (defined( 'SEC_ANCHOR' ) && ( SEC_ANCHOR != '' )  ? '#'.SEC_ANCHOR.$section['section_id'] : '' );
 
+if (!function_exists('emailAdmin')) {
+	function emailAdmin() {
+		global $database,$admin;
+        $retval = $admin->get_email();
+        if($admin->get_user_id()!='1') {
+			$sql  = 'SELECT `email` FROM `'.TABLE_PREFIX.'users` ';
+			$sql .= 'WHERE `user_id`=\'1\' ';
+	        $retval = $database->get_one($sql);
+        }
+		return $retval;
+	}
+}
+
 // load module language file
 $lang = (dirname(__FILE__)) . '/languages/' . LANGUAGE . '.php';
 require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang );
@@ -43,7 +56,7 @@
 $field_loop = $admin->add_slashes($_POST['field_loop']);
 $footer = $admin->add_slashes($_POST['footer']);
 $email_to = $admin->add_slashes($_POST['email_to']);
-$email_to = ($email_to != '' ? $email_to : SERVER_EMAIL);
+$email_to = ($email_to != '' ? $email_to : emailAdmin());
 $use_captcha = $admin->add_slashes($_POST['use_captcha']);
 
 if( isset($_POST['email_from_field']) && ($_POST['email_from_field'] != '')) {
@@ -59,7 +72,7 @@
 }
 
 $email_subject = $admin->add_slashes($_POST['email_subject']);
-$email_subject = ($email_subject  != '') ? $email_subject : $MOD_FORM['EMAIL_SUBJECT'];
+$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']);
@@ -66,9 +79,9 @@
 $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']);
-$success_email_text = (($success_email_text != '') ? $success_email_text : $MOD_FORM['SUCCESS_EMAIL_TEXT']);
+$success_email_text = (($success_email_text != '') ? $success_email_text : '');
 $success_email_subject = $admin->add_slashes($_POST['success_email_subject']);
-$success_email_subject = ($success_email_subject  != '') ? $success_email_subject : $MOD_FORM['SUCCESS_EMAIL_SUBJECT'];
+$success_email_subject = (($success_email_subject  != '') ? $success_email_subject : '');
 
 if(!is_numeric($_POST['max_submissions'])) {
 	$max_submissions = 50;
Index: branches/2.8.x/wb/modules/form/languages/NL.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/NL.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/languages/NL.php	(revision 1573)
@@ -1,28 +1,29 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL: svn://isteam.dynxs.de/wb_svn/wb280/branches/2.8.x/wb/modules/form/view.php $
+ * @lastmodified    $Date: 2011-12-31 16:03:03 +0100 (Sa, 31. Dez 2011) $
+ * @description
+ */
 
-// $Id$
+// Must include code to stop this file being access directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
-/*
-
- 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
-
-*/
-
 //Modul Description
 $module_description = 'Deze module makt het mogelijk om aangepaste online formulieren te maken zoals een feedback formulier. Met dank aan Rudolph Lartey voor het aanpassen van deze module.';
 
@@ -31,8 +32,19 @@
 $MOD_FORM['CONFIRM'] = 'Confirmation';
 $MOD_FORM['SUBMIT_FORM'] = 'Submit';
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from '.WEBSITE_TITLE;
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE;
 
-$MOD_TEXT['FROM'] = 'Sender';
-$MOD_TEXT['TO'] = 'Recipient';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
+$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = PHP_EOL.PHP_EOL.PHP_EOL
+.'****************************************************************************'.PHP_EOL
+.'This is an automatically generated e-mail. The sender\'s address of this e-mail'.PHP_EOL
+.'is furnished only for dispatch, not to receive messages!'.PHP_EOL
+.'If you have received this e-mail by mistake, please contact us and delete this message'.PHP_EOL
+.'****************************************************************************'.PHP_EOL;
+
+$MOD_FORM['FROM'] = 'Sender';
+$MOD_FORM['TO'] = 'Recipient';
+
+$MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
+$MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+$MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
Index: branches/2.8.x/wb/modules/form/languages/NO.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/NO.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/languages/NO.php	(revision 1573)
@@ -1,38 +1,50 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL: svn://isteam.dynxs.de/wb_svn/wb280/branches/2.8.x/wb/modules/form/view.php $
+ * @lastmodified    $Date: 2011-12-31 16:03:03 +0100 (Sa, 31. Dez 2011) $
+ * @description
+ */
 
-// $Id$
+// Must include code to stop this file being access directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
-/*
-
- 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
-
-*/
-
 //Modul Description
 $module_description = 'Med denne modulen kan du lage d&iacute;ne egne spesialtilpassede elektroniske skjemaer, som for eksempe et tilbakemeldings skjema. En stor takk til Rudolph Lartey for hjelpen med &aring; videreutvikkle denne modulen, og for bidrag med koding av ekstra felt typer , osv.';
-  
+
 //Variables for the  backend
 $MOD_FORM['SETTINGS'] = 'Form Settings';
 $MOD_FORM['CONFIRM'] = 'Confirmation';
 $MOD_FORM['SUBMIT_FORM'] = 'Submit';
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from '.WEBSITE_TITLE;
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE;
 
-$MOD_TEXT['FROM'] = 'Sender';
-$MOD_TEXT['TO'] = 'Recipient';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
+$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = PHP_EOL.PHP_EOL.PHP_EOL
+.'****************************************************************************'.PHP_EOL
+.'This is an automatically generated e-mail. The sender\'s address of this e-mail'.PHP_EOL
+.'is furnished only for dispatch, not to receive messages!'.PHP_EOL
+.'If you have received this e-mail by mistake, please contact us and delete this message'.PHP_EOL
+.'****************************************************************************'.PHP_EOL;
+
+$MOD_FORM['FROM'] = 'Sender';
+$MOD_FORM['TO'] = 'Recipient';
+
+$MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
+$MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+$MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
Index: branches/2.8.x/wb/modules/form/languages/EN.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/EN.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/languages/EN.php	(revision 1573)
@@ -1,28 +1,29 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL: svn://isteam.dynxs.de/wb_svn/wb280/branches/2.8.x/wb/modules/form/view.php $
+ * @lastmodified    $Date: 2011-12-31 16:03:03 +0100 (Sa, 31. Dez 2011) $
+ * @description
+ */
 
-// $Id$
+// Must include code to stop this file being access directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
-/*
-
- 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
-
-*/
-
 //Modul Description
 $module_description = 'This module allows you to create customised online forms, such as a feedback form. Thank-you to Rudolph Lartey who help enhance this module, providing code for extra field types, etc.';
 
@@ -31,8 +32,19 @@
 $MOD_FORM['CONFIRM'] = 'Confirmation';
 $MOD_FORM['SUBMIT_FORM'] = 'Submit';
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from '.WEBSITE_TITLE;
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE;
 
-$MOD_TEXT['FROM'] = 'Sender';
-$MOD_TEXT['TO'] = 'Recipient';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
+$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = PHP_EOL.PHP_EOL.PHP_EOL
+.'****************************************************************************'.PHP_EOL
+.'This is an automatically generated e-mail. The sender\'s address of this e-mail'.PHP_EOL
+.'is furnished only for dispatch, not to receive messages!'.PHP_EOL
+.'If you have received this e-mail by mistake, please contact us and delete this message'.PHP_EOL
+.'****************************************************************************'.PHP_EOL;
+
+$MOD_FORM['FROM'] = 'Sender';
+$MOD_FORM['TO'] = 'Recipient';
+
+$MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
+$MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+$MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
Index: branches/2.8.x/wb/modules/form/languages/DA.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/DA.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/languages/DA.php	(revision 1573)
@@ -1,28 +1,29 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL: svn://isteam.dynxs.de/wb_svn/wb280/branches/2.8.x/wb/modules/form/view.php $
+ * @lastmodified    $Date: 2011-12-31 16:03:03 +0100 (Sa, 31. Dez 2011) $
+ * @description
+ */
 
-// $Id$
+// Must include code to stop this file being access directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
-/*
-
- 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
-
-*/
-
 //Modul Description
 $module_description = 'Dette modul giver mulighed for at lave tilpassede online formularer, f.eks. en kontaktformular. Tak til  Rudolph Lartey som har hjulpet med at forbedre dette modul ved at lave kode for ekstra felttyper osv.';
 
@@ -31,10 +32,19 @@
 $MOD_FORM['CONFIRM'] = 'Confirmation';
 $MOD_FORM['SUBMIT_FORM'] = 'Submit';
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from '.WEBSITE_TITLE;
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE;
 
-$MOD_TEXT['FROM'] = 'Sender';
-$MOD_TEXT['TO'] = 'Recipient';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
+$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = PHP_EOL.PHP_EOL.PHP_EOL
+.'****************************************************************************'.PHP_EOL
+.'This is an automatically generated e-mail. The sender\'s address of this e-mail'.PHP_EOL
+.'is furnished only for dispatch, not to receive messages!'.PHP_EOL
+.'If you have received this e-mail by mistake, please contact us and delete this message'.PHP_EOL
+.'****************************************************************************'.PHP_EOL;
 
+$MOD_FORM['FROM'] = 'Sender';
+$MOD_FORM['TO'] = 'Recipient';
 
+$MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
+$MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+$MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
Index: branches/2.8.x/wb/modules/form/languages/RU.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/RU.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/languages/RU.php	(revision 1573)
@@ -1,28 +1,29 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL: svn://isteam.dynxs.de/wb_svn/wb280/branches/2.8.x/wb/modules/form/view.php $
+ * @lastmodified    $Date: 2011-12-31 16:03:03 +0100 (Sa, 31. Dez 2011) $
+ * @description
+ */
 
-// $Id$
+// Must include code to stop this file being access directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
-/*
-
- 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
-
-*/
-
 //Modul Description
 $module_description = '&#1052;&#1086;&#1076;&#1091;&#1083;&#1100; &#1087;&#1086;&#1079;&#1074;&#1086;&#1083;&#1103;&#1077;&#1090; &#1089;&#1086;&#1079;&#1076;&#1072;&#1074;&#1072;&#1090;&#1100; &#1088;&#1072;&#1079;&#1083;&#1080;&#1095;&#1085;&#1099;&#1077; &#1085;&#1072;&#1089;&#1090;&#1088;&#1072;&#1080;&#1074;&#1072;&#1077;&#1084;&#1099;&#1077; &#1092;&#1086;&#1088;&#1084;&#1099;, &#1085;&#1072;&#1087;&#1088;&#1080;&#1084;&#1077;&#1088; &#1092;&#1086;&#1088;&#1084;&#1099; &#1086;&#1073;&#1088;&#1072;&#1090;&#1085;&#1086;&#1081; &#1089;&#1074;&#1103;&#1079;&#1080;. Rudolph Lartey &#1087;&#1086;&#1084;&#1086;&#1075; &#1091;&#1083;&#1091;&#1095;&#1096;&#1080;&#1090;&#1100; &#1076;&#1072;&#1085;&#1085;&#1099;&#1081; &#1084;&#1086;&#1076;&#1091;&#1083;&#1100;.';
 
@@ -31,8 +32,19 @@
 $MOD_FORM['CONFIRM'] = 'Confirmation';
 $MOD_FORM['SUBMIT_FORM'] = 'Submit';
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from '.WEBSITE_TITLE;
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE;
 
-$MOD_TEXT['FROM'] = 'Sender';
-$MOD_TEXT['TO'] = 'Recipient';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
+$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = PHP_EOL.PHP_EOL.PHP_EOL
+.'****************************************************************************'.PHP_EOL
+.'This is an automatically generated e-mail. The sender\'s address of this e-mail'.PHP_EOL
+.'is furnished only for dispatch, not to receive messages!'.PHP_EOL
+.'If you have received this e-mail by mistake, please contact us and delete this message'.PHP_EOL
+.'****************************************************************************'.PHP_EOL;
+
+$MOD_FORM['FROM'] = 'Sender';
+$MOD_FORM['TO'] = 'Recipient';
+
+$MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
+$MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+$MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
Index: branches/2.8.x/wb/modules/form/languages/FR.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/FR.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/languages/FR.php	(revision 1573)
@@ -1,32 +1,30 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL: svn://isteam.dynxs.de/wb_svn/wb280/branches/2.8.x/wb/modules/form/view.php $
+ * @lastmodified    $Date: 2011-12-31 16:03:03 +0100 (Sa, 31. Dez 2011) $
+ * @description
+ */
 
-// $Id$
+// Must include code to stop this file being access directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
-/*
-
- 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
-
-
- -----------------------------------------------------------------------------------------
-  FRENCH LANGUAGE FILE FOR THE MODULE: FORM
- -----------------------------------------------------------------------------------------
-*/
-//Module Description
+//Modul Description
 $module_description = 'This module allows you to create customised online forms, such as a feedback form. Thank-you to Rudolph Lartey who help enhance this module, providing code for extra field types, etc.';
 
 //Variables for the  backend
@@ -34,8 +32,19 @@
 $MOD_FORM['CONFIRM'] = 'Confirmation';
 $MOD_FORM['SUBMIT_FORM'] = 'Submit';
 $MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from '.WEBSITE_TITLE;
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE;
 
-$MOD_TEXT['FROM'] = 'Sender';
-$MOD_TEXT['TO'] = 'Recipient';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message from '.WEBSITE_TITLE;
+$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = PHP_EOL.PHP_EOL.PHP_EOL
+.'****************************************************************************'.PHP_EOL
+.'This is an automatically generated e-mail. The sender\'s address of this e-mail'.PHP_EOL
+.'is furnished only for dispatch, not to receive messages!'.PHP_EOL
+.'If you have received this e-mail by mistake, please contact us and delete this message'.PHP_EOL
+.'****************************************************************************'.PHP_EOL;
+
+$MOD_FORM['FROM'] = 'Sender';
+$MOD_FORM['TO'] = 'Recipient';
+
+$MOD_FORM['EXCESS_SUBMISSIONS'] = 'Sorry, this form has been submitted too many times so far this hour. Please retry in the next hour.';
+$MOD_FORM['INCORRECT_CAPTCHA'] = 'The verification number (also known as Captcha) that you entered is incorrect. If you are having problems reading the Captcha, please email to the <a href="mailto:{{webmaster_email}}">webmaster</a>';
+$MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields';
Index: branches/2.8.x/wb/modules/form/languages/DE.php
===================================================================
--- branches/2.8.x/wb/modules/form/languages/DE.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/languages/DE.php	(revision 1573)
@@ -1,28 +1,29 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         Form
+ * @author          WebsiteBaker Project
+ * @copyright       2009-2011, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.8.x
+ * @requirements    PHP 5.2.2 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL: svn://isteam.dynxs.de/wb_svn/wb280/branches/2.8.x/wb/modules/form/view.php $
+ * @lastmodified    $Date: 2011-12-31 16:03:03 +0100 (Sa, 31. Dez 2011) $
+ * @description
+ */
 
-// $Id$
+// Must include code to stop this file being access directly
+/* -------------------------------------------------------- */
+if(defined('WB_PATH') == false)
+{
+	// Stop this file being access directly
+	die('<head><title>Access denied</title></head><body><h2 style="color:red;margin:3em auto;text-align:center;">Cannot access this file directly</h2></body></html>');
+}
+/* -------------------------------------------------------- */
 
-/*
-
- 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
-
-*/
-
 //Modulbeschreibung
 $module_description = 'Mit diesem Modul k&ouml;nnen sie ein beliebiges Formular f&uuml;r ihre Seite erzeugen';
 
@@ -31,8 +32,20 @@
 $MOD_FORM['CONFIRM'] = 'Best&auml;tigung';
 $MOD_FORM['SUBMIT_FORM'] = 'Absenden';
 $MOD_FORM['EMAIL_SUBJECT'] = 'Erhalten einer Nachricht von '.WEBSITE_TITLE;
-$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'E-Mail wurde erfolgreich &uuml;ber '.WEBSITE_TITLE.' gesendet!';
 $MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'Sie haben ein Forumlar an '.WEBSITE_TITLE.' gesendet';
 
-$MOD_TEXT['FROM'] = 'Absender';
-$MOD_TEXT['TO'] = 'Empf&auml;nger';
+$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Vielen Dank f&uuml;r die &Uuml;bermittlung Ihrer Nachricht von '.WEBSITE_TITLE.'';
+$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = PHP_EOL.PHP_EOL.PHP_EOL
+.'*************************************************************'.PHP_EOL
+.'Dies ist eine automatisch generierte E-Mail. Die Absenderadresse dieser E-Mail'.PHP_EOL
+.'ist nur zum Versand, und nicht zum Empfang von Nachrichten eingerichtet!'.PHP_EOL
+.'Falls Sie diese E-Mail versehentlich erhalten haben, setzen Sie sich bitte'.PHP_EOL
+.'mit uns in Verbindung und l&ouml;schen diese Nachricht von Ihrem Computer.'.PHP_EOL
+.'**************************************************************'.PHP_EOL;
+
+$MOD_FORM['FROM'] = 'Absender';
+$MOD_FORM['TO'] = 'Empf&auml;nger';
+
+$MOD_FORM['EXCESS_SUBMISSIONS'] = 'Dieses Formular wurde zu oft aufgerufen. Bitte versuchen Sie es in einer Stunde noch einmal.';
+$MOD_FORM['INCORRECT_CAPTCHA'] = 'Die eingegebene Pr&uuml;fziffer stimmt nicht &uuml;berein. Wenn Sie Probleme mit dem Lesen der Pr&uuml;fziffer haben, bitte schreiben Sie eine E-Mail an den <a href="mailto:{{webmaster_email}}">Webmaster</a>';
+$MOD_FORM['REQUIRED_FIELDS'] = 'Bitte folgende Angaben erg&auml;nzen';
Index: branches/2.8.x/wb/modules/form/add.php
===================================================================
--- branches/2.8.x/wb/modules/form/add.php	(revision 1572)
+++ branches/2.8.x/wb/modules/form/add.php	(revision 1573)
@@ -37,17 +37,17 @@
 </td>'.PHP_EOL.'
 </tr>'.PHP_EOL.'
 </table>'.PHP_EOL;
-$email_to = $admin->get_email();
+$email_to = '';
 $email_from = '';
 $email_fromname = '';
-$email_subject = $MOD_FORM['EMAIL_SUBJECT'];
+$email_subject = '';
 $success_page = 'none';
-$success_email_to = SERVER_EMAIL;
-$success_email_from = $admin->get_email();
-$success_email_fromname = WBMAILER_DEFAULT_SENDERNAME;
-$success_email_text = $MOD_FORM['SUCCESS_EMAIL_TEXT'];
-$success_email_text = addslashes($success_email_text);
-$success_email_subject = $MOD_FORM['SUCCESS_EMAIL_SUBJECT'];
+$success_email_to = '';
+$success_email_from = '';
+$success_email_fromname = '';
+$success_email_text = '';
+// $success_email_text = addslashes($success_email_text);
+$success_email_subject = '';
 $max_submissions = 50;
 $stored_submissions = 50;
 $use_captcha = true;