Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1654) +++ branches/2.8.x/CHANGELOG (revision 1655) @@ -11,6 +11,8 @@ ! = Update/Change =============================================================================== +01 Apr-2012 Build 1655 Dietmar Woellbrink (Luisehahne) ++ add replyto to form module (see DEVINFOS) 01 Apr-2012 Build 1654 Dietmar Woellbrink (Luisehahne) # Fixed SERVER_EMAIL in languages, needs double brackets ! Installer redesign Step 2 Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1654) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1655) @@ -51,5 +51,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.3'); -if(!defined('REVISION')) define('REVISION', '1654'); +if(!defined('REVISION')) define('REVISION', '1655'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/framework/class.wb.php =================================================================== --- branches/2.8.x/wb/framework/class.wb.php (revision 1654) +++ branches/2.8.x/wb/framework/class.wb.php (revision 1655) @@ -416,7 +416,7 @@ // $myMail->AddReplyTo($fromaddress); // REPLY TO: } if($replyTo) { - $myMail->AddReplyTo($fromaddress); // REPLY TO: + $myMail->AddReplyTo($replyTo); // REPLY TO: } // define recepient and information to send out $myMail->AddAddress($toaddress); // TO: Index: branches/2.8.x/wb/modules/form/info.php =================================================================== --- branches/2.8.x/wb/modules/form/info.php (revision 1654) +++ branches/2.8.x/wb/modules/form/info.php (revision 1655) @@ -4,10 +4,10 @@ * @category module * @package Form * @author WebsiteBaker Project - * @copyright 2009-2011, Website Baker Org. e.V. + * @copyright 2009-2012, Website Baker Org. e.V. * @link http://www.websitebaker2.org/ * @license http://www.gnu.org/licenses/gpl.html - * @platform WebsiteBaker 2.8.x + * @platform WebsiteBaker 2.8.3 * @requirements PHP 5.2.2 and higher * @version $Id$ * @filesource $HeadURL$ @@ -16,19 +16,17 @@ */ // Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(__FILE__))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ $module_directory = 'form'; $module_name = 'Form'; $module_function = 'page'; -$module_version = '2.8.4'; -$module_platform = '2.8.x'; -$module_author = 'Ryan Djurovich & Rudolph Lartey - additions John Maats - PCWacht'; +$module_version = '2.8.5'; +$module_platform = '2.8.3'; +$module_author = 'Ryan Djurovich & Rudolph Lartey - additions John Maats - PCWacht, dev-team'; $module_license = 'GNU General Public License'; $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.'; Index: branches/2.8.x/wb/modules/form/modify_settings.php =================================================================== --- branches/2.8.x/wb/modules/form/modify_settings.php (revision 1654) +++ branches/2.8.x/wb/modules/form/modify_settings.php (revision 1655) @@ -84,6 +84,7 @@ + getFTAN(); ?> @@ -166,29 +167,7 @@ - + @@ -198,6 +177,7 @@ + - - - + + + @@ -242,9 +242,9 @@ - - - + + + - - - + + + Index: branches/2.8.x/DEVINFOS =================================================================== --- branches/2.8.x/DEVINFOS (revision 1654) +++ branches/2.8.x/DEVINFOS (revision 1655) @@ -1,9 +1,14 @@ WebsiteBaker 2.8.3 Developing Instructions/Informations ======================================================= -$Id: DEVINFOS 1634 2012-03-09 02:20:16Z Luisehahne $ +$Id$ +01 Apr-2012 Build 1655 +---------------------- +handling replyto in form module +You can directly answer to the recipient, sending by a authenticated user +then in from the recipient name is shown 22 Mar-2012 Build 1639 ---------------------- Property changes on: branches/2.8.x/DEVINFOS ___________________________________________________________________ Added: svn:keywords ## -0,0 +1,4 ## +Id +Revision +HeadURL +Date \ No newline at end of property
: - -
: Index: branches/2.8.x/wb/modules/form/view.php =================================================================== --- branches/2.8.x/wb/modules/form/view.php (revision 1654) +++ branches/2.8.x/wb/modules/form/view.php (revision 1655) @@ -29,6 +29,11 @@ require_once(!file_exists($lang) ? (dirname(__FILE__)) . '/languages/EN.php' : $lang ); include_once(WB_PATH .'/framework/functions.php'); +$aWebsiteTitle = (defined('WEBSITE_TITLE') && WEBSITE_TITLE != '' ? WEBSITE_TITLE : $_SERVER['SERVER_NAME']); +$replace = array('WEBSITE_TITLE' => $aWebsiteTitle ); +$MOD_FORM['EMAIL_SUBJECT'] = replace_vars($MOD_FORM['EMAIL_SUBJECT'], $replace); +$MOD_FORM['SUCCESS_EMAIL_TEXT'] = replace_vars($MOD_FORM['SUCCESS_EMAIL_TEXT'], $replace); +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = replace_vars($MOD_FORM['SUCCESS_EMAIL_SUBJECT'], $replace); /* function removebreaks($value) { return trim(preg_replace('=((||0x0A/%0A|0x0D/%0D|\\n|\\r)\S).*=i', null, $value)); @@ -115,7 +120,8 @@ } // Work-out if the form has been submitted or not -if($_POST == array()) { +if($_POST == array()) +{ require_once(WB_PATH.'/include/captcha/captcha.php'); // Set new submission ID in session @@ -129,8 +135,10 @@ // Get settings $sql = 'SELECT * FROM `'.TABLE_PREFIX.'mod_form_settings` '; $sql .= 'WHERE section_id = '.$section_id.' '; - if($query_settings = $database->query($sql)) { - if($query_settings->numRows() > 0) { + if($query_settings = $database->query($sql)) + { + if($query_settings->numRows() > 0) + { $fetch_settings = $query_settings->fetchRow(MYSQL_ASSOC); $header = str_replace('{WB_URL}',WB_URL,$fetch_settings['header']); $field_loop = $fetch_settings['field_loop']; @@ -138,6 +146,7 @@ $use_captcha = $fetch_settings['use_captcha']; $form_name = 'form'; $use_xhtml_strict = false; + $page_id = $fetch_settings['page_id']; } } @@ -182,7 +191,7 @@ fetchRow(MYSQL_ASSOC)) { // Set field values $field_id = $field['field_id']; @@ -196,7 +205,7 @@ } $values = array($field_title); if ($field['required'] == 1) { - $values[] = '*'.PHP_EOL; + $values[] = '*'."\n"; } else { $values[] = ''; } @@ -268,6 +277,13 @@ // Check that submission ID matches if(isset($_SESSION['form_submission_id']) AND isset($_POST['submission_id']) AND $_SESSION['form_submission_id'] == $_POST['submission_id']) { + $mail_replyto = ''; + $mail_replyName = ''; + if( $wb->is_authenticated() && $wb->get_email() ) { + $mail_replyto = $wb->get_email(); + $mail_replyName = htmlspecialchars($wb->add_slashes($wb->get_display_name())); + } + // Set new submission ID in session $_SESSION['form_submission_id'] = new_submission_id(); @@ -301,17 +317,24 @@ } */ $email_fromname = $fetch_settings['email_fromname']; +// $email_fromname = (($mail_replyName='') ? $fetch_settings['email_fromname'] : $mail_replyName); + $email_fromname = (($mail_replyName='') ? htmlspecialchars($wb->add_slashes($fetch_settings['email_fromname'])) : $mail_replyName); + if(substr($email_fromname, 0, 5) == 'field') { // 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'] != '') ? $fetch_settings['email_subject'] : $MOD_FORM['EMAIL_SUBJECT']); $success_page = $fetch_settings['success_page']; + $success_email_to = $mail_replyto; +/* $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])); } +*/ $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'])); @@ -324,8 +347,8 @@ exit($TEXT['UNDER_CONSTRUCTION']); } } + $email_body = ''; - // Create blank "required" array $required = array(); @@ -336,10 +359,12 @@ if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { $replace = array('webmaster_email' => emailAdmin() ); $captcha_error = replace_vars($MOD_FORM['INCORRECT_CAPTCHA'], $replace); + $required[]= ''; } } else { $replace = array('webmaster_email'=>emailAdmin() ); $captcha_error = replace_vars($MOD_FORM['INCORRECT_CAPTCHA'],$replace ); + $required[]= ''; } } if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); } @@ -354,15 +379,18 @@ while($field = $query_fields->fetchRow(MYSQL_ASSOC)) { // Add to message body if($field['type'] != '') { - if(!empty($_POST['field'.$field['field_id']])) { + if(!empty($_POST['field'.$field['field_id']])) + { // do not allow droplets in user input! if (is_array($_POST['field'.$field['field_id']])) { - $_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("[[", "]]"), $_POST['field'.$field['field_id']]); + $_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("[[", "]]"), $wb->strip_slashes($_POST['field'.$field['field_id']])); } else { - $_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("[[", "]]"), htmlspecialchars($_POST['field'.$field['field_id']])); + $_SESSION['field'.$field['field_id']] = str_replace(array("[[", "]]"), array("[[", "]]"), htmlspecialchars($wb->strip_slashes($_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']; + $required[]= ''; } if($field['type'] == 'heading') { $email_body .= $_POST['field'.$field['field_id']]."\n\n"; @@ -375,6 +403,7 @@ } $email_body .= "\n"; } + } elseif($field['required'] == 1) { $required[] = $field['title']; } @@ -382,6 +411,7 @@ } // while } // numRows } // query + // Check if the user forgot to enter values into all the required fields if(sizeof($required )) { @@ -390,31 +420,36 @@ } else { echo '

'.$MESSAGE['MOD_FORM_REQUIRED_FIELDS'].'

'; } - echo '
    '.PHP_EOL; + echo "
      \n"; foreach($required AS $field_title) { - echo '
    • '.$field_title.PHP_EOL; + if($field_title!=''){ + echo '
    • '.$field_title."
      • \n"; + } } + if(isset($email_error)) { - echo '
    • '.$email_error.'
      • '.PHP_EOL; + echo '
    • '.$email_error."
      • \n"; } + if(isset($captcha_error)) { - echo '
    • '.$captcha_error.'
      • '.PHP_EOL; + echo '
    • '.$captcha_error."
      • \n"; } // Create blank "required" array $required = array(); - echo '
    '.PHP_EOL; - echo '

     

    '.PHP_EOL.'

    '.$TEXT['BACK'].'

    '.PHP_EOL; + echo "
\n"; + + echo '

 

'."\n".'

'.$TEXT['BACK'].'

'."\n"; } else { if(isset($email_error)) { - echo '
    '.PHP_EOL; - echo '
  • '.$email_error.'
    • '.PHP_EOL; - echo '
'.PHP_EOL; + echo '
    '."\n"; + echo '
  • '.$email_error.'
    • '."\n"; + echo '
'."\n"; echo ''.$TEXT['BACK'].''; } elseif(isset($captcha_error)) { - echo '
    '.PHP_EOL; - echo '
  • '.$captcha_error.'
    • '.PHP_EOL; - echo '
'.PHP_EOL; - echo '

 

'.PHP_EOL.'

'.$TEXT['BACK'].'

'.PHP_EOL; + echo '
    '."\n"; + echo '
  • '.$captcha_error.'
    • '."\n"; + echo '
'."\n"; + echo '

 

'."\n".'

'.$TEXT['BACK'].'

'."\n"; } else { // Check how many times form has been submitted in last hour $last_hour = time()-3600; @@ -421,8 +456,10 @@ $sql = 'SELECT `submission_id` FROM `'.TABLE_PREFIX.'mod_form_submissions` '; $sql .= 'WHERE `submitted_when` >= '.$last_hour.''; $sql .= ''; - if($query_submissions = $database->query($sql)){ - if($query_submissions->numRows() > $max_submissions) { + if($query_submissions = $database->query($sql)) + { + if($query_submissions->numRows() > $max_submissions) + { // Too many submissions so far this hour echo $MESSAGE['MOD_FORM_EXCESS_SUBMISSIONS']; $success = false; @@ -436,69 +473,71 @@ $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(SERVER_EMAIL,$email_to,$email_subject,$email_body,$email_fromname)) { - $success = true; - } + $success = $wb->mail(SERVER_EMAIL,$email_to,$email_subject,$email_body,$email_fromname,$mail_replyto); } else { - if($wb->mail('',$email_to,$email_subject,$email_body,$email_fromname)) { - $success = true; - } + $success = $wb->mail('',$email_to,$email_subject,$email_body,$email_fromname,$mail_replyto); } } - $recipient = preg_replace( "/[^a-z0-9 !?:;,.\/_\-=+@#$&\*\(\)]/im", "", $success_email_fromname ); - $success_email_fromname = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $recipient ); - $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(SERVER_EMAIL,$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname)) { - $success = true; + if($success==true) + { + $recipient = preg_replace( "/[^a-z0-9 !?:;,.\/_\-=+@#$&\*\(\)]/im", "", $success_email_fromname ); + $success_email_fromname = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $recipient ); + $success_email_text = preg_replace( "/(content-type:|bcc:|cc:|to:|from:)/im", "", $success_email_text ); + if($success_email_to != '') { + if($success_email_from != '') { + $success = $wb->mail(SERVER_EMAIL,$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname,$mail_replyto); + } else { + $success = $wb->mail('',$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname,$mail_replyto); } - } else { - if($wb->mail('',$success_email_to,$success_email_subject,($success_email_text).$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'],$success_email_fromname)) { - $success = true; - } } } - // Write submission to database - if(isset($admin) AND $admin->is_authenticated() AND $admin->get_user_id() > 0) { - $submitted_by = $admin->get_user_id(); - } else { - $submitted_by = 0; - } - $email_body = htmlspecialchars($wb->add_slashes($email_body)); - $sql = 'INSERT INTO '.TABLE_PREFIX.'mod_form_submissions '; - $sql .= 'SET '; - $sql .= 'page_id='.$wb->page_id.','; - $sql .= 'section_id='.$section_id.','; - $sql .= 'submitted_when='.time().','; - $sql .= 'submitted_by=\''.$submitted_by.'\', '; - $sql .= 'body=\''.$email_body.'\' '; - if($database->query($sql)) { - - if(!$database->is_error()) { - $success = true; - } - // Make sure submissions table isn't too full - $query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions ORDER BY submitted_when"); - $num_submissions = $query_submissions->numRows(); - if($num_submissions > $stored_submissions) { - // Remove excess submission - $num_to_remove = $num_submissions-$stored_submissions; - while($submission = $query_submissions->fetchRow(MYSQL_ASSOC)) { - if($num_to_remove > 0) { - $submission_id = $submission['submission_id']; - $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'"); - $num_to_remove = $num_to_remove-1; + if($success==true) + { + // Write submission to database + if(isset($admin) AND $admin->is_authenticated() AND $admin->get_user_id() > 0) { + $submitted_by = $admin->get_user_id(); + } else { + $submitted_by = 0; + } + $email_body = htmlspecialchars($wb->add_slashes($email_body)); + $sql = 'INSERT INTO '.TABLE_PREFIX.'mod_form_submissions '; + $sql .= 'SET '; + $sql .= 'page_id='.$wb->page_id.','; + $sql .= 'section_id='.$section_id.','; + $sql .= 'submitted_when='.time().','; + $sql .= 'submitted_by=\''.$submitted_by.'\', '; + $sql .= 'body=\''.$email_body.'\' '; + if($database->query($sql)) + { + if(!$database->is_error()) { + $success = true; } - } - } - } // numRows - } - } + // Make sure submissions table isn't too full + $query_submissions = $database->query("SELECT submission_id FROM ".TABLE_PREFIX."mod_form_submissions ORDER BY submitted_when"); + $num_submissions = $query_submissions->numRows(); + if($num_submissions > $stored_submissions) + { + // Remove excess submission + $num_to_remove = $num_submissions-$stored_submissions; + while($submission = $query_submissions->fetchRow(MYSQL_ASSOC)) + { + if($num_to_remove > 0) + { + $submission_id = $submission['submission_id']; + $database->query("DELETE FROM ".TABLE_PREFIX."mod_form_submissions WHERE submission_id = '$submission_id'"); + $num_to_remove = $num_to_remove-1; + } + } + } // $num_submissions + } // numRows + } // $success + } + } // end how many times form has been submitted in last hour } } // email_error } else { @@ -506,18 +545,21 @@ echo '

 

'.PHP_EOL.'

'.$TEXT['BACK'].'

'.PHP_EOL; } + $success_page = ( (isset($success_page) ) ? $success_page : $page_id); + $sql = 'SELECT `link` FROM `'.TABLE_PREFIX.'pages` '; + $sql .= 'WHERE `page_id` = '.(int)$success_page; + $sSuccessLink = WB_URL; // if failed set default + if( ($link = $database->get_one($sql)) ) { + $sSuccessLink = WB_URL.PAGES_DIRECTORY.$link.PAGE_EXTENSION; + } // Now check if the email was sent successfully - if(isset($success) AND $success == true) { + if(isset($success) && $success == true) + { if ($success_page=='none') { echo str_replace("\n","
",($success_email_text)); - echo '

 

'.PHP_EOL.'

'.$TEXT['BACK'].'

'.PHP_EOL; + echo '

 

'.PHP_EOL.'

'.$TEXT['BACK'].'

'.PHP_EOL; } else { - $query_menu = $database->query("SELECT link,target FROM ".TABLE_PREFIX."pages WHERE `page_id` = '$success_page'"); - if($query_menu->numRows() > 0) { - $fetch_settings = $query_menu->fetchRow(MYSQL_ASSOC); - $link = WB_URL.PAGES_DIRECTORY.$fetch_settings['link'].PAGE_EXTENSION; - echo ""; - } + echo ""; } // clearing session on success $query_fields = $database->query("SELECT field_id FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id'"); @@ -526,8 +568,9 @@ if(isset($_SESSION['field'.$field_id])) unset($_SESSION['field'.$field_id]); } } else { - if(isset($success) AND $success == false) { - echo $TEXT['ERROR']; + if(isset($success) && $success == false) { + echo '
'.$MOD_FORM['ERROR']; + echo '

 

'.PHP_EOL.'

'.$TEXT['BACK'].'

'.PHP_EOL; } } Index: branches/2.8.x/wb/modules/form/languages/NL.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/NL.php (revision 1654) +++ branches/2.8.x/wb/modules/form/languages/NL.php (revision 1655) @@ -16,11 +16,9 @@ */ // Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ @@ -31,16 +29,16 @@ $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_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE; +$MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}'; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to '.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['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n" +."****************************************************************************\n" +."This is an automatically generated e-mail. The sender\'s address of this e-mail\n" +."is furnished only for dispatch, not to receive messages!\n" +."If you have received this e-mail by mistake, please contact us and delete this message\n" +."****************************************************************************\n"; $MOD_FORM['FROM'] = 'Sender'; $MOD_FORM['TO'] = 'Recipient'; @@ -48,3 +46,5 @@ $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 webmaster'; $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields'; +$MOD_FORM['RECIPIENT'] = 'Send confirmation mail only to authenticated user! Otherwise confirmation mail will be disabled! '; +$MOD_FORM['ERROR'] = 'E-Mail could not send!!'; Index: branches/2.8.x/wb/modules/form/languages/NO.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/NO.php (revision 1654) +++ branches/2.8.x/wb/modules/form/languages/NO.php (revision 1655) @@ -16,11 +16,9 @@ */ // Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ @@ -31,16 +29,16 @@ $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_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE; +$MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}'; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to '.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['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n" +."****************************************************************************\n" +."This is an automatically generated e-mail. The sender\'s address of this e-mail\n" +."is furnished only for dispatch, not to receive messages!\n" +."If you have received this e-mail by mistake, please contact us and delete this message\n" +."****************************************************************************\n"; $MOD_FORM['FROM'] = 'Sender'; $MOD_FORM['TO'] = 'Recipient'; @@ -48,3 +46,5 @@ $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 webmaster'; $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields'; +$MOD_FORM['RECIPIENT'] = 'Send confirmation mail only to authenticated user! Otherwise confirmation mail will be disabled! '; +$MOD_FORM['ERROR'] = 'E-Mail could not send!!'; Index: branches/2.8.x/wb/modules/form/languages/EN.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/EN.php (revision 1654) +++ branches/2.8.x/wb/modules/form/languages/EN.php (revision 1655) @@ -16,11 +16,9 @@ */ // Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ @@ -31,16 +29,16 @@ $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_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE; +$MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}'; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to '.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['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n" +."****************************************************************************\n" +."This is an automatically generated e-mail. The sender\'s address of this e-mail\n" +."is furnished only for dispatch, not to receive messages!\n" +."If you have received this e-mail by mistake, please contact us and delete this message\n" +."****************************************************************************\n"; $MOD_FORM['FROM'] = 'Sender'; $MOD_FORM['TO'] = 'Recipient'; @@ -48,3 +46,5 @@ $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 webmaster'; $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields'; +$MOD_FORM['RECIPIENT'] = 'Send confirmation mail only to authenticated user! Otherwise confirmation mail will be disabled! '; +$MOD_FORM['ERROR'] = 'E-Mail could not send!!'; Index: branches/2.8.x/wb/modules/form/languages/DA.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/DA.php (revision 1654) +++ branches/2.8.x/wb/modules/form/languages/DA.php (revision 1655) @@ -16,11 +16,9 @@ */ // Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ @@ -31,16 +29,16 @@ $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_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE; +$MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}'; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to '.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['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n" +."****************************************************************************\n" +."This is an automatically generated e-mail. The sender\'s address of this e-mail\n" +."is furnished only for dispatch, not to receive messages!\n" +."If you have received this e-mail by mistake, please contact us and delete this message\n" +."****************************************************************************\n"; $MOD_FORM['FROM'] = 'Sender'; $MOD_FORM['TO'] = 'Recipient'; @@ -48,3 +46,5 @@ $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 webmaster'; $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields'; +$MOD_FORM['RECIPIENT'] = 'Send confirmation mail only to authenticated user! Otherwise confirmation mail will be disabled! '; +$MOD_FORM['ERROR'] = 'E-Mail could not send!!'; Index: branches/2.8.x/wb/modules/form/languages/RU.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/RU.php (revision 1654) +++ branches/2.8.x/wb/modules/form/languages/RU.php (revision 1655) @@ -16,11 +16,9 @@ */ // Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ @@ -31,16 +29,16 @@ $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_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE; +$MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}'; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to '.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['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n" +."****************************************************************************\n" +."This is an automatically generated e-mail. The sender\'s address of this e-mail\n" +."is furnished only for dispatch, not to receive messages!\n" +."If you have received this e-mail by mistake, please contact us and delete this message\n" +."****************************************************************************\n"; $MOD_FORM['FROM'] = 'Sender'; $MOD_FORM['TO'] = 'Recipient'; @@ -48,3 +46,5 @@ $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 webmaster'; $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields'; +$MOD_FORM['RECIPIENT'] = 'Send confirmation mail only to authenticated user! Otherwise confirmation mail will be disabled! '; +$MOD_FORM['ERROR'] = 'E-Mail could not send!!'; Index: branches/2.8.x/wb/modules/form/languages/FR.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/FR.php (revision 1654) +++ branches/2.8.x/wb/modules/form/languages/FR.php (revision 1655) @@ -16,11 +16,9 @@ */ // Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ - // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/framework/globalExceptionHandler.php'); + throw new IllegalFileException(); } /* -------------------------------------------------------- */ @@ -31,16 +29,16 @@ $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_SUBJECT'] = 'You have submitted a message to '.WEBSITE_TITLE; +$MOD_FORM['EMAIL_SUBJECT'] = 'Delivering a message from {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'You have submitted a message by {{WEBSITE_TITLE}}'; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to '.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['SUCCESS_EMAIL_TEXT'] = 'Thank you for sending your message to {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n" +."****************************************************************************\n" +."This is an automatically generated e-mail. The sender\'s address of this e-mail\n" +."is furnished only for dispatch, not to receive messages!\n" +."If you have received this e-mail by mistake, please contact us and delete this message\n" +."****************************************************************************\n"; $MOD_FORM['FROM'] = 'Sender'; $MOD_FORM['TO'] = 'Recipient'; @@ -48,3 +46,5 @@ $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 webmaster'; $MOD_FORM['REQUIRED_FIELDS'] = 'You must enter details for the following fields'; +$MOD_FORM['RECIPIENT'] = 'Send confirmation mail only to authenticated user! Otherwise confirmation mail will be disabled! '; +$MOD_FORM['ERROR'] = 'E-Mail could not send!!'; Index: branches/2.8.x/wb/modules/form/languages/DE.php =================================================================== --- branches/2.8.x/wb/modules/form/languages/DE.php (revision 1654) +++ branches/2.8.x/wb/modules/form/languages/DE.php (revision 1655) @@ -15,12 +15,10 @@ * @description */ -// Must include code to stop this file being access directly -/* -------------------------------------------------------- */ -if(defined('WB_PATH') == false) -{ +// Must include code to stop this file being accessed directly +if(!defined('WB_URL')) { + require_once(dirname(dirname(dirname(dirname(__FILE__)))).'/framework/globalExceptionHandler.php'); // Stop this file being access directly - die('Access denied

Cannot access this file directly

'); } /* -------------------------------------------------------- */ @@ -31,17 +29,17 @@ $MOD_FORM['SETTINGS'] = 'Formular Einstellungen'; $MOD_FORM['CONFIRM'] = 'Bestätigung'; $MOD_FORM['SUBMIT_FORM'] = 'Absenden'; -$MOD_FORM['EMAIL_SUBJECT'] = 'Erhalten einer Nachricht von '.WEBSITE_TITLE; -$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'Sie haben ein Forumlar an '.WEBSITE_TITLE.' gesendet'; +$MOD_FORM['EMAIL_SUBJECT'] = 'Sie haben eine Nachricht über {{WEBSITE_TITLE}} erhalten'; +$MOD_FORM['SUCCESS_EMAIL_SUBJECT'] = 'Sie haben ein Forumlar über {{WEBSITE_TITLE}} gesendet'; -$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Vielen Dank für die Übermittlung Ihrer Nachricht an '.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öschen diese Nachricht von Ihrem Computer.'.PHP_EOL -.'**************************************************************'.PHP_EOL; +$MOD_FORM['SUCCESS_EMAIL_TEXT'] = 'Vielen Dank für die Übermittlung Ihrer Nachricht an {{WEBSITE_TITLE}}'; +$MOD_FORM['SUCCESS_EMAIL_TEXT_GENERATED'] = "\n\n\n" +."**************************************************************\n" +."Dies ist eine automatisch generierte E-Mail. Die Absenderadresse dieser E-Mail\n" +."ist nur zum Versand, und nicht zum Empfang von Nachrichten eingerichtet!\n" +."Falls Sie diese E-Mail versehentlich erhalten haben, setzen Sie sich bitte\n" +."mit uns in Verbindung und löschen diese Nachricht von Ihrem Computer.\n" +."**************************************************************\n"; $MOD_FORM['FROM'] = 'Absender'; $MOD_FORM['TO'] = 'Empfänger'; @@ -49,3 +47,5 @@ $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üfziffer stimmt nicht überein. Wenn Sie Probleme mit dem Lesen der Prüfziffer haben, bitte schreiben Sie eine E-Mail an den Webmaster'; $MOD_FORM['REQUIRED_FIELDS'] = 'Bitte folgende Angaben ergänzen'; +$MOD_FORM['RECIPIENT'] = 'Emailbestätigung erfolgt nur an die gültige Emailadresse des jeweils angemeldeten Benutzers! Versand an ungeprüfte Adressen ist nicht möglich! '; +$MOD_FORM['ERROR'] = 'E-Mail konnte nicht gesendet werden!!'; Index: branches/2.8.x/wb/modules/form/view_submission.php =================================================================== --- branches/2.8.x/wb/modules/form/view_submission.php (revision 1654) +++ branches/2.8.x/wb/modules/form/view_submission.php (revision 1655) @@ -21,7 +21,7 @@ // Include WB admin wrapper script require(WB_PATH.'/modules/admin.php'); /* */ - +include_once (WB_PATH.'/framework/functions.php'); // Get id $submission_id = intval($admin->checkIDKEY('submission_id', false, 'GET')); if (!$submission_id) { Index: branches/2.8.x/wb/modules/form/modify.php =================================================================== --- branches/2.8.x/wb/modules/form/modify.php (revision 1654) +++ branches/2.8.x/wb/modules/form/modify.php (revision 1655) @@ -213,9 +213,9 @@
  ID           @@ -276,9 +276,9 @@
  ID