X-Git-Url: https://git.p6c8.net/form-email.git/blobdiff_plain/6f125a20df39454f1f785075998d0c0751055ba5..c715b5507a92eea0180b640db399e0144e100bf6:/form-email/mailer.php?ds=sidebyside diff --git a/form-email/mailer.php b/form-email/mailer.php index 52e3110..ff43112 100644 --- a/form-email/mailer.php +++ b/form-email/mailer.php @@ -7,7 +7,7 @@ # geschrieben wurde. # # Autor: Patrick Canterino -# Letzte Aenderung: 7.11.2011 +# Letzte Aenderung: 12.12.2011 # # Copyright (C) 2002-2011 Patrick Canterino # @@ -21,11 +21,13 @@ # Hauptteil # =========== +$VERSION = '3.5-dev'; + require('config.php'); require('functions.php'); require('class.Template.php'); -if($only_post && $_SERVER['REQUEST_METHOD'] != 'POST') show_fatal($err_only_post); +if($_SERVER['REQUEST_METHOD'] != 'POST') show_fatal($err_only_post); # Wenn Captchas aktiviert sind, Session starten @@ -97,25 +99,78 @@ $prepared_user_fields = array(); while(list($user_field,$user_field_data) = each($user_fields)) { $user_field_content = formdata($user_field); + # Pruefung, ob das Feld gesetzt wurde und ob es optional ist + if((!$user_field_data['optional']) && (!$user_field_content)) { show_user_error($user_field_data['errors']['not_set']); } elseif($user_field_data['optional'] && (!$user_field_content)) { + # Wenn das Feld optional ist und nicht gesetzt wurde, brechen wir hier ab + # und machen mit dem naechsten Feld weiter + $prepared_user_fields[$user_field_data['tpl_var']] = ''; continue; } + + # Laengen-Pruefung + + if(isset($user_field_data['min']) && $user_field_data['min']) { + if(strlen($user_field_content) < $user_field_data['min']) { + if(isset($user_field_data['errors']['too_short'])) { + show_user_error($user_field_data['errors']['too_short']); + } + else { + show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_short', 'INDIVIDUAL' => $user_field)); + } + } + } + + if(isset($user_field_data['min']) && $user_field_data['max']) { + if(strlen($user_field_content) > $user_field_data['max']) { + if(isset($user_field_data['errors']['too_long'])) { + show_user_error($user_field_data['errors']['too_long']); + } + else { + show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_long', 'INDIVIDUAL' => $user_field)); + } + } + } + + # Pruefung gegen frei definierbare Pruef-Funktion if(isset($user_field_data['check']) && $user_field_data['check'] != '') { if(function_exists($user_field_data['check']) && call_user_func($user_field_data['check'],$user_field_content) === false) { - show_user_error($user_field_data['errors']['check_fail']); + if(isset($user_field_data['errors']['check_fail'])) { + show_user_error($user_field_data['errors']['check_fail']); + } + else { + show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'check_fail', 'INDIVIDUAL' => $user_field)); + } } } + + # Pruefung gegen frei definierbaren regulaeren Ausdruck if(isset($user_field_data['regex']) && $user_field_data['regex'] != '') { if(!preg_match($user_field_data['regex'],$user_field_content)) { - show_user_error($user_field_data['errors']['match_fail']); + if(isset($user_field_data['errors']['match_fail'])) { + show_user_error($user_field_data['errors']['match_fail']); + } + else { + show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'match_fail', 'INDIVIDUAL' => $user_field)); + } + } + } + + # Formularfeld durch frei definierbare Funktion bearbeiten + + if(isset($user_field_data['prepare']) && $user_field_data['prepare'] != '') { + if(function_exists($user_field_data['check'])) { + $user_field_content = call_user_func($user_field_data['prepare'],$user_field_content); } } + + # Fertige Formulardaten wegkopieren und fuer spaeter zur Verfuegung stellen $prepared_user_fields[$user_field_data['tpl_var']] = $user_field_content; } @@ -211,7 +266,7 @@ if($add_header) { $header .= 'Content-Type: text/plain; charset="'.$charset.'"'."\n"; $header .= 'Content-Transfer-Encoding: 8bit'."\n"; $header .= 'MIME-Version: 1.0'."\n"; - $header .= 'X-Mailer: Form E-Mail 3.4.1'."\n"; + $header .= 'X-Mailer: Form E-Mail '.$VERSION."\n"; $header .= 'X-Sender-IP: ['.$_SERVER['REMOTE_ADDR'].']'; } else $header .= "Reply-To: $email";