git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nieuws: create new articles relative to page root
[minimedit.git]
/
contact.php
diff --git
a/contact.php
b/contact.php
index 94d8ebe04ad680832175b4eb96f1eda275188840..691ff41679ef97f5fe719911b08be7998c2ee515 100644
(file)
--- a/
contact.php
+++ b/
contact.php
@@
-1,6
+1,7
@@
<?php
$error = NULL;
if ($_POST) {
<?php
$error = NULL;
if ($_POST) {
+ global $User;
if (!empty($User)) {
$_REQUEST['login'] = $User['name'];
}
if (!empty($User)) {
$_REQUEST['login'] = $User['name'];
}
@@
-13,10
+14,21
@@
if ($_POST) {
function mailform($input = [])
{
$source = empty($input['subject']) ? 'reactie' : $input['subject'];
function mailform($input = [])
{
$source = empty($input['subject']) ? 'reactie' : $input['subject'];
+ $rcpt = 'info@'.$_SERVER['HTTP_HOST'];
+ $subject = "Formulier {$_SERVER['HTTP_HOST']}: $source";
+
if (!$input) {
return 'Geen gegevens ontvangen. Probeer het nog eens.';
}
if (!$input) {
return 'Geen gegevens ontvangen. Probeer het nog eens.';
}
-if ($source != 'bbq') {
+
+switch ($source) {
+ case 'bbq':
+ if (empty($input['naam']) or empty($input['huis'])) {
+ return 'De bedoeling is juist dat je opgeeft wie er komt.';
+ }
+ $rcpt .= ', Heleen <heleen.terlouw.2910@gmail.com>';
+ break;
+ default:
if (empty($input['email']) or !preg_match('/.+@.+\..+/', $input['email'])) {
return 'Een geldig e-mailadres is verplicht zodat we antwoord kunnen geven.';
}
if (empty($input['email']) or !preg_match('/.+@.+\..+/', $input['email'])) {
return 'Een geldig e-mailadres is verplicht zodat we antwoord kunnen geven.';
}
@@
-25,10
+37,8
@@
if ($source != 'bbq') {
}
}
}
}
- $rcpt = 'info@'.$_SERVER['HTTP_HOST'];
- $subject = "Formulier {$_SERVER['HTTP_HOST']}: $source";
$reply = preg_match('/\A\w+@\w+\.[a-z]+\z/', @$input['email'])
$reply = preg_match('/\A\w+@\w+\.[a-z]+\z/', @$input['email'])
- ? $input['email'] :
$rcpt
;
+ ? $input['email'] :
'noreply@'.$_SERVER['HTTP_HOST']
;
$header = "From: $reply";
foreach (array(
$header = "From: $reply";
foreach (array(
@@
-40,7
+50,9
@@
if ($source != 'bbq') {
}
$origin = $_SERVER['REMOTE_ADDR'];
}
$origin = $_SERVER['REMOTE_ADDR'];
- $origin .= sprintf(' (%s)', gethostbyaddr($origin));
+ if ($resolved = @gethostbyaddr($origin) and $resolved !== $origin) {
+ $origin .= sprintf(' (%s)', gethostbyaddr($origin));
+ }
$body = "Ingevuld vanaf $origin:\r\n\r\n";
foreach ($input as $k => $v) {
$body = "Ingevuld vanaf $origin:\r\n\r\n";
foreach ($input as $k => $v) {