Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 617) +++ trunk/CHANGELOG (revision 618) @@ -18,6 +18,7 @@ + added kewyword id to new file # Fixed some spelling errors in german language file 27-Jan-2008 Thomas Hornik +! Module form: user supplied input isn't lost on captcha-failure anymore. # fixed 100%-cpu-load-event in CAPTCHA admin-tool. + Added Calc_ttf_image CAPTCHA. ! Changed captcha/captcha.php to use table-layout for CAPTCHA. Index: trunk/wb/modules/form/save_field.php =================================================================== --- trunk/wb/modules/form/save_field.php (revision 617) +++ trunk/wb/modules/form/save_field.php (revision 618) @@ -51,6 +51,7 @@ $type = $admin->get_post('type'); $required = $admin->get_post('required'); } +$value = ''; // Update row $database->query("UPDATE ".TABLE_PREFIX."mod_form_fields SET title = '$title', type = '$type', required = '$required' WHERE field_id = '$field_id'"); Index: trunk/wb/modules/form/view.php =================================================================== --- trunk/wb/modules/form/view.php (revision 617) +++ trunk/wb/modules/form/view.php (revision 618) @@ -44,7 +44,7 @@ // Function for generating an optionsfor a select field if (!function_exists('make_option')) { -function make_option(&$n) { +function make_option(&$n, $k, $values) { // start option group if it exists if (substr($n,0,2) == '[=') { $n = ''; @@ -51,7 +51,10 @@ } elseif ($n == ']') { $n = ''; } else { - $n = ''; + if(in_array($n, $values)) + $n = ''; + else + $n = ''; } } } @@ -58,10 +61,13 @@ // Function for generating a checkbox if (!function_exists('make_checkbox')) { function make_checkbox(&$n, $idx, $params) { - $field_id = $params[0]; - $seperator = $params[1]; + $field_id = $params[0][0]; + $seperator = $params[0][1]; //$n = ''.''.$n.''.$seperator; - $n = ''.''.$n.''.$seperator; + if(in_array($n, $params[1])) + $n = ''.''.$n.''.$seperator; + else + $n = ''.''.$n.''.$seperator; } } // Function for generating a radio button @@ -70,7 +76,10 @@ $field_id = $params[0]; $group = $params[1]; $seperator = $params[2]; - $n = ''.''.$n.''.$seperator; + if($n == $params[3]) + $n = ''.''.$n.''.$seperator; + else + $n = ''.''.$n.''.$seperator; } } // Generate temp submission id @@ -161,14 +170,14 @@ } if($field['type'] == 'textfield') { $vars[] = '{FIELD}'; - $values[] = ''; + $values[] = ''; } elseif($field['type'] == 'textarea') { $vars[] = '{FIELD}'; - $values[] = ''; + $values[] = ''; } elseif($field['type'] == 'select') { $vars[] = '{FIELD}'; $options = explode(',', $value); - array_walk($options, 'make_option'); + array_walk($options, 'make_option', (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array())); $field['extra'] = explode(',',$field['extra']); $values[] = ''; } elseif($field['type'] == 'heading') { @@ -179,20 +188,21 @@ } elseif($field['type'] == 'checkbox') { $vars[] = '{FIELD}'; $options = explode(',', $value); - array_walk($options, 'make_checkbox',array($field_id,$field['extra'])); + array_walk($options, 'make_checkbox', array(array($field_id,$field['extra']),(isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:array()))); $options[count($options)-1]=substr($options[count($options)-1],0,strlen($options[count($options)-1])-strlen($field['extra'])); $values[] = implode($options); } elseif($field['type'] == 'radio') { $vars[] = '{FIELD}'; $options = explode(',', $value); - array_walk($options, 'make_radio',array($field_id,$field['title'],$field['extra'])); + array_walk($options, 'make_radio', array($field_id,$field['title'],$field['extra'], (isset($_SESSION['field'.$field_id])?$_SESSION['field'.$field_id]:''))); $options[count($options)-1]=substr($options[count($options)-1],0,strlen($options[count($options)-1])-strlen($field['extra'])); $values[] = implode($options); } elseif($field['type'] == 'email') { $vars[] = '{FIELD}'; - $values[] = ''; + $values[] = ''; $java_mailcheck .= 'onChange="return checkmail(this.form'.$field_id.'" '; } + if(isset($_SESSION['field'.$field_id])) unset($_SESSION['field'.$field_id]); if($field['type'] != '') { echo str_replace($vars, $values, $field_loop); } @@ -351,6 +361,19 @@ // Create blank "required" array $required = array(); + // Captcha + if($use_captcha) { + if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ + // Check for a mismatch + if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { + $captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; + } + } else { + $captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; + } + } + if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); } + // Loop through fields and add to message body // Get list of fields $query_fields = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_form_fields WHERE section_id = '$section_id' ORDER BY position ASC"); @@ -359,6 +382,7 @@ // Add to message body if($field['type'] != '') { if(!empty($_POST['field'.$field['field_id']])) { + if(isset($captcha_error)) $_SESSION['field'.$field['field_id']] = $_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']; } @@ -379,20 +403,7 @@ } } } - - // Captcha - if($use_captcha) { - if(isset($_POST['captcha']) AND $_POST['captcha'] != ''){ - // Check for a mismatch - if(!isset($_POST['captcha']) OR !isset($_SESSION['captcha']) OR $_POST['captcha'] != $_SESSION['captcha']) { - $captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; - } - } else { - $captcha_error = $MESSAGE['MOD_FORM']['INCORRECT_CAPTCHA']; - } - } - if(isset($_SESSION['captcha'])) { unset($_SESSION['captcha']); } - + // Addslashes to email body - proposed by Icheb in topic=1170.0 // $email_body = $wb->add_slashes($email_body);